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-08 00:34:37,131 [ scc.config] DEBUG Found github.token
2024-11-08 00:34:37,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-08 00:34:37,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:34:37,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:34:38,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-08 00:34:38,064 [ scc.gh] DEBUG 4322 remaining from 5000 (Reset at 00:11
2024-11-08 00:34:38,065 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-08 00:34:38,069 [ scc.git] DEBUG Check current status
2024-11-08 00:34:38,070 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-08 00:34:38,076 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-08 00:34:38,076 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-08 00:34:38,130 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-08 00:34:38,135 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-08 00:34:38,141 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-08 00:34:38,147 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-08 00:34:38,153 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-08 00:34:38,160 [ scc.config] DEBUG Found remote.origin.url
2024-11-08 00:34:38,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-08 00:34:38,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-08 00:34:39,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-08 00:34:39,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-08 00:34:40,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-08 00:34:40,246 [ scc.git] DEBUG Resetting...
2024-11-08 00:34:40,246 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-08 00:34:40,254 [ scc.git] DEBUG HEAD is now at e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-08 00:34:40,255 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-08 00:34:40,305 [ scc.git] DEBUG Check current status
2024-11-08 00:34:40,306 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-08 00:34:40,310 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-08 00:34:40,310 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-08 00:34:40,348 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-08 00:34:40,352 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-08 00:34:40,355 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-08 00:34:40,360 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-08 00:34:40,364 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-08 00:34:40,365 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-08 00:34:40,365 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-08 00:34:40,365 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-08 00:34:40,365 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-08 00:34:40,365 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-08 00:34:40,365 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:34:40,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-08 00:34:41,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-08 00:34:41,156 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-08 00:34:41,156 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-08 00:34:41,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-08 00:34:41,636 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-08 00:34:41,637 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-08 00:34:41,637 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:34:41,637 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:34:41,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:34:41,668 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:34:41,695 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:34:41,697 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:34:41,736 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:34:41,762 [ scc.git] DEBUG Already up to date.
2024-11-08 00:34:41,764 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-08 00:34:42,147 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-08 00:34:42,147 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-08 00:34:42,154 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-08 00:34:42,452 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-08 00:34:42,453 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-08 00:34:42,457 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:34:42,457 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:34:42,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:34:42,462 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-08 00:34:42,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:34:42,472 [ 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-08 00:34:42,481 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:34:42,483 [ scc.git] DEBUG omero-py | 2 +-
2024-11-08 00:34:42,483 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-08 00:34:42,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:34:42,613 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-08 00:34:42,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:34:42,623 [ 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-08 00:34:42,633 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:34:42,636 [ scc.git] DEBUG omero-web | 2 +-
2024-11-08 00:34:42,636 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-08 00:34:43,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:34:43,005 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:34:43,062 [ scc.git] DEBUG Submodule path 'omero-py': checked out '4fd72efaa8cdbec9da98e1d28678af16878a86ba'
2024-11-08 00:34:43,216 [ scc.git] DEBUG Submodule path 'omero-web': checked out '213bb61adc23aed4a750f2a83dc94b7efdb22cee'
2024-11-08 00:34:43,216 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:34:43,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:34:43,221 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:34:43,431 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0112327a00> has no local changes
2024-11-08 00:34:43,431 [ 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#225 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/225/)'
2024-11-08 00:34:43,462 [ scc.git] DEBUG [detached HEAD 7aa19de] merge master -Dorg -Snone
2024-11-08 00:34:43,462 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-08 00:34:43,463 [ scc.merge] INFO Already up to date.
2024-11-08 00:34:43,463 [ scc.merge] INFO
2024-11-08 00:34:43,463 [ scc.merge] INFO Merged PRs:
2024-11-08 00:34:43,463 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-08 00:34:43,463 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-08 00:34:43,463 [ scc.merge] INFO
2024-11-08 00:34:43,463 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-08 00:34:43,463 [ 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-08 00:34:45,598 [ scc.config] DEBUG Found github.token
2024-11-08 00:34:45,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-08 00:34:45,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:34:46,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:34:46,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-08 00:34:46,541 [ scc.gh] DEBUG 4310 remaining from 5000 (Reset at 00:11
2024-11-08 00:34:46,542 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-08 00:34:46,545 [ scc.git] DEBUG Check current status
2024-11-08 00:34:46,546 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-08 00:34:46,550 [ scc.git] DEBUG 7aa19de merge master -Dorg -Snone
2024-11-08 00:34:46,550 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-08 00:34:46,592 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-08 00:34:46,594 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-08 00:34:46,598 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-08 00:34:46,602 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-08 00:34:46,608 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-08 00:34:46,614 [ scc.config] DEBUG Found remote.origin.url
2024-11-08 00:34:46,615 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-11-08 00:34:46,616 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-11-08 00:34:47,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-08 00:34:47,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-08 00:34:47,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-08 00:34:48,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-08 00:34:48,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-08 00:34:48,744 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:34:48,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-08 00:34:48,792 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-08 00:34:48,796 [ scc.git] DEBUG Check current status
2024-11-08 00:34:48,796 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-08 00:34:48,800 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-11-08 00:34:48,800 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-08 00:34:48,844 [ scc.config] DEBUG Found remote.origin.url
2024-11-08 00:34:49,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-11-08 00:34:49,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-08 00:34:50,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-08 00:34:50,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-08 00:34:50,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-08 00:34:50,879 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:34:50,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:34:50,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-08 00:34:50,915 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-08 00:34:50,919 [ scc.git] DEBUG Check current status
2024-11-08 00:34:50,920 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-08 00:34:50,924 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-11-08 00:34:50,924 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-08 00:34:50,962 [ scc.config] DEBUG Found remote.origin.url
2024-11-08 00:34:51,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-11-08 00:34:51,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-08 00:34:52,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-08 00:34:52,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-08 00:34:53,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-08 00:34:53,009 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:34:53,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:34:53,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-08 00:34:53,049 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-08 00:34:53,053 [ scc.git] DEBUG Check current status
2024-11-08 00:34:53,054 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-08 00:34:53,057 [ scc.git] DEBUG 4fd72efa Bump version: 5.19.5 → 5.19.6.dev0
2024-11-08 00:34:53,058 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-08 00:34:53,098 [ scc.config] DEBUG Found remote.origin.url
2024-11-08 00:34:53,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-11-08 00:34:53,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-08 00:34:54,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-08 00:34:54,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-08 00:34:55,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-08 00:34:55,177 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:34:55,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:34:55,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-08 00:34:55,216 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-08 00:34:55,220 [ scc.git] DEBUG Check current status
2024-11-08 00:34:55,220 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-08 00:34:55,224 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-08 00:34:55,224 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-08 00:34:55,267 [ scc.config] DEBUG Found remote.origin.url
2024-11-08 00:34:55,267 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-11-08 00:34:55,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-11-08 00:34:56,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-08 00:34:56,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-08 00:34:56,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-08 00:34:57,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-08 00:34:57,281 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:34:57,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:34:57,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-08 00:34:57,319 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-08 00:34:57,323 [ scc.git] DEBUG Check current status
2024-11-08 00:34:57,323 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-08 00:34:57,376 [ scc.git] DEBUG 213bb61ad Merge pull request #580 from sbesson/obj_id_mask_no_match
2024-11-08 00:34:57,377 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-08 00:34:57,417 [ scc.config] DEBUG Found remote.origin.url
2024-11-08 00:34:57,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-11-08 00:34:58,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-08 00:34:58,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-08 00:34:59,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-08 00:34:59,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-08 00:34:59,473 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:34:59,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:34:59,511 [ scc.git] DEBUG Resetting...
2024-11-08 00:34:59,511 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-08 00:34:59,517 [ scc.git] DEBUG HEAD is now at 7aa19de merge master -Dorg -Snone
2024-11-08 00:34:59,517 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-08 00:34:59,566 [ scc.git] DEBUG Check current status
2024-11-08 00:34:59,566 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-08 00:34:59,570 [ scc.git] DEBUG 7aa19de merge master -Dorg -Snone
2024-11-08 00:34:59,571 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-08 00:34:59,608 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-08 00:34:59,611 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-08 00:34:59,614 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-08 00:34:59,618 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-08 00:34:59,621 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-08 00:34:59,622 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-08 00:34:59,622 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-08 00:34:59,622 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-08 00:34:59,622 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-08 00:34:59,622 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-08 00:34:59,622 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-11-08 00:34:59,622 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:34:59,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-08 00:35:00,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-08 00:35:00,480 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-08 00:35:01,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-08 00:35:01,466 [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-08 00:35:01,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-08 00:35:02,270 [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-08 00:35:02,271 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-08 00:35:02,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-08 00:35:02,724 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-08 00:35:03,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-08 00:35:03,730 [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-08 00:35:04,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-08 00:35:04,551 [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-08 00:35:04,552 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-08 00:35:04,552 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:35:04,552 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:35:04,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:04,558 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:35:04,563 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:35:04,563 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:35:04,569 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:35:04,575 [ scc.git] DEBUG Already up to date.
2024-11-08 00:35:04,576 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-08 00:35:04,901 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-08 00:35:04,901 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-08 00:35:04,909 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-08 00:35:05,236 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-08 00:35:05,236 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-08 00:35:05,243 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:35:05,243 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:35:05,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:05,249 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-08 00:35:05,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:05,259 [ 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-08 00:35:05,264 [ scc.git] DEBUG Already up to date.
2024-11-08 00:35:05,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:35:05,407 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-08 00:35:05,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:05,418 [ 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-08 00:35:05,423 [ scc.git] DEBUG Already up to date.
2024-11-08 00:35:05,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:35:05,795 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:35:05,846 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:35:05,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:05,851 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:35:06,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-11-08 00:35:06,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-11-08 00:35:07,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-11-08 00:35:07,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-08 00:35:08,281 [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-08 00:35:08,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-08 00:35:09,152 [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-08 00:35:09,152 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-08 00:35:09,153 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:35:09,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-08 00:35:09,153 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:35:09,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:09,157 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:35:09,161 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:35:09,161 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:35:09,165 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:35:09,169 [ scc.git] DEBUG Already up to date.
2024-11-08 00:35:09,169 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-11-08 00:35:09,530 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-11-08 00:35:09,530 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-11-08 00:35:09,535 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:35:09,535 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:35:09,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:09,540 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-11-08 00:35:09,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:09,551 [ 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-08 00:35:09,648 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-11-08 00:35:09,648 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-11-08 00:35:09,648 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-11-08 00:35:09,648 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-11-08 00:35:09,648 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-11-08 00:35:09,648 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-11-08 00:35:09,648 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-11-08 00:35:09,648 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-11-08 00:35:09,648 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-11-08 00:35:09,649 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:35:09,652 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-11-08 00:35:09,653 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-11-08 00:35:09,653 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-11-08 00:35:09,653 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-11-08 00:35:09,653 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-11-08 00:35:09,653 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-11-08 00:35:09,653 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-11-08 00:35:09,653 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-11-08 00:35:09,653 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-11-08 00:35:09,653 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-11-08 00:35:09,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:35:09,790 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:35:09,831 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:35:09,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:09,836 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:35:09,873 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:35:09,879 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb608fdef40> has no local changes
2024-11-08 00:35:09,880 [ 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#225 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/225/)'
2024-11-08 00:35:09,888 [ scc.git] DEBUG [detached HEAD 42a0a71] merge master -Dorg -Ssuccess-only
2024-11-08 00:35:09,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:35:09,889 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:35:10,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-11-08 00:35:10,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-11-08 00:35:11,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-11-08 00:35:11,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-08 00:35:12,197 [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-08 00:35:12,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-08 00:35:13,079 [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-08 00:35:13,080 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-08 00:35:13,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-11-08 00:35:14,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-11-08 00:35:14,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-11-08 00:35:15,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-11-08 00:35:15,090 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:35:15,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-08 00:35:15,091 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:35:15,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:15,097 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:35:15,103 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:35:15,103 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:35:15,109 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:35:15,115 [ scc.git] DEBUG Already up to date.
2024-11-08 00:35:15,116 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-11-08 00:35:15,492 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-11-08 00:35:15,493 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-11-08 00:35:15,530 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:35:15,532 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:35:15,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:15,556 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-08 00:35:15,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:15,566 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-08 00:35:15,575 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-11-08 00:35:15,576 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:35:15,578 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-11-08 00:35:15,578 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-11-08 00:35:15,578 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-11-08 00:35:15,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:35:15,724 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:35:15,761 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:35:15,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:15,766 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:35:15,812 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:35:15,820 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb60927a430> has no local changes
2024-11-08 00:35:15,820 [ 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#225 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/225/)'
2024-11-08 00:35:15,830 [ scc.git] DEBUG [detached HEAD f671a50] merge master -Dorg -Ssuccess-only
2024-11-08 00:35:15,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:35:15,831 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:35:16,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-11-08 00:35:16,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/431 HTTP/1.1" 200 None
2024-11-08 00:35:17,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-08 00:35:17,974 [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-08 00:35:18,430 [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-08 00:35:18,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-08 00:35:19,339 [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-08 00:35:19,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-08 00:35:20,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/status HTTP/1.1" 200 None
2024-11-08 00:35:20,283 [ scc.repo] DEBUG - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-08 00:35:20,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-11-08 00:35:21,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-11-08 00:35:21,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427/comments HTTP/1.1" 200 None
2024-11-08 00:35:21,706 [ scc.repo] DEBUG # ... Include label: include
2024-11-08 00:35:22,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-08 00:35:22,641 [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-08 00:35:23,120 [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-08 00:35:23,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-08 00:35:23,934 [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-08 00:35:24,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-08 00:35:24,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/status HTTP/1.1" 200 None
2024-11-08 00:35:24,884 [ scc.repo] DEBUG - PR 427 Rdornier 'Add fileset folder creation'
2024-11-08 00:35:25,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-11-08 00:35:25,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-11-08 00:35:26,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-08 00:35:26,770 [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-08 00:35:27,221 [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-08 00:35:27,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-08 00:35:28,035 [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-08 00:35:28,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-08 00:35:28,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-11-08 00:35:28,988 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-11-08 00:35:29,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-11-08 00:35:29,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-11-08 00:35:30,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-11-08 00:35:30,866 [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-08 00:35:31,311 [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-08 00:35:31,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-11-08 00:35:32,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-08 00:35:32,738 [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-08 00:35:33,216 [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-08 00:35:33,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-08 00:35:34,172 [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-08 00:35:34,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-08 00:35:35,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-11-08 00:35:35,095 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-11-08 00:35:35,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-11-08 00:35:35,559 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-11-08 00:35:35,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-11-08 00:35:36,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-11-08 00:35:36,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-08 00:35:37,349 [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-08 00:35:37,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-08 00:35:38,243 [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-08 00:35:38,244 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-08 00:35:38,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-11-08 00:35:39,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-11-08 00:35:39,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-08 00:35:40,096 [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-08 00:35:40,593 [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-08 00:35:41,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-08 00:35:41,493 [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-08 00:35:42,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-08 00:35:42,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-11-08 00:35:42,422 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-11-08 00:35:42,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-11-08 00:35:43,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-11-08 00:35:43,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-11-08 00:35:44,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-11-08 00:35:44,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-08 00:35:45,366 [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-08 00:35:45,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-08 00:35:46,188 [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-08 00:35:46,189 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-08 00:35:46,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-11-08 00:35:47,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-08 00:35:47,588 [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-08 00:35:48,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-08 00:35:48,449 [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-08 00:35:48,450 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-08 00:35:48,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-11-08 00:35:49,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-11-08 00:35:49,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-08 00:35:50,383 [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-08 00:35:50,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-08 00:35:51,278 [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-08 00:35:51,278 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-08 00:35:51,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-11-08 00:35:52,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-11-08 00:35:52,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-08 00:35:53,188 [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-08 00:35:53,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-08 00:35:54,108 [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-08 00:35:54,109 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-11-08 00:35:54,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-11-08 00:35:54,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-11-08 00:35:55,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-11-08 00:35:55,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-11-08 00:35:55,889 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:35:55,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-08 00:35:55,889 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:35:55,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:35:55,894 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:35:55,898 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:35:55,898 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:35:55,904 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:35:55,909 [ scc.git] DEBUG Already up to date.
2024-11-08 00:35:55,909 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-11-08 00:35:57,398 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-08 00:35:57,399 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-11-08 00:35:57,403 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-11-08 00:35:57,714 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-08 00:35:57,714 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-11-08 00:35:57,719 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-11-08 00:35:58,081 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-08 00:35:58,082 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-11-08 00:35:58,086 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-11-08 00:35:58,395 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-08 00:35:58,395 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-11-08 00:35:58,403 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-11-08 00:35:58,845 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-08 00:35:58,846 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-11-08 00:35:58,850 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-11-08 00:35:59,146 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-08 00:35:59,146 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-11-08 00:35:59,151 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-11-08 00:35:59,437 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-08 00:35:59,438 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-11-08 00:35:59,442 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-11-08 00:35:59,736 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-08 00:35:59,736 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-11-08 00:35:59,741 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-11-08 00:36:00,021 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-08 00:36:00,021 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-11-08 00:36:00,026 [ scc.git] DEBUG Calling 'git fetch origin pull/431/head'
2024-11-08 00:36:00,328 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-08 00:36:00,328 [ scc.git] DEBUG * branch refs/pull/431/head -> FETCH_HEAD
2024-11-08 00:36:00,332 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:36:00,332 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:36:00,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:00,337 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-08 00:36:00,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:00,353 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-08 00:36:00,374 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-11-08 00:36:00,374 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-11-08 00:36:00,375 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:00,378 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-11-08 00:36:00,378 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-11-08 00:36:00,378 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-11-08 00:36:00,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:00,520 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-08 00:36:00,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:00,536 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-08 00:36:00,571 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-08 00:36:00,572 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-11-08 00:36:00,572 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:00,579 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-11-08 00:36:00,579 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-11-08 00:36:00,579 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-11-08 00:36:00,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:00,909 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-11-08 00:36:00,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:00,925 [ 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-08 00:36:00,961 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-11-08 00:36:00,962 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:00,965 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-11-08 00:36:00,965 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-11-08 00:36:01,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:01,283 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-11-08 00:36:01,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:01,299 [ 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-08 00:36:01,357 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-11-08 00:36:01,357 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-11-08 00:36:01,358 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:01,362 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-11-08 00:36:01,362 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-11-08 00:36:01,362 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-11-08 00:36:01,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:01,668 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-08 00:36:01,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:01,690 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-08 00:36:01,708 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:01,710 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-11-08 00:36:01,710 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-11-08 00:36:01,710 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-11-08 00:36:01,711 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-11-08 00:36:01,711 [ scc.git] DEBUG create mode 100644 connect.py
2024-11-08 00:36:02,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:02,053 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-11-08 00:36:02,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:02,070 [ 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-08 00:36:02,180 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-11-08 00:36:02,182 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:02,185 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-11-08 00:36:02,185 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-11-08 00:36:02,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:02,428 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-11-08 00:36:02,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:02,445 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-11-08 00:36:02,711 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-11-08 00:36:02,711 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:02,715 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-11-08 00:36:02,715 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-11-08 00:36:02,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:02,876 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-08 00:36:02,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:02,892 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-08 00:36:03,213 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-08 00:36:03,214 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:03,221 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-11-08 00:36:03,221 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-11-08 00:36:03,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:03,366 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-08 00:36:03,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:03,382 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Add fileset folder creation) ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-08 00:36:03,438 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:03,441 [ scc.git] DEBUG .gitignore | 1 +
2024-11-08 00:36:03,441 [ scc.git] DEBUG src/omero/plugins/download.py | 17 ++++++++++++-----
2024-11-08 00:36:03,441 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 5 deletions(-)
2024-11-08 00:36:03,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:03,756 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0e500ec05bf9227b66b28a480b40e0936241d953'
2024-11-08 00:36:03,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:03,775 [ 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-08 00:36:03,796 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:03,799 [ scc.git] DEBUG src/omero/hdfstorageV2.py | 1 +
2024-11-08 00:36:03,799 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2024-11-08 00:36:04,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:04,142 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:36:04,182 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:36:04,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:04,188 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:36:04,231 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:36:04,244 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb608794eb0> has no local changes
2024-11-08 00:36:04,244 [ 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#225 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/225/)'
2024-11-08 00:36:04,255 [ scc.git] DEBUG [detached HEAD 1a6038ff] merge master -Dorg -Ssuccess-only
2024-11-08 00:36:04,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:36:04,255 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-08 00:36:04,256 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:36:04,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-08 00:36:05,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-08 00:36:05,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-08 00:36:06,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-08 00:36:06,724 [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-08 00:36:07,222 [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-08 00:36:07,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-08 00:36:08,024 [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-08 00:36:08,025 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-08 00:36:08,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-08 00:36:09,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-08 00:36:09,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-08 00:36:10,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-08 00:36:10,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-08 00:36:10,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-08 00:36:11,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-08 00:36:11,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-08 00:36:12,360 [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-08 00:36:12,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-08 00:36:13,188 [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-08 00:36:13,189 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-08 00:36:13,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-08 00:36:14,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-08 00:36:14,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-08 00:36:15,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-08 00:36:15,052 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:36:15,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-08 00:36:15,052 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:36:15,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:15,057 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-08 00:36:15,061 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:36:15,061 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-08 00:36:15,065 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-08 00:36:15,070 [ scc.git] DEBUG Already up to date.
2024-11-08 00:36:15,070 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-08 00:36:15,967 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-08 00:36:15,967 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-08 00:36:15,972 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-08 00:36:16,430 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-08 00:36:16,431 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-08 00:36:16,435 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:36:16,436 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:36:16,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:16,440 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-08 00:36:16,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:16,450 [ 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-08 00:36:16,655 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-08 00:36:16,655 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-08 00:36:16,655 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-08 00:36:16,655 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-08 00:36:16,661 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-08 00:36:16,666 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-08 00:36:16,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:16,795 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-08 00:36:16,802 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-08 00:36:16,808 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#225](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/225/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/225/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-08 00:36:16,818 [ scc.config] DEBUG Found github.token
2024-11-08 00:36:16,818 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-08 00:36:16,819 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-08 00:36:16,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:16,827 [ 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-08 00:36:16,870 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:16,873 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-08 00:36:16,873 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-08 00:36:17,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:17,185 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:36:17,221 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:36:17,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:17,232 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:36:17,273 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:36:17,297 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb608746640> has no local changes
2024-11-08 00:36:17,300 [ 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#225 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/225/)'
2024-11-08 00:36:17,361 [ scc.git] DEBUG [detached HEAD f9c3ae3] merge master -Dorg -Ssuccess-only
2024-11-08 00:36:17,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:36:17,368 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:36:17,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-11-08 00:36:18,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/594 HTTP/1.1" 200 None
2024-11-08 00:36:18,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-08 00:36:19,248 [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-08 00:36:19,690 [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-08 00:36:20,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-08 00:36:20,512 [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-08 00:36:21,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-08 00:36:21,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6/status HTTP/1.1" 200 None
2024-11-08 00:36:21,527 [ scc.repo] DEBUG - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-08 00:36:21,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/592 HTTP/1.1" 200 None
2024-11-08 00:36:22,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-08 00:36:22,942 [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-08 00:36:23,404 [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-08 00:36:23,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-08 00:36:24,243 [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-08 00:36:24,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-08 00:36:25,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c/status HTTP/1.1" 200 None
2024-11-08 00:36:25,141 [ scc.repo] DEBUG - PR 592 jburel 'Replace pkg_resources'
2024-11-08 00:36:25,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/591 HTTP/1.1" 200 None
2024-11-08 00:36:26,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-08 00:36:26,547 [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-08 00:36:27,006 [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-08 00:36:27,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-08 00:36:27,936 [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-08 00:36:28,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-08 00:36:28,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe/status HTTP/1.1" 200 None
2024-11-08 00:36:28,846 [ scc.repo] DEBUG - PR 591 jburel 'Action update'
2024-11-08 00:36:29,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/590 HTTP/1.1" 200 None
2024-11-08 00:36:29,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b62eb79447919619888bd28ee4e264f7b744f314 HTTP/1.1" 200 None
2024-11-08 00:36:30,229 [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-08 00:36:30,707 [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-08 00:36:31,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b62eb79447919619888bd28ee4e264f7b744f314 HTTP/1.1" 200 None
2024-11-08 00:36:31,641 [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-08 00:36:32,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b62eb79447919619888bd28ee4e264f7b744f314 HTTP/1.1" 200 None
2024-11-08 00:36:32,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b62eb79447919619888bd28ee4e264f7b744f314/status HTTP/1.1" 200 None
2024-11-08 00:36:32,491 [ scc.repo] DEBUG - PR 590 knabar 'Update changelog'
2024-11-08 00:36:32,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/585 HTTP/1.1" 200 None
2024-11-08 00:36:33,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583 HTTP/1.1" 200 None
2024-11-08 00:36:33,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583/comments HTTP/1.1" 200 None
2024-11-08 00:36:34,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-08 00:36:35,049 [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-08 00:36:35,494 [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-08 00:36:35,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-08 00:36:36,330 [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-08 00:36:36,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-08 00:36:37,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd/status HTTP/1.1" 200 None
2024-11-08 00:36:37,174 [ scc.repo] DEBUG - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-08 00:36:37,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581 HTTP/1.1" 200 None
2024-11-08 00:36:38,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581/comments HTTP/1.1" 200 None
2024-11-08 00:36:38,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-11-08 00:36:39,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-11-08 00:36:39,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-11-08 00:36:39,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-11-08 00:36:40,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-08 00:36:40,916 [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-08 00:36:41,348 [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-08 00:36:41,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-08 00:36:42,254 [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-08 00:36:42,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-08 00:36:43,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-11-08 00:36:43,110 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-08 00:36:43,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-11-08 00:36:44,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-11-08 00:36:44,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-08 00:36:45,031 [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-08 00:36:45,536 [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-08 00:36:45,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-08 00:36:46,369 [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-08 00:36:46,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-08 00:36:47,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-11-08 00:36:47,214 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-08 00:36:47,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-11-08 00:36:48,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-11-08 00:36:48,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-11-08 00:36:49,163 [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-08 00:36:49,589 [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-08 00:36:49,591 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:36:49,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-08 00:36:49,592 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:36:49,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:49,597 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:36:49,601 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:36:49,601 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:36:49,606 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:36:49,611 [ scc.git] DEBUG Already up to date.
2024-11-08 00:36:49,611 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-11-08 00:36:51,323 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-08 00:36:51,323 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-11-08 00:36:51,328 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-11-08 00:36:51,635 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-08 00:36:51,635 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-11-08 00:36:51,640 [ scc.git] DEBUG Calling 'git fetch origin pull/583/head'
2024-11-08 00:36:52,089 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-08 00:36:52,089 [ scc.git] DEBUG * branch refs/pull/583/head -> FETCH_HEAD
2024-11-08 00:36:52,094 [ scc.git] DEBUG Calling 'git fetch origin pull/590/head'
2024-11-08 00:36:52,381 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-08 00:36:52,381 [ scc.git] DEBUG * branch refs/pull/590/head -> FETCH_HEAD
2024-11-08 00:36:52,386 [ scc.git] DEBUG Calling 'git fetch origin pull/591/head'
2024-11-08 00:36:53,264 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-08 00:36:53,264 [ scc.git] DEBUG * branch refs/pull/591/head -> FETCH_HEAD
2024-11-08 00:36:53,270 [ scc.git] DEBUG Calling 'git fetch origin pull/592/head'
2024-11-08 00:36:53,577 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-08 00:36:53,577 [ scc.git] DEBUG * branch refs/pull/592/head -> FETCH_HEAD
2024-11-08 00:36:53,582 [ scc.git] DEBUG Calling 'git fetch origin pull/594/head'
2024-11-08 00:36:53,884 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-08 00:36:53,884 [ scc.git] DEBUG * branch refs/pull/594/head -> FETCH_HEAD
2024-11-08 00:36:53,890 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:36:53,890 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:36:53,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:53,895 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-11-08 00:36:53,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:53,909 [ 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-08 00:36:53,930 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-11-08 00:36:53,930 [ scc.git] DEBUG Auto-merging setup.py
2024-11-08 00:36:53,931 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:53,934 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-11-08 00:36:53,935 [ scc.git] DEBUG setup.py | 1 +
2024-11-08 00:36:53,935 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-11-08 00:36:54,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:54,084 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-11-08 00:36:54,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:54,098 [ 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-08 00:36:54,118 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-11-08 00:36:54,119 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-11-08 00:36:54,119 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:54,124 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-11-08 00:36:54,124 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-11-08 00:36:54,124 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-11-08 00:36:54,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:54,473 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dd2879608e047a7d71a648a23e6955ce591950fd'
2024-11-08 00:36:54,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:54,487 [ 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-08 00:36:54,700 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:54,703 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_content.html | 8 ++++++--
2024-11-08 00:36:54,704 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_dropdown2.html | 2 --
2024-11-08 00:36:54,704 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-08 00:36:54,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:54,860 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b62eb79447919619888bd28ee4e264f7b744f314'
2024-11-08 00:36:54,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:54,875 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 590 (Update changelog) b62eb79447919619888bd28ee4e264f7b744f314'
2024-11-08 00:36:54,894 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:54,897 [ scc.git] DEBUG CHANGELOG.md | 15 +++++++++++++++
2024-11-08 00:36:54,897 [ scc.git] DEBUG 1 file changed, 15 insertions(+)
2024-11-08 00:36:55,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:55,251 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-08 00:36:55,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:55,264 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 591 (Action update) 8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-08 00:36:55,282 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:55,286 [ scc.git] DEBUG .github/workflows/codeql-analysis.yml | 2 +-
2024-11-08 00:36:55,286 [ scc.git] DEBUG .github/workflows/install.yml | 4 ++--
2024-11-08 00:36:55,286 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-11-08 00:36:55,286 [ scc.git] DEBUG .github/workflows/tox.yml | 4 ++--
2024-11-08 00:36:55,286 [ scc.git] DEBUG .gitignore | 1 +
2024-11-08 00:36:55,286 [ scc.git] DEBUG 5 files changed, 9 insertions(+), 8 deletions(-)
2024-11-08 00:36:55,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:55,750 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...721002a9ad481311a44d093e26641344492e149c'
2024-11-08 00:36:55,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:55,762 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 592 (Replace pkg_resources) 721002a9ad481311a44d093e26641344492e149c'
2024-11-08 00:36:55,780 [ scc.git] DEBUG Auto-merging setup.py
2024-11-08 00:36:55,781 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:55,785 [ scc.git] DEBUG omero/plugins/web.py | 6 +++---
2024-11-08 00:36:55,785 [ scc.git] DEBUG setup.py | 3 ++-
2024-11-08 00:36:55,785 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 4 deletions(-)
2024-11-08 00:36:56,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:56,126 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6bba7f773bb6c4217607439f9adab8814bcd0ac6'
2024-11-08 00:36:56,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:56,139 [ 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-08 00:36:56,158 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:36:56,161 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/omero_table.html | 5 +++--
2024-11-08 00:36:56,161 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-11-08 00:36:56,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:56,528 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:36:56,569 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:36:56,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:36:56,574 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:36:56,612 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:36:56,622 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb608755b80> has no local changes
2024-11-08 00:36:56,623 [ 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#225 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/225/)'
2024-11-08 00:36:56,634 [ scc.git] DEBUG [detached HEAD 6dc61dbb6] merge master -Dorg -Ssuccess-only
2024-11-08 00:36:56,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:36:56,634 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:36:56,684 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-11-08 00:36:56,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:56,940 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-11-08 00:36:57,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:57,328 [ scc.config] DEBUG Found submodule.omero-py.url
2024-11-08 00:36:57,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:57,707 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-11-08 00:36:58,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:58,090 [ scc.config] DEBUG Found submodule.omero-web.url
2024-11-08 00:36:58,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:36:58,487 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:36:58,514 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb609267a00> has local changes
2024-11-08 00:36:58,515 [ 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#225 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/225/)'
2024-11-08 00:36:58,524 [ scc.git] DEBUG [detached HEAD 40f790a] merge master -Dorg -Ssuccess-only
2024-11-08 00:36:58,524 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-08 00:36:58,525 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-11-08 00:36:58,525 [ scc.merge] INFO Already up to date.
2024-11-08 00:36:58,525 [ scc.merge] INFO
2024-11-08 00:36:58,525 [ scc.merge] INFO Merged PRs:
2024-11-08 00:36:58,525 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-08 00:36:58,525 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-08 00:36:58,525 [ scc.merge] INFO
2024-11-08 00:36:58,525 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-11-08 00:36:58,525 [ scc.merge] INFO Already up to date.
2024-11-08 00:36:58,525 [ scc.merge] INFO
2024-11-08 00:36:58,525 [ scc.merge] INFO Merged PRs:
2024-11-08 00:36:58,525 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-08 00:36:58,525 [ scc.merge] INFO
2024-11-08 00:36:58,525 [ scc.merge] INFO Repository: ome/omero-marshal
2024-11-08 00:36:58,525 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:36:58,525 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-11-08 00:36:58,525 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-11-08 00:36:58,525 [ scc.merge] INFO Already up to date.
2024-11-08 00:36:58,525 [ scc.merge] INFO
2024-11-08 00:36:58,525 [ scc.merge] INFO Merged PRs:
2024-11-08 00:36:58,525 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-08 00:36:58,525 [ scc.merge] INFO
2024-11-08 00:36:58,525 [ scc.merge] INFO Repository: ome/omero-py
2024-11-08 00:36:58,525 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:36:58,525 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-11-08 00:36:58,525 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-11-08 00:36:58,525 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-11-08 00:36:58,525 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-11-08 00:36:58,525 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-11-08 00:36:58,525 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-11-08 00:36:58,526 [ scc.merge] INFO Already up to date.
2024-11-08 00:36:58,526 [ scc.merge] INFO
2024-11-08 00:36:58,526 [ scc.merge] INFO Merged PRs:
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation'
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-08 00:36:58,526 [ scc.merge] INFO
2024-11-08 00:36:58,526 [ scc.merge] INFO Repository: ome/omero-scripts
2024-11-08 00:36:58,526 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-08 00:36:58,526 [ scc.merge] INFO Already up to date.
2024-11-08 00:36:58,526 [ scc.merge] INFO
2024-11-08 00:36:58,526 [ scc.merge] INFO Merged PRs:
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-08 00:36:58,526 [ scc.merge] INFO
2024-11-08 00:36:58,526 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-08 00:36:58,526 [ scc.merge] INFO
2024-11-08 00:36:58,526 [ scc.merge] INFO Repository: ome/omero-web
2024-11-08 00:36:58,526 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-11-08 00:36:58,526 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-11-08 00:36:58,527 [ scc.merge] INFO Already up to date.
2024-11-08 00:36:58,527 [ scc.merge] INFO
2024-11-08 00:36:58,527 [ scc.merge] INFO Merged PRs:
2024-11-08 00:36:58,527 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-08 00:36:58,527 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-08 00:36:58,527 [ scc.merge] INFO - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-08 00:36:58,527 [ scc.merge] INFO - PR 590 knabar 'Update changelog'
2024-11-08 00:36:58,527 [ scc.merge] INFO - PR 591 jburel 'Action update'
2024-11-08 00:36:58,527 [ scc.merge] INFO - PR 592 jburel 'Replace pkg_resources'
2024-11-08 00:36:58,527 [ scc.merge] INFO - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-08 00:36:58,527 [ scc.merge] INFO
2024-11-08 00:36:58,527 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-08 00:36:58,527 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:36:58,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-08 00:36:58,531 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:36:58,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:36:58,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-08 00:36:58,535 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:36:58,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:36:58,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-08 00:36:58,539 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:36:58,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:36:58,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-08 00:36:58,543 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:36:58,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-08 00:36:58,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-08 00:36:58,546 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:36:58,550 [ 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-08 00:37:25,619 [ 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}
