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-11-07 00:35:25,204 [ scc.config] DEBUG Found github.token
2024-11-07 00:35:25,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-07 00:35:25,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:35:25,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:35:26,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-07 00:35:26,175 [ scc.gh] DEBUG 4998 remaining from 5000 (Reset at 01:11
2024-11-07 00:35:26,175 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-07 00:35:26,180 [ scc.git] DEBUG Check current status
2024-11-07 00:35:26,180 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-07 00:35:26,183 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-07 00:35:26,183 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-07 00:35:26,219 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-07 00:35:26,222 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-07 00:35:26,225 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-07 00:35:26,229 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-07 00:35:26,232 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-07 00:35:26,236 [ scc.config] DEBUG Found remote.origin.url
2024-11-07 00:35:26,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-07 00:35:27,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-07 00:35:27,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-07 00:35:27,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-07 00:35:28,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-07 00:35:28,298 [ scc.git] DEBUG Resetting...
2024-11-07 00:35:28,298 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-07 00:35:28,304 [ scc.git] DEBUG HEAD is now at e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-07 00:35:28,304 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-07 00:35:28,357 [ scc.git] DEBUG Check current status
2024-11-07 00:35:28,357 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-07 00:35:28,362 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-07 00:35:28,362 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-07 00:35:28,403 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-07 00:35:28,406 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-07 00:35:28,410 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-07 00:35:28,413 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-07 00:35:28,417 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-07 00:35:28,418 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-07 00:35:28,418 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-07 00:35:28,418 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-07 00:35:28,418 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-07 00:35:28,418 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-07 00:35:28,418 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:35:28,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-07 00:35:29,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-07 00:35:29,199 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-07 00:35:29,199 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-07 00:35:29,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-07 00:35:29,696 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-07 00:35:29,696 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-07 00:35:29,696 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:35:29,696 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:35:29,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:29,700 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:35:29,705 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:35:29,705 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:35:29,709 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:35:29,713 [ scc.git] DEBUG Already up to date.
2024-11-07 00:35:29,714 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-07 00:35:30,027 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-07 00:35:30,027 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-07 00:35:30,032 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-07 00:35:30,316 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-07 00:35:30,316 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-07 00:35:30,321 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:35:30,321 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:35:30,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:30,327 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-07 00:35:30,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:30,337 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 293 (Bump omero-py from `749a68a` to `4fd72ef`) 9660559833988d271074de56e54f2462a7be74e9'
2024-11-07 00:35:30,345 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:35:30,347 [ scc.git] DEBUG omero-py | 2 +-
2024-11-07 00:35:30,348 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-07 00:35:30,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:35:30,484 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-07 00:35:30,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:30,501 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 294 (Bump omero-web from `da5b7d1` to `213bb61`) 587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-07 00:35:30,512 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:35:30,515 [ scc.git] DEBUG omero-web | 2 +-
2024-11-07 00:35:30,515 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-07 00:35:30,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:35:30,859 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:35:31,019 [ scc.git] DEBUG Submodule path 'omero-py': checked out '4fd72efaa8cdbec9da98e1d28678af16878a86ba'
2024-11-07 00:35:31,111 [ scc.git] DEBUG Submodule path 'omero-web': checked out '213bb61adc23aed4a750f2a83dc94b7efdb22cee'
2024-11-07 00:35:31,112 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:35:31,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:31,115 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:35:31,278 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f334c03cee0> has no local changes
2024-11-07 00:35:31,278 [ 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 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
- PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
Generated by OMERO-python-superbuild-push#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/224/)'
2024-11-07 00:35:31,305 [ scc.git] DEBUG [detached HEAD 7e4d3a8] merge master -Dorg -Snone
2024-11-07 00:35:31,306 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-07 00:35:31,306 [ scc.merge] INFO Already up to date.
2024-11-07 00:35:31,306 [ scc.merge] INFO
2024-11-07 00:35:31,306 [ scc.merge] INFO Merged PRs:
2024-11-07 00:35:31,306 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-07 00:35:31,306 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-07 00:35:31,306 [ scc.merge] INFO
2024-11-07 00:35:31,306 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-07 00:35:31,306 [ 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-11-07 00:35:33,406 [ scc.config] DEBUG Found github.token
2024-11-07 00:35:33,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-07 00:35:33,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:35:33,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:35:34,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-07 00:35:34,343 [ scc.gh] DEBUG 4986 remaining from 5000 (Reset at 01:11
2024-11-07 00:35:34,344 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-07 00:35:34,348 [ scc.git] DEBUG Check current status
2024-11-07 00:35:34,348 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-07 00:35:34,352 [ scc.git] DEBUG 7e4d3a8 merge master -Dorg -Snone
2024-11-07 00:35:34,352 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-07 00:35:34,391 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-07 00:35:34,394 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-07 00:35:34,397 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-07 00:35:34,401 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-07 00:35:34,409 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-07 00:35:34,413 [ scc.config] DEBUG Found remote.origin.url
2024-11-07 00:35:34,414 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-11-07 00:35:34,415 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-11-07 00:35:34,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-07 00:35:35,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-07 00:35:35,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-07 00:35:36,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-07 00:35:36,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-07 00:35:36,492 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:35:36,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-07 00:35:36,537 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-07 00:35:36,540 [ scc.git] DEBUG Check current status
2024-11-07 00:35:36,541 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-07 00:35:36,544 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-11-07 00:35:36,544 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-07 00:35:36,584 [ scc.config] DEBUG Found remote.origin.url
2024-11-07 00:35:37,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-11-07 00:35:37,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-07 00:35:37,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-07 00:35:38,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-07 00:35:38,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-07 00:35:38,712 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:35:38,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:35:38,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-07 00:35:38,750 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-07 00:35:38,754 [ scc.git] DEBUG Check current status
2024-11-07 00:35:38,754 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-07 00:35:38,758 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-11-07 00:35:38,758 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-07 00:35:38,796 [ scc.config] DEBUG Found remote.origin.url
2024-11-07 00:35:39,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-11-07 00:35:39,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-07 00:35:40,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-07 00:35:40,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-07 00:35:40,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-07 00:35:40,915 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:35:40,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:35:40,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-07 00:35:40,952 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-07 00:35:40,956 [ scc.git] DEBUG Check current status
2024-11-07 00:35:40,956 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-07 00:35:40,988 [ scc.git] DEBUG 4fd72efa Bump version: 5.19.5 → 5.19.6.dev0
2024-11-07 00:35:40,988 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-07 00:35:41,028 [ scc.config] DEBUG Found remote.origin.url
2024-11-07 00:35:41,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-11-07 00:35:41,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-07 00:35:42,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-07 00:35:42,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-07 00:35:43,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-07 00:35:43,148 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:35:43,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:35:43,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-07 00:35:43,193 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-07 00:35:43,199 [ scc.git] DEBUG Check current status
2024-11-07 00:35:43,199 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-07 00:35:43,255 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-07 00:35:43,256 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-07 00:35:43,297 [ scc.config] DEBUG Found remote.origin.url
2024-11-07 00:35:43,298 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-11-07 00:35:43,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-11-07 00:35:44,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-07 00:35:44,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-07 00:35:44,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-07 00:35:45,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-07 00:35:45,279 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:35:45,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:35:45,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-07 00:35:45,320 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-07 00:35:45,324 [ scc.git] DEBUG Check current status
2024-11-07 00:35:45,324 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-07 00:35:45,329 [ scc.git] DEBUG 213bb61ad Merge pull request #580 from sbesson/obj_id_mask_no_match
2024-11-07 00:35:45,329 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-07 00:35:45,370 [ scc.config] DEBUG Found remote.origin.url
2024-11-07 00:35:45,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-11-07 00:35:46,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-07 00:35:46,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-07 00:35:47,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-07 00:35:47,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-07 00:35:47,412 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:35:47,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:35:47,450 [ scc.git] DEBUG Resetting...
2024-11-07 00:35:47,450 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-07 00:35:47,456 [ scc.git] DEBUG HEAD is now at 7e4d3a8 merge master -Dorg -Snone
2024-11-07 00:35:47,457 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-07 00:35:47,505 [ scc.git] DEBUG Check current status
2024-11-07 00:35:47,506 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-07 00:35:47,510 [ scc.git] DEBUG 7e4d3a8 merge master -Dorg -Snone
2024-11-07 00:35:47,511 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-07 00:35:47,547 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-07 00:35:47,550 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-07 00:35:47,553 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-07 00:35:47,557 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-07 00:35:47,560 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-07 00:35:47,561 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-07 00:35:47,561 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-07 00:35:47,561 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-07 00:35:47,561 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-07 00:35:47,561 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-07 00:35:47,561 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-11-07 00:35:47,562 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:35:47,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-07 00:35:48,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-07 00:35:48,311 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-07 00:35:48,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-07 00:35:49,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:35:49,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-07 00:35:50,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/587bd8c5de8d393fbed353cefde81f5bad4ea13a?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:35:50,133 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-07 00:35:50,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-07 00:35:50,604 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-07 00:35:51,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-07 00:35:51,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:35:52,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-07 00:35:52,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/9660559833988d271074de56e54f2462a7be74e9?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:35:52,534 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-07 00:35:52,534 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:35:52,534 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:35:52,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:52,539 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:35:52,543 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:35:52,544 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:35:52,549 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:35:52,554 [ scc.git] DEBUG Already up to date.
2024-11-07 00:35:52,554 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-07 00:35:52,869 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-07 00:35:52,869 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-07 00:35:52,875 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-07 00:35:53,150 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-07 00:35:53,150 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-07 00:35:53,154 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:35:53,154 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:35:53,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:53,159 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-07 00:35:53,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:53,168 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 293 (Bump omero-py from `749a68a` to `4fd72ef`) 9660559833988d271074de56e54f2462a7be74e9'
2024-11-07 00:35:53,172 [ scc.git] DEBUG Already up to date.
2024-11-07 00:35:53,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:35:53,333 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-07 00:35:53,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:53,342 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 294 (Bump omero-web from `da5b7d1` to `213bb61`) 587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-07 00:35:53,346 [ scc.git] DEBUG Already up to date.
2024-11-07 00:35:53,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:35:53,716 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:35:53,756 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:35:53,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:53,761 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:35:54,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-11-07 00:35:54,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-11-07 00:35:55,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-11-07 00:35:55,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-07 00:35:56,146 [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-11-07 00:35:56,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-07 00:35:56,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:35:56,959 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-07 00:35:56,959 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:35:56,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-07 00:35:56,960 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:35:56,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:56,965 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:35:56,969 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:35:56,969 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:35:56,973 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:35:56,978 [ scc.git] DEBUG Already up to date.
2024-11-07 00:35:56,978 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-11-07 00:35:57,301 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-11-07 00:35:57,301 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-11-07 00:35:57,305 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:35:57,305 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:35:57,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:57,310 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-11-07 00:35:57,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:57,319 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-11-07 00:35:57,680 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-11-07 00:35:57,680 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-11-07 00:35:57,680 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-11-07 00:35:57,680 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-11-07 00:35:57,680 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-11-07 00:35:57,680 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-11-07 00:35:57,680 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-11-07 00:35:57,680 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-11-07 00:35:57,680 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-11-07 00:35:57,681 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:35:57,685 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-11-07 00:35:57,685 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-11-07 00:35:57,685 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-11-07 00:35:57,685 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-11-07 00:35:57,685 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-11-07 00:35:57,685 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-11-07 00:35:57,685 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-11-07 00:35:57,685 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-11-07 00:35:57,685 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-11-07 00:35:57,685 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-11-07 00:35:57,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:35:57,816 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:35:57,857 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:35:57,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:35:57,861 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:35:57,900 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:35:57,906 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f822a08cf40> has no local changes
2024-11-07 00:35:57,907 [ 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'
Generated by OMERO-python-superbuild-push#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/224/)'
2024-11-07 00:35:57,915 [ scc.git] DEBUG [detached HEAD 8c42f55] merge master -Dorg -Ssuccess-only
2024-11-07 00:35:57,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:35:57,915 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:35:58,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-11-07 00:35:58,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-11-07 00:35:59,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-11-07 00:35:59,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-07 00:36:00,140 [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-11-07 00:36:00,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-07 00:36:01,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:36:01,013 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-07 00:36:01,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-11-07 00:36:01,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-11-07 00:36:02,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-11-07 00:36:02,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-11-07 00:36:02,857 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:36:02,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-07 00:36:02,857 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:36:02,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:02,861 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:36:02,865 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:36:02,865 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:36:02,869 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:36:02,873 [ scc.git] DEBUG Already up to date.
2024-11-07 00:36:02,874 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-11-07 00:36:03,332 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-11-07 00:36:03,332 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-11-07 00:36:03,338 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:36:03,338 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:36:03,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:03,343 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-07 00:36:03,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:03,353 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-07 00:36:03,364 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-11-07 00:36:03,365 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:36:03,367 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-11-07 00:36:03,367 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-11-07 00:36:03,368 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-11-07 00:36:03,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:36:03,500 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:36:03,540 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:36:03,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:03,544 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:36:03,585 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:36:03,591 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f822ae31e50> has no local changes
2024-11-07 00:36:03,591 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/224/)'
2024-11-07 00:36:03,599 [ scc.git] DEBUG [detached HEAD bb6bbfe] merge master -Dorg -Ssuccess-only
2024-11-07 00:36:03,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:36:03,600 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:36:04,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-11-07 00:36:04,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/431 HTTP/1.1" 200 None
2024-11-07 00:36:05,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-07 00:36:05,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:36:06,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:36:06,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-07 00:36:07,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0e500ec05bf9227b66b28a480b40e0936241d953?per_page=1 HTTP/1.1" 200 None
2024-11-07 00:36:07,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-07 00:36:08,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/status HTTP/1.1" 200 None
2024-11-07 00:36:08,100 [ scc.repo] DEBUG - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-07 00:36:08,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-11-07 00:36:09,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-11-07 00:36:09,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427/comments HTTP/1.1" 200 None
2024-11-07 00:36:09,471 [ scc.repo] DEBUG # ... Include label: include
2024-11-07 00:36:09,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-07 00:36:10,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:36:10,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:36:11,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-07 00:36:11,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1?per_page=1 HTTP/1.1" 200 None
2024-11-07 00:36:12,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-07 00:36:12,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/status HTTP/1.1" 200 None
2024-11-07 00:36:12,707 [ scc.repo] DEBUG - PR 427 Rdornier 'Add fileset folder creation'
2024-11-07 00:36:13,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-11-07 00:36:13,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-11-07 00:36:14,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-07 00:36:14,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:36:15,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:36:15,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-07 00:36:15,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-11-07 00:36:16,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-07 00:36:17,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-11-07 00:36:17,019 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-11-07 00:36:17,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-11-07 00:36:17,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-11-07 00:36:18,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-11-07 00:36:18,868 [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-11-07 00:36:19,337 [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-11-07 00:36:19,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-11-07 00:36:20,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-07 00:36:20,827 [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-11-07 00:36:21,351 [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-11-07 00:36:21,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-07 00:36:22,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-11-07 00:36:22,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-07 00:36:23,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-11-07 00:36:23,024 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-11-07 00:36:23,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-11-07 00:36:23,486 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-11-07 00:36:23,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-11-07 00:36:24,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-11-07 00:36:24,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-07 00:36:25,361 [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-11-07 00:36:25,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-07 00:36:26,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:36:26,300 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-07 00:36:26,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-11-07 00:36:27,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-11-07 00:36:27,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-07 00:36:28,251 [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-11-07 00:36:28,698 [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-11-07 00:36:29,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-07 00:36:29,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-11-07 00:36:30,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-07 00:36:30,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-11-07 00:36:30,487 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-11-07 00:36:30,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-11-07 00:36:31,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-11-07 00:36:31,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-11-07 00:36:32,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-11-07 00:36:32,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-07 00:36:33,262 [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-11-07 00:36:33,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-07 00:36:34,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:36:34,123 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-07 00:36:34,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-11-07 00:36:35,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-07 00:36:35,586 [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-11-07 00:36:36,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-07 00:36:36,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:36:36,407 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-07 00:36:36,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-11-07 00:36:37,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-11-07 00:36:37,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-07 00:36:38,363 [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-11-07 00:36:38,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-07 00:36:39,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:36:39,257 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-07 00:36:39,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-11-07 00:36:40,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-11-07 00:36:40,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-07 00:36:41,131 [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-11-07 00:36:41,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-07 00:36:42,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:36:42,086 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-11-07 00:36:42,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-11-07 00:36:42,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-11-07 00:36:43,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-11-07 00:36:43,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-11-07 00:36:43,922 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:36:43,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-07 00:36:43,923 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:36:43,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:43,929 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:36:43,932 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:36:43,933 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:36:43,938 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:36:43,943 [ scc.git] DEBUG Already up to date.
2024-11-07 00:36:43,943 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-11-07 00:36:44,369 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-07 00:36:44,369 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-11-07 00:36:44,375 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-11-07 00:36:44,995 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-07 00:36:44,995 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-11-07 00:36:45,000 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-11-07 00:36:45,315 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-07 00:36:45,316 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-11-07 00:36:45,321 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-11-07 00:36:45,628 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-07 00:36:45,628 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-11-07 00:36:45,636 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-11-07 00:36:46,094 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-07 00:36:46,094 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-11-07 00:36:46,098 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-11-07 00:36:46,461 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-07 00:36:46,461 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-11-07 00:36:46,466 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-11-07 00:36:46,765 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-07 00:36:46,765 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-11-07 00:36:46,770 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-11-07 00:36:47,253 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-07 00:36:47,253 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-11-07 00:36:47,258 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-11-07 00:36:47,983 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-07 00:36:47,984 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-11-07 00:36:47,988 [ scc.git] DEBUG Calling 'git fetch origin pull/431/head'
2024-11-07 00:36:48,318 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-07 00:36:48,318 [ scc.git] DEBUG * branch refs/pull/431/head -> FETCH_HEAD
2024-11-07 00:36:48,323 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:36:48,323 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:36:48,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:48,327 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-07 00:36:48,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:48,342 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-07 00:36:48,515 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-11-07 00:36:48,516 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-11-07 00:36:48,516 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:36:48,521 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-11-07 00:36:48,521 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-11-07 00:36:48,521 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-11-07 00:36:48,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:36:48,654 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-07 00:36:48,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:48,671 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-07 00:36:48,980 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-07 00:36:48,981 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-11-07 00:36:48,981 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:36:48,988 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-11-07 00:36:48,989 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-11-07 00:36:48,989 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-11-07 00:36:49,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:36:49,127 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-11-07 00:36:49,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:49,145 [ 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-11-07 00:36:49,189 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-11-07 00:36:49,190 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:36:49,193 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-11-07 00:36:49,193 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-11-07 00:36:49,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:36:49,504 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-11-07 00:36:49,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:49,522 [ 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-11-07 00:36:49,565 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-11-07 00:36:49,565 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-11-07 00:36:49,566 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:36:49,570 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-11-07 00:36:49,570 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-11-07 00:36:49,570 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-11-07 00:36:49,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:36:49,902 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-07 00:36:49,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:49,920 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-07 00:36:49,996 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:36:49,999 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-11-07 00:36:49,999 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-11-07 00:36:49,999 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-11-07 00:36:49,999 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-11-07 00:36:49,999 [ scc.git] DEBUG create mode 100644 connect.py
2024-11-07 00:36:50,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:36:50,284 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-11-07 00:36:50,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:50,301 [ 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-11-07 00:36:50,357 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-11-07 00:36:50,358 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:36:50,361 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-11-07 00:36:50,361 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-11-07 00:36:50,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:36:50,670 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-11-07 00:36:50,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:50,686 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-11-07 00:36:50,722 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-11-07 00:36:50,723 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:36:50,726 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-11-07 00:36:50,726 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-11-07 00:36:51,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:36:51,066 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-07 00:36:51,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:51,083 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-07 00:36:51,307 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-07 00:36:51,308 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:36:51,315 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-11-07 00:36:51,316 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-11-07 00:36:51,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:36:51,457 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-07 00:36:51,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:51,474 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Add fileset folder creation) ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-07 00:36:51,641 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:36:51,645 [ scc.git] DEBUG .gitignore | 1 +
2024-11-07 00:36:51,645 [ scc.git] DEBUG src/omero/plugins/download.py | 17 ++++++++++++-----
2024-11-07 00:36:51,645 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 5 deletions(-)
2024-11-07 00:36:51,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:36:51,835 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0e500ec05bf9227b66b28a480b40e0936241d953'
2024-11-07 00:36:51,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:51,854 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 431 (omero.HdfStorage.update: add size check on data.rowNumbers) 0e500ec05bf9227b66b28a480b40e0936241d953'
2024-11-07 00:36:51,955 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:36:51,958 [ scc.git] DEBUG src/omero/hdfstorageV2.py | 1 +
2024-11-07 00:36:51,958 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2024-11-07 00:36:52,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:36:52,225 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:36:52,267 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:36:52,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:36:52,272 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:36:52,311 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:36:52,320 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8229043e80> has no local changes
2024-11-07 00:36:52,321 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
- PR 427 Rdornier 'Add fileset folder creation'
- PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
Generated by OMERO-python-superbuild-push#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/224/)'
2024-11-07 00:36:52,330 [ scc.git] DEBUG [detached HEAD d92a1b11] merge master -Dorg -Ssuccess-only
2024-11-07 00:36:52,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:36:52,330 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-07 00:36:52,331 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:36:52,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-07 00:36:53,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-07 00:36:53,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-07 00:36:54,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-07 00:36:54,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:36:55,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:36:55,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-07 00:36:56,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:36:56,210 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-07 00:36:56,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-07 00:36:57,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-07 00:36:57,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-07 00:36:58,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-07 00:36:58,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-07 00:36:59,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-07 00:36:59,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-07 00:37:00,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-07 00:37:00,519 [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-11-07 00:37:01,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-07 00:37:01,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:37:01,530 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-07 00:37:01,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-07 00:37:02,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-07 00:37:02,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-07 00:37:03,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-07 00:37:03,481 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:37:03,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-07 00:37:03,482 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:37:03,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:03,486 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-07 00:37:03,490 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:37:03,490 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-07 00:37:03,494 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-07 00:37:03,498 [ scc.git] DEBUG Already up to date.
2024-11-07 00:37:03,498 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-07 00:37:03,890 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-07 00:37:03,891 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-07 00:37:03,896 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-07 00:37:04,190 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-07 00:37:04,190 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-07 00:37:04,194 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:37:04,194 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:37:04,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:04,198 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-07 00:37:04,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:04,209 [ 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-11-07 00:37:04,504 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-07 00:37:04,504 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-07 00:37:04,504 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-07 00:37:04,505 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-07 00:37:04,512 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-07 00:37:04,517 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-07 00:37:04,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:04,650 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-07 00:37:04,657 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-07 00:37:04,661 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#224](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/224/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/224/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-07 00:37:04,665 [ scc.config] DEBUG Found github.token
2024-11-07 00:37:04,665 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-07 00:37:04,665 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-07 00:37:04,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:04,672 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-07 00:37:04,740 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:37:04,743 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-07 00:37:04,743 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-07 00:37:05,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:05,048 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:37:05,088 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:37:05,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:05,093 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:37:05,129 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:37:05,134 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8228ff4640> has no local changes
2024-11-07 00:37:05,134 [ 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.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-python-superbuild-push#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/224/)'
2024-11-07 00:37:05,143 [ scc.git] DEBUG [detached HEAD 9f1873d] merge master -Dorg -Ssuccess-only
2024-11-07 00:37:05,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:37:05,143 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:37:05,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-11-07 00:37:06,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/594 HTTP/1.1" 200 None
2024-11-07 00:37:06,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-07 00:37:07,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:07,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:37:08,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-07 00:37:08,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/6bba7f773bb6c4217607439f9adab8814bcd0ac6?per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:09,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-07 00:37:09,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6/status HTTP/1.1" 200 None
2024-11-07 00:37:09,504 [ scc.repo] DEBUG - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-07 00:37:09,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/592 HTTP/1.1" 200 None
2024-11-07 00:37:10,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-07 00:37:11,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:11,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:37:12,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-07 00:37:12,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/721002a9ad481311a44d093e26641344492e149c?per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:12,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-07 00:37:13,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c/status HTTP/1.1" 200 None
2024-11-07 00:37:13,308 [ scc.repo] DEBUG - PR 592 jburel 'Replace pkg_resources'
2024-11-07 00:37:13,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/591 HTTP/1.1" 200 None
2024-11-07 00:37:14,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-07 00:37:14,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:15,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:37:15,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-07 00:37:16,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/8a54f0347e7174a744c4c210d0734effd029acbe?per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:16,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-07 00:37:16,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe/status HTTP/1.1" 200 None
2024-11-07 00:37:16,919 [ scc.repo] DEBUG - PR 591 jburel 'Action update'
2024-11-07 00:37:17,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/590 HTTP/1.1" 200 None
2024-11-07 00:37:17,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b62eb79447919619888bd28ee4e264f7b744f314 HTTP/1.1" 200 None
2024-11-07 00:37:18,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b62eb79447919619888bd28ee4e264f7b744f314/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:18,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b62eb79447919619888bd28ee4e264f7b744f314/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:37:19,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b62eb79447919619888bd28ee4e264f7b744f314 HTTP/1.1" 200 None
2024-11-07 00:37:19,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/b62eb79447919619888bd28ee4e264f7b744f314?per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:20,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b62eb79447919619888bd28ee4e264f7b744f314 HTTP/1.1" 200 None
2024-11-07 00:37:20,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b62eb79447919619888bd28ee4e264f7b744f314/status HTTP/1.1" 200 None
2024-11-07 00:37:20,654 [ scc.repo] DEBUG - PR 590 knabar 'Update changelog'
2024-11-07 00:37:21,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/585 HTTP/1.1" 200 None
2024-11-07 00:37:21,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583 HTTP/1.1" 200 None
2024-11-07 00:37:22,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583/comments HTTP/1.1" 200 None
2024-11-07 00:37:22,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-07 00:37:23,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:23,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:37:24,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-07 00:37:24,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/dd2879608e047a7d71a648a23e6955ce591950fd?per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:24,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-07 00:37:25,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd/status HTTP/1.1" 200 None
2024-11-07 00:37:25,327 [ scc.repo] DEBUG - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-07 00:37:25,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581 HTTP/1.1" 200 None
2024-11-07 00:37:26,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581/comments HTTP/1.1" 200 None
2024-11-07 00:37:26,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-11-07 00:37:27,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-11-07 00:37:27,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-11-07 00:37:28,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-11-07 00:37:28,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-07 00:37:29,116 [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-11-07 00:37:29,577 [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-11-07 00:37:30,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-07 00:37:30,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:30,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-07 00:37:31,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-11-07 00:37:31,406 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-07 00:37:31,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-11-07 00:37:32,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-11-07 00:37:32,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-07 00:37:33,432 [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-11-07 00:37:33,917 [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-11-07 00:37:34,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-07 00:37:34,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:35,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-07 00:37:35,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-11-07 00:37:35,728 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-07 00:37:36,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-11-07 00:37:36,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-11-07 00:37:37,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-11-07 00:37:37,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:37:38,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:37:38,149 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:37:38,149 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-07 00:37:38,149 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:37:38,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:38,155 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:37:38,160 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:37:38,160 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:37:38,165 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:37:38,171 [ scc.git] DEBUG Already up to date.
2024-11-07 00:37:38,171 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-11-07 00:37:39,834 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-07 00:37:39,834 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-11-07 00:37:39,839 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-11-07 00:37:40,128 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-07 00:37:40,128 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-11-07 00:37:40,134 [ scc.git] DEBUG Calling 'git fetch origin pull/583/head'
2024-11-07 00:37:40,597 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-07 00:37:40,598 [ scc.git] DEBUG * branch refs/pull/583/head -> FETCH_HEAD
2024-11-07 00:37:40,603 [ scc.git] DEBUG Calling 'git fetch origin pull/590/head'
2024-11-07 00:37:40,898 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-07 00:37:40,898 [ scc.git] DEBUG * branch refs/pull/590/head -> FETCH_HEAD
2024-11-07 00:37:40,903 [ scc.git] DEBUG Calling 'git fetch origin pull/591/head'
2024-11-07 00:37:41,564 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-07 00:37:41,565 [ scc.git] DEBUG * branch refs/pull/591/head -> FETCH_HEAD
2024-11-07 00:37:41,571 [ scc.git] DEBUG Calling 'git fetch origin pull/592/head'
2024-11-07 00:37:41,982 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-07 00:37:41,982 [ scc.git] DEBUG * branch refs/pull/592/head -> FETCH_HEAD
2024-11-07 00:37:41,987 [ scc.git] DEBUG Calling 'git fetch origin pull/594/head'
2024-11-07 00:37:42,406 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-07 00:37:42,406 [ scc.git] DEBUG * branch refs/pull/594/head -> FETCH_HEAD
2024-11-07 00:37:42,409 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:37:42,409 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:37:42,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:42,414 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-11-07 00:37:42,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:42,427 [ 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-11-07 00:37:42,546 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-11-07 00:37:42,547 [ scc.git] DEBUG Auto-merging setup.py
2024-11-07 00:37:42,548 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:37:42,552 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-11-07 00:37:42,552 [ scc.git] DEBUG setup.py | 1 +
2024-11-07 00:37:42,552 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-11-07 00:37:42,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:42,691 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-11-07 00:37:42,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:42,706 [ 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-11-07 00:37:42,874 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-11-07 00:37:42,875 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-11-07 00:37:42,875 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:37:42,880 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-11-07 00:37:42,880 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-11-07 00:37:42,880 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-11-07 00:37:43,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:43,082 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dd2879608e047a7d71a648a23e6955ce591950fd'
2024-11-07 00:37:43,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:43,096 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 583 (Allow users to click a group name to quick-switch to that group) dd2879608e047a7d71a648a23e6955ce591950fd'
2024-11-07 00:37:43,236 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:37:43,239 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_content.html | 8 ++++++--
2024-11-07 00:37:43,239 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_dropdown2.html | 2 --
2024-11-07 00:37:43,240 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-07 00:37:43,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:43,468 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b62eb79447919619888bd28ee4e264f7b744f314'
2024-11-07 00:37:43,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:43,482 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 590 (Update changelog) b62eb79447919619888bd28ee4e264f7b744f314'
2024-11-07 00:37:43,500 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:37:43,502 [ scc.git] DEBUG CHANGELOG.md | 15 +++++++++++++++
2024-11-07 00:37:43,502 [ scc.git] DEBUG 1 file changed, 15 insertions(+)
2024-11-07 00:37:43,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:43,856 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-07 00:37:43,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:43,869 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 591 (Action update) 8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-07 00:37:44,156 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:37:44,160 [ scc.git] DEBUG .github/workflows/codeql-analysis.yml | 2 +-
2024-11-07 00:37:44,160 [ scc.git] DEBUG .github/workflows/install.yml | 4 ++--
2024-11-07 00:37:44,160 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-11-07 00:37:44,160 [ scc.git] DEBUG .github/workflows/tox.yml | 4 ++--
2024-11-07 00:37:44,160 [ scc.git] DEBUG .gitignore | 1 +
2024-11-07 00:37:44,160 [ scc.git] DEBUG 5 files changed, 9 insertions(+), 8 deletions(-)
2024-11-07 00:37:44,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:44,293 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...721002a9ad481311a44d093e26641344492e149c'
2024-11-07 00:37:44,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:44,305 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 592 (Replace pkg_resources) 721002a9ad481311a44d093e26641344492e149c'
2024-11-07 00:37:44,447 [ scc.git] DEBUG Auto-merging setup.py
2024-11-07 00:37:44,448 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:37:44,452 [ scc.git] DEBUG omero/plugins/web.py | 6 +++---
2024-11-07 00:37:44,452 [ scc.git] DEBUG setup.py | 3 ++-
2024-11-07 00:37:44,452 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 4 deletions(-)
2024-11-07 00:37:44,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:44,672 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6bba7f773bb6c4217607439f9adab8814bcd0ac6'
2024-11-07 00:37:44,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:44,684 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 594 (Add minimum batch size to avoid infinite loop due to zero batch size) 6bba7f773bb6c4217607439f9adab8814bcd0ac6'
2024-11-07 00:37:44,703 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:37:44,706 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/omero_table.html | 5 +++--
2024-11-07 00:37:44,706 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-11-07 00:37:45,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:45,052 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:37:45,090 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:37:45,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:37:45,099 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:37:45,136 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:37:45,146 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8229002be0> has no local changes
2024-11-07 00:37:45,146 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
- PR 590 knabar 'Update changelog'
- PR 591 jburel 'Action update'
- PR 592 jburel 'Replace pkg_resources'
- PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
Generated by OMERO-python-superbuild-push#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/224/)'
2024-11-07 00:37:45,157 [ scc.git] DEBUG [detached HEAD 026ca14c5] merge master -Dorg -Ssuccess-only
2024-11-07 00:37:45,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:37:45,157 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:37:45,204 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-11-07 00:37:45,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:45,450 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-11-07 00:37:45,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:45,846 [ scc.config] DEBUG Found submodule.omero-py.url
2024-11-07 00:37:46,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:46,223 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-11-07 00:37:46,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:46,612 [ scc.config] DEBUG Found submodule.omero-web.url
2024-11-07 00:37:46,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:37:46,988 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:37:47,016 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f822a328a00> has local changes
2024-11-07 00:37:47,017 [ 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 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
- PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
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 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
- PR 427 Rdornier 'Add fileset folder creation'
- PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
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.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
- PR 590 knabar 'Update changelog'
- PR 591 jburel 'Action update'
- PR 592 jburel 'Replace pkg_resources'
- PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
Generated by OMERO-python-superbuild-push#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/224/)'
2024-11-07 00:37:47,028 [ scc.git] DEBUG [detached HEAD 52c9213] merge master -Dorg -Ssuccess-only
2024-11-07 00:37:47,028 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-07 00:37:47,028 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-11-07 00:37:47,028 [ scc.merge] INFO Already up to date.
2024-11-07 00:37:47,028 [ scc.merge] INFO
2024-11-07 00:37:47,028 [ scc.merge] INFO Merged PRs:
2024-11-07 00:37:47,028 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-07 00:37:47,029 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-07 00:37:47,029 [ scc.merge] INFO
2024-11-07 00:37:47,029 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-11-07 00:37:47,029 [ scc.merge] INFO Already up to date.
2024-11-07 00:37:47,029 [ scc.merge] INFO
2024-11-07 00:37:47,029 [ scc.merge] INFO Merged PRs:
2024-11-07 00:37:47,029 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-07 00:37:47,029 [ scc.merge] INFO
2024-11-07 00:37:47,029 [ scc.merge] INFO Repository: ome/omero-marshal
2024-11-07 00:37:47,029 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:37:47,029 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-11-07 00:37:47,029 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-11-07 00:37:47,029 [ scc.merge] INFO Already up to date.
2024-11-07 00:37:47,029 [ scc.merge] INFO
2024-11-07 00:37:47,029 [ scc.merge] INFO Merged PRs:
2024-11-07 00:37:47,029 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-07 00:37:47,029 [ scc.merge] INFO
2024-11-07 00:37:47,029 [ scc.merge] INFO Repository: ome/omero-py
2024-11-07 00:37:47,030 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-11-07 00:37:47,030 [ scc.merge] INFO Already up to date.
2024-11-07 00:37:47,030 [ scc.merge] INFO
2024-11-07 00:37:47,030 [ scc.merge] INFO Merged PRs:
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-07 00:37:47,030 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-11-07 00:37:47,031 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-11-07 00:37:47,031 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation'
2024-11-07 00:37:47,031 [ scc.merge] INFO - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-07 00:37:47,031 [ scc.merge] INFO
2024-11-07 00:37:47,031 [ scc.merge] INFO Repository: ome/omero-scripts
2024-11-07 00:37:47,031 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:37:47,031 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-07 00:37:47,031 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-07 00:37:47,031 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-07 00:37:47,031 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-07 00:37:47,031 [ scc.merge] INFO Already up to date.
2024-11-07 00:37:47,031 [ scc.merge] INFO
2024-11-07 00:37:47,031 [ scc.merge] INFO Merged PRs:
2024-11-07 00:37:47,031 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-07 00:37:47,031 [ scc.merge] INFO
2024-11-07 00:37:47,031 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-07 00:37:47,031 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-07 00:37:47,031 [ scc.merge] INFO
2024-11-07 00:37:47,032 [ scc.merge] INFO Repository: ome/omero-web
2024-11-07 00:37:47,032 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:37:47,032 [ scc.merge] INFO - PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-07 00:37:47,032 [ scc.merge] INFO - PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
2024-11-07 00:37:47,032 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-11-07 00:37:47,032 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-11-07 00:37:47,032 [ scc.merge] INFO Already up to date.
2024-11-07 00:37:47,032 [ scc.merge] INFO
2024-11-07 00:37:47,032 [ scc.merge] INFO Merged PRs:
2024-11-07 00:37:47,032 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-07 00:37:47,032 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-07 00:37:47,032 [ scc.merge] INFO - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-07 00:37:47,032 [ scc.merge] INFO - PR 590 knabar 'Update changelog'
2024-11-07 00:37:47,032 [ scc.merge] INFO - PR 591 jburel 'Action update'
2024-11-07 00:37:47,032 [ scc.merge] INFO - PR 592 jburel 'Replace pkg_resources'
2024-11-07 00:37:47,032 [ scc.merge] INFO - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-07 00:37:47,032 [ scc.merge] INFO
2024-11-07 00:37:47,033 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-07 00:37:47,033 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:37:47,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-07 00:37:47,039 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:37:47,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:37:47,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-07 00:37:47,044 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:37:47,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:37:47,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-07 00:37:47,052 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:37:47,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:37:47,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-07 00:37:47,057 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:37:47,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-07 00:37:47,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-07 00:37:47,063 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:37:47,067 [ 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 a4307f4
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 4fd72efa
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from 213bb61ad
nothing to commit, working tree clean
HEAD detached from e849d72
nothing to commit, working tree clean
2024-11-07 00:38:14,649 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
