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-10 00:33:56,879 [ scc.config] DEBUG Found github.token
2024-11-10 00:33:56,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-10 00:33:57,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:33:57,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:33:57,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-10 00:33:57,834 [ scc.gh] DEBUG 4341 remaining from 5000 (Reset at 00:11
2024-11-10 00:33:57,835 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-10 00:33:57,838 [ scc.git] DEBUG Check current status
2024-11-10 00:33:57,839 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-10 00:33:57,843 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-10 00:33:57,843 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-10 00:33:57,882 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-10 00:33:57,885 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-10 00:33:57,888 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-10 00:33:57,892 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-10 00:33:57,895 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-10 00:33:57,900 [ scc.config] DEBUG Found remote.origin.url
2024-11-10 00:33:58,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-10 00:33:58,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-10 00:33:59,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-10 00:33:59,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-10 00:33:59,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-10 00:33:59,992 [ scc.git] DEBUG Resetting...
2024-11-10 00:33:59,992 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-10 00:33:59,998 [ scc.git] DEBUG HEAD is now at e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-10 00:33:59,998 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-10 00:34:00,050 [ scc.git] DEBUG Check current status
2024-11-10 00:34:00,051 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-10 00:34:00,054 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-10 00:34:00,055 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-10 00:34:00,094 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-10 00:34:00,097 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-10 00:34:00,101 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-10 00:34:00,104 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-10 00:34:00,108 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-10 00:34:00,109 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-10 00:34:00,109 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-10 00:34:00,109 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-10 00:34:00,109 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-10 00:34:00,109 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-10 00:34:00,109 [ scc.repo] DEBUG ## PRs found:
2024-11-10 00:34:00,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-10 00:34:00,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-10 00:34:00,929 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-10 00:34:00,929 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-10 00:34:01,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-10 00:34:01,389 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-10 00:34:01,389 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-10 00:34:01,389 [ scc.repo] DEBUG ## Branches found:
2024-11-10 00:34:01,389 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:34:01,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:01,395 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-10 00:34:01,398 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-10 00:34:01,398 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-10 00:34:01,402 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-10 00:34:01,405 [ scc.git] DEBUG Already up to date.
2024-11-10 00:34:01,406 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-10 00:34:01,867 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-10 00:34:01,867 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-10 00:34:01,872 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-10 00:34:02,169 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-10 00:34:02,169 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-10 00:34:02,174 [ scc.git] DEBUG ## Unique users: []
2024-11-10 00:34:02,174 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:34:02,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:02,178 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-10 00:34:02,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:02,187 [ 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-10 00:34:02,218 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:34:02,221 [ scc.git] DEBUG omero-py | 2 +-
2024-11-10 00:34:02,221 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-10 00:34:02,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:34:02,350 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-10 00:34:02,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:02,367 [ 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-10 00:34:02,423 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:34:02,426 [ scc.git] DEBUG omero-web | 2 +-
2024-11-10 00:34:02,426 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-10 00:34:02,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:34:02,736 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-10 00:34:02,980 [ scc.git] DEBUG Submodule path 'omero-py': checked out '4fd72efaa8cdbec9da98e1d28678af16878a86ba'
2024-11-10 00:34:03,331 [ scc.git] DEBUG Submodule path 'omero-web': checked out '213bb61adc23aed4a750f2a83dc94b7efdb22cee'
2024-11-10 00:34:03,332 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:34:03,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:03,336 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-10 00:34:04,011 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d5d14ff10> has no local changes
2024-11-10 00:34:04,012 [ 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#227 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/227/)'
2024-11-10 00:34:04,037 [ scc.git] DEBUG [detached HEAD f0f6ee1] merge master -Dorg -Snone
2024-11-10 00:34:04,038 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-10 00:34:04,038 [ scc.merge] INFO Already up to date.
2024-11-10 00:34:04,038 [ scc.merge] INFO
2024-11-10 00:34:04,038 [ scc.merge] INFO Merged PRs:
2024-11-10 00:34:04,038 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-10 00:34:04,038 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-10 00:34:04,038 [ scc.merge] INFO
2024-11-10 00:34:04,038 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-10 00:34:04,038 [ 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-10 00:34:06,121 [ scc.config] DEBUG Found github.token
2024-11-10 00:34:06,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-10 00:34:06,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:34:06,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:34:07,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-10 00:34:07,027 [ scc.gh] DEBUG 4329 remaining from 5000 (Reset at 00:11
2024-11-10 00:34:07,028 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-10 00:34:07,032 [ scc.git] DEBUG Check current status
2024-11-10 00:34:07,032 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-10 00:34:07,035 [ scc.git] DEBUG f0f6ee1 merge master -Dorg -Snone
2024-11-10 00:34:07,035 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-10 00:34:07,074 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-10 00:34:07,076 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-10 00:34:07,080 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-10 00:34:07,083 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-10 00:34:07,136 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-10 00:34:07,143 [ scc.config] DEBUG Found remote.origin.url
2024-11-10 00:34:07,144 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-11-10 00:34:07,145 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-11-10 00:34:07,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-10 00:34:07,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-10 00:34:08,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-10 00:34:08,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-10 00:34:09,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-10 00:34:09,145 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-10 00:34:09,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-10 00:34:09,192 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-10 00:34:09,196 [ scc.git] DEBUG Check current status
2024-11-10 00:34:09,197 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-10 00:34:09,200 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-11-10 00:34:09,200 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-10 00:34:09,240 [ scc.config] DEBUG Found remote.origin.url
2024-11-10 00:34:09,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-11-10 00:34:10,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-10 00:34:10,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-10 00:34:10,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-10 00:34:11,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-10 00:34:11,221 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-10 00:34:11,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:34:11,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-10 00:34:11,263 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-10 00:34:11,267 [ scc.git] DEBUG Check current status
2024-11-10 00:34:11,267 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-10 00:34:11,271 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-11-10 00:34:11,271 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-10 00:34:11,315 [ scc.config] DEBUG Found remote.origin.url
2024-11-10 00:34:11,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-11-10 00:34:12,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-10 00:34:12,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-10 00:34:12,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-10 00:34:13,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-10 00:34:13,352 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-10 00:34:13,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:34:13,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-10 00:34:13,393 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-10 00:34:13,397 [ scc.git] DEBUG Check current status
2024-11-10 00:34:13,397 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-10 00:34:13,402 [ scc.git] DEBUG 4fd72efa Bump version: 5.19.5 → 5.19.6.dev0
2024-11-10 00:34:13,402 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-10 00:34:13,446 [ scc.config] DEBUG Found remote.origin.url
2024-11-10 00:34:13,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-11-10 00:34:14,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-10 00:34:14,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-10 00:34:15,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-10 00:34:15,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-10 00:34:15,462 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-10 00:34:15,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:34:15,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-10 00:34:15,503 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-10 00:34:15,507 [ scc.git] DEBUG Check current status
2024-11-10 00:34:15,507 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-10 00:34:15,576 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-10 00:34:15,577 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-10 00:34:15,620 [ scc.config] DEBUG Found remote.origin.url
2024-11-10 00:34:15,621 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-11-10 00:34:15,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-11-10 00:34:16,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-10 00:34:16,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-10 00:34:17,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-10 00:34:17,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-10 00:34:17,577 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-10 00:34:17,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:34:17,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-10 00:34:17,616 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-10 00:34:17,620 [ scc.git] DEBUG Check current status
2024-11-10 00:34:17,620 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-10 00:34:17,625 [ scc.git] DEBUG 213bb61ad Merge pull request #580 from sbesson/obj_id_mask_no_match
2024-11-10 00:34:17,625 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-10 00:34:17,667 [ scc.config] DEBUG Found remote.origin.url
2024-11-10 00:34:18,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-11-10 00:34:18,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-10 00:34:18,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-10 00:34:19,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-10 00:34:19,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-10 00:34:19,695 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-10 00:34:19,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:34:19,732 [ scc.git] DEBUG Resetting...
2024-11-10 00:34:19,732 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-10 00:34:19,737 [ scc.git] DEBUG HEAD is now at f0f6ee1 merge master -Dorg -Snone
2024-11-10 00:34:19,738 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-10 00:34:19,787 [ scc.git] DEBUG Check current status
2024-11-10 00:34:19,788 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-10 00:34:19,792 [ scc.git] DEBUG f0f6ee1 merge master -Dorg -Snone
2024-11-10 00:34:19,792 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-10 00:34:19,829 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-10 00:34:19,832 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-10 00:34:19,836 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-10 00:34:19,839 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-10 00:34:19,843 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-10 00:34:19,844 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-10 00:34:19,844 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-10 00:34:19,844 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-10 00:34:19,844 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-10 00:34:19,844 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-10 00:34:19,844 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-11-10 00:34:19,844 [ scc.repo] DEBUG ## PRs found:
2024-11-10 00:34:20,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-10 00:34:20,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-10 00:34:20,606 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-10 00:34:21,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-10 00:34:21,588 [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-10 00:34:22,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-10 00:34:22,545 [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-10 00:34:22,546 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-10 00:34:22,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-10 00:34:22,991 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-10 00:34:23,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-10 00:34:24,010 [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-10 00:34:24,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-10 00:34:24,930 [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-10 00:34:24,930 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-10 00:34:24,930 [ scc.repo] DEBUG ## Branches found:
2024-11-10 00:34:24,931 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:34:24,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:24,935 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-10 00:34:24,939 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-10 00:34:24,939 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-10 00:34:24,943 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-10 00:34:24,947 [ scc.git] DEBUG Already up to date.
2024-11-10 00:34:24,947 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-10 00:34:25,261 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-10 00:34:25,261 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-10 00:34:25,267 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-10 00:34:25,538 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-10 00:34:25,538 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-10 00:34:25,543 [ scc.git] DEBUG ## Unique users: []
2024-11-10 00:34:25,543 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:34:25,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:25,547 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-10 00:34:25,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:25,557 [ 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-10 00:34:25,561 [ scc.git] DEBUG Already up to date.
2024-11-10 00:34:25,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:34:25,697 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-10 00:34:25,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:25,707 [ 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-10 00:34:25,711 [ scc.git] DEBUG Already up to date.
2024-11-10 00:34:26,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:34:26,103 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-10 00:34:26,145 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:34:26,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:26,150 [ scc.repo] DEBUG ## PRs found:
2024-11-10 00:34:26,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-11-10 00:34:27,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-11-10 00:34:27,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-11-10 00:34:27,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-10 00:34:28,418 [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-10 00:34:28,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-10 00:34:29,226 [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-10 00:34:29,226 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-10 00:34:29,227 [ scc.repo] DEBUG ## Branches found:
2024-11-10 00:34:29,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-10 00:34:29,227 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:34:29,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:29,232 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-10 00:34:29,235 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-10 00:34:29,235 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-10 00:34:29,239 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-10 00:34:29,244 [ scc.git] DEBUG Already up to date.
2024-11-10 00:34:29,244 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-11-10 00:34:29,676 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-11-10 00:34:29,677 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-11-10 00:34:29,681 [ scc.git] DEBUG ## Unique users: []
2024-11-10 00:34:29,681 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:34:29,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:29,686 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-11-10 00:34:29,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:29,696 [ 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-10 00:34:30,077 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-11-10 00:34:30,077 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-11-10 00:34:30,078 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-11-10 00:34:30,078 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-11-10 00:34:30,078 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-11-10 00:34:30,078 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-11-10 00:34:30,078 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-11-10 00:34:30,078 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-11-10 00:34:30,078 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-11-10 00:34:30,078 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:34:30,082 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-11-10 00:34:30,082 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-11-10 00:34:30,082 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-11-10 00:34:30,082 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-11-10 00:34:30,082 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-11-10 00:34:30,082 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-11-10 00:34:30,082 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-11-10 00:34:30,082 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-11-10 00:34:30,082 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-11-10 00:34:30,082 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-11-10 00:34:30,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:34:30,225 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-10 00:34:30,265 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:34:30,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:30,270 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-10 00:34:30,309 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-10 00:34:30,315 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f398273df40> has no local changes
2024-11-10 00:34:30,315 [ 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#227 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/227/)'
2024-11-10 00:34:30,323 [ scc.git] DEBUG [detached HEAD e2e10b7] merge master -Dorg -Ssuccess-only
2024-11-10 00:34:30,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:34:30,324 [ scc.repo] DEBUG ## PRs found:
2024-11-10 00:34:30,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-11-10 00:34:31,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-11-10 00:34:31,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-11-10 00:34:32,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-10 00:34:32,573 [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-10 00:34:33,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-10 00:34:33,483 [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-10 00:34:33,484 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-10 00:34:33,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-11-10 00:34:34,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-11-10 00:34:34,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-11-10 00:34:35,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-11-10 00:34:35,259 [ scc.repo] DEBUG ## Branches found:
2024-11-10 00:34:35,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-10 00:34:35,260 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:34:35,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:35,265 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-10 00:34:35,269 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-10 00:34:35,269 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-10 00:34:35,274 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-10 00:34:35,279 [ scc.git] DEBUG Already up to date.
2024-11-10 00:34:35,279 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-11-10 00:34:35,819 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-11-10 00:34:35,819 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-11-10 00:34:35,825 [ scc.git] DEBUG ## Unique users: []
2024-11-10 00:34:35,825 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:34:35,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:35,829 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-10 00:34:35,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:35,838 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-10 00:34:35,849 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-11-10 00:34:35,849 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:34:35,852 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-11-10 00:34:35,852 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-11-10 00:34:35,852 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-11-10 00:34:35,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:34:35,980 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-10 00:34:36,021 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:34:36,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:34:36,026 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-10 00:34:36,064 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-10 00:34:36,071 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39829c7cd0> has no local changes
2024-11-10 00:34:36,071 [ 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#227 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/227/)'
2024-11-10 00:34:36,079 [ scc.git] DEBUG [detached HEAD dfb26d7] merge master -Dorg -Ssuccess-only
2024-11-10 00:34:36,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:34:36,079 [ scc.repo] DEBUG ## PRs found:
2024-11-10 00:34:36,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-11-10 00:34:37,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/431 HTTP/1.1" 200 None
2024-11-10 00:34:37,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-10 00:34:38,105 [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-10 00:34:38,563 [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-10 00:34:39,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-10 00:34:39,466 [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-10 00:34:39,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-10 00:34:40,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/status HTTP/1.1" 200 None
2024-11-10 00:34:40,385 [ scc.repo] DEBUG - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-10 00:34:40,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-11-10 00:34:41,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-11-10 00:34:41,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427/comments HTTP/1.1" 200 None
2024-11-10 00:34:41,779 [ scc.repo] DEBUG # ... Include label: include
2024-11-10 00:34:42,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-10 00:34:42,768 [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-10 00:34:43,248 [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-10 00:34:43,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-10 00:34:44,137 [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-10 00:34:44,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-10 00:34:45,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/status HTTP/1.1" 200 None
2024-11-10 00:34:45,015 [ scc.repo] DEBUG - PR 427 Rdornier 'Add fileset folder creation'
2024-11-10 00:34:45,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-11-10 00:34:45,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-11-10 00:34:46,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-10 00:34:46,909 [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-10 00:34:47,389 [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-10 00:34:47,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-10 00:34:48,200 [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-10 00:34:48,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-10 00:34:49,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-11-10 00:34:49,175 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-11-10 00:34:49,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-11-10 00:34:50,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-11-10 00:34:50,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-11-10 00:34:51,071 [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-10 00:34:51,568 [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-10 00:34:52,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-11-10 00:34:52,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-10 00:34:52,962 [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-10 00:34:53,435 [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-10 00:34:54,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-10 00:34:54,406 [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-10 00:34:54,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-10 00:34:55,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-11-10 00:34:55,280 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-11-10 00:34:55,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-11-10 00:34:55,731 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-11-10 00:34:56,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-11-10 00:34:56,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-11-10 00:34:57,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-10 00:34:57,482 [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-10 00:34:57,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-10 00:34:58,361 [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-10 00:34:58,362 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-10 00:34:58,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-11-10 00:34:59,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-11-10 00:34:59,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-10 00:35:00,347 [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-10 00:35:00,758 [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-10 00:35:01,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-10 00:35:01,654 [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-10 00:35:02,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-10 00:35:02,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-11-10 00:35:02,466 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-11-10 00:35:02,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-11-10 00:35:03,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-11-10 00:35:03,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-11-10 00:35:04,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-11-10 00:35:04,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-10 00:35:05,224 [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-10 00:35:05,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-10 00:35:06,100 [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-10 00:35:06,101 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-10 00:35:06,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-11-10 00:35:07,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-10 00:35:07,500 [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-10 00:35:07,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-10 00:35:08,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-11-10 00:35:08,407 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-10 00:35:08,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-11-10 00:35:09,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-11-10 00:35:09,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-10 00:35:10,351 [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-10 00:35:10,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-10 00:35:11,296 [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-10 00:35:11,297 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-10 00:35:11,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-11-10 00:35:12,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-11-10 00:35:12,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-10 00:35:13,249 [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-10 00:35:13,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-10 00:35:14,159 [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-10 00:35:14,160 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-11-10 00:35:14,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-11-10 00:35:15,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-11-10 00:35:15,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-11-10 00:35:15,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-11-10 00:35:15,987 [ scc.repo] DEBUG ## Branches found:
2024-11-10 00:35:15,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-10 00:35:15,987 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:35:15,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:15,993 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-10 00:35:15,997 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-10 00:35:15,997 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-10 00:35:16,002 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-10 00:35:16,006 [ scc.git] DEBUG Already up to date.
2024-11-10 00:35:16,007 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-11-10 00:35:17,532 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-10 00:35:17,532 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-11-10 00:35:17,536 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-11-10 00:35:17,846 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-10 00:35:17,846 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-11-10 00:35:17,851 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-11-10 00:35:18,173 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-10 00:35:18,173 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-11-10 00:35:18,178 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-11-10 00:35:18,458 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-10 00:35:18,458 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-11-10 00:35:18,463 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-11-10 00:35:19,041 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-10 00:35:19,041 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-11-10 00:35:19,046 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-11-10 00:35:19,327 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-10 00:35:19,327 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-11-10 00:35:19,332 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-11-10 00:35:19,617 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-10 00:35:19,618 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-11-10 00:35:19,622 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-11-10 00:35:20,097 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-10 00:35:20,097 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-11-10 00:35:20,102 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-11-10 00:35:20,954 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-10 00:35:20,954 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-11-10 00:35:20,959 [ scc.git] DEBUG Calling 'git fetch origin pull/431/head'
2024-11-10 00:35:21,367 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-10 00:35:21,368 [ scc.git] DEBUG * branch refs/pull/431/head -> FETCH_HEAD
2024-11-10 00:35:21,372 [ scc.git] DEBUG ## Unique users: []
2024-11-10 00:35:21,372 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:35:21,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:21,377 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-10 00:35:21,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:21,393 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-10 00:35:21,540 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-11-10 00:35:21,541 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-11-10 00:35:21,542 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:35:21,546 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-11-10 00:35:21,546 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-11-10 00:35:21,546 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-11-10 00:35:21,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:35:21,684 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-10 00:35:21,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:21,699 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-10 00:35:22,171 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-10 00:35:22,171 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-11-10 00:35:22,172 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:35:22,179 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-11-10 00:35:22,179 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-11-10 00:35:22,179 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-11-10 00:35:22,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:35:22,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-11-10 00:35:22,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:22,324 [ 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-10 00:35:22,363 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-11-10 00:35:22,380 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:35:22,383 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-11-10 00:35:22,383 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-11-10 00:35:22,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:35:22,695 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-11-10 00:35:22,709 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:22,714 [ 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-10 00:35:22,917 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-11-10 00:35:22,917 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-11-10 00:35:22,960 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:35:22,964 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-11-10 00:35:22,964 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-11-10 00:35:22,964 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-11-10 00:35:23,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:35:23,102 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-10 00:35:23,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:23,119 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-10 00:35:23,311 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:35:23,314 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-11-10 00:35:23,314 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-11-10 00:35:23,314 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-11-10 00:35:23,314 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-11-10 00:35:23,314 [ scc.git] DEBUG create mode 100644 connect.py
2024-11-10 00:35:23,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:35:23,492 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-11-10 00:35:23,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:23,511 [ 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-10 00:35:23,559 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-11-10 00:35:23,560 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:35:23,563 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-11-10 00:35:23,563 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-11-10 00:35:23,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:35:23,867 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-11-10 00:35:23,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:23,883 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-11-10 00:35:24,032 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-11-10 00:35:24,033 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:35:24,037 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-11-10 00:35:24,037 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-11-10 00:35:24,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:35:24,243 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-10 00:35:24,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:24,259 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-10 00:35:24,440 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-10 00:35:24,498 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:35:24,505 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-11-10 00:35:24,505 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-11-10 00:35:24,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:35:24,639 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-10 00:35:24,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:24,656 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Add fileset folder creation) ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-10 00:35:24,836 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:35:24,839 [ scc.git] DEBUG .gitignore | 1 +
2024-11-10 00:35:24,839 [ scc.git] DEBUG src/omero/plugins/download.py | 17 ++++++++++++-----
2024-11-10 00:35:24,839 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 5 deletions(-)
2024-11-10 00:35:25,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:35:25,031 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0e500ec05bf9227b66b28a480b40e0936241d953'
2024-11-10 00:35:25,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:25,048 [ 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-10 00:35:25,117 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:35:25,120 [ scc.git] DEBUG src/omero/hdfstorageV2.py | 1 +
2024-11-10 00:35:25,120 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2024-11-10 00:35:25,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:35:25,416 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-10 00:35:25,457 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:35:25,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:25,462 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-10 00:35:25,501 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-10 00:35:25,508 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39816ffeb0> has no local changes
2024-11-10 00:35:25,508 [ 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#227 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/227/)'
2024-11-10 00:35:25,518 [ scc.git] DEBUG [detached HEAD a0676b43] merge master -Dorg -Ssuccess-only
2024-11-10 00:35:25,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:35:25,518 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-10 00:35:25,518 [ scc.repo] DEBUG ## PRs found:
2024-11-10 00:35:26,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-10 00:35:26,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-10 00:35:26,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-10 00:35:27,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-10 00:35:27,911 [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-10 00:35:28,358 [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-10 00:35:28,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-10 00:35:29,225 [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-10 00:35:29,226 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-10 00:35:29,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-10 00:35:30,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-10 00:35:30,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-10 00:35:31,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-10 00:35:31,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-10 00:35:31,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-10 00:35:32,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-10 00:35:32,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-10 00:35:33,409 [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-10 00:35:33,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-10 00:35:34,294 [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-10 00:35:34,295 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-10 00:35:34,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-10 00:35:35,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-10 00:35:35,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-10 00:35:36,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-10 00:35:36,157 [ scc.repo] DEBUG ## Branches found:
2024-11-10 00:35:36,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-10 00:35:36,157 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:35:36,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:36,163 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-10 00:35:36,167 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-10 00:35:36,167 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-10 00:35:36,172 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-10 00:35:36,178 [ scc.git] DEBUG Already up to date.
2024-11-10 00:35:36,179 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-10 00:35:36,827 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-10 00:35:36,828 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-10 00:35:36,832 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-10 00:35:37,298 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-10 00:35:37,298 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-10 00:35:37,303 [ scc.git] DEBUG ## Unique users: []
2024-11-10 00:35:37,303 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:35:37,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:37,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-10 00:35:37,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:37,316 [ 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-10 00:35:37,446 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-10 00:35:37,446 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-10 00:35:37,446 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-10 00:35:37,447 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-10 00:35:37,451 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-10 00:35:37,457 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-10 00:35:37,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:35:37,612 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-10 00:35:37,620 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-10 00:35:37,625 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#227](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/227/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/227/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-10 00:35:37,629 [ scc.config] DEBUG Found github.token
2024-11-10 00:35:37,630 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-10 00:35:37,630 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-10 00:35:37,635 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:37,639 [ 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-10 00:35:37,699 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:35:37,701 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-10 00:35:37,702 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-10 00:35:37,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:35:37,996 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-10 00:35:38,032 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:35:38,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:35:38,037 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-10 00:35:38,075 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-10 00:35:38,081 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39816a4640> has no local changes
2024-11-10 00:35:38,082 [ 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#227 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/227/)'
2024-11-10 00:35:38,090 [ scc.git] DEBUG [detached HEAD d23e670] merge master -Dorg -Ssuccess-only
2024-11-10 00:35:38,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:35:38,090 [ scc.repo] DEBUG ## PRs found:
2024-11-10 00:35:38,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-11-10 00:35:39,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/594 HTTP/1.1" 200 None
2024-11-10 00:35:39,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-10 00:35:40,018 [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-10 00:35:40,462 [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-10 00:35:40,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-10 00:35:41,418 [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-10 00:35:41,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-10 00:35:42,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6/status HTTP/1.1" 200 None
2024-11-10 00:35:42,273 [ scc.repo] DEBUG - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-10 00:35:42,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/592 HTTP/1.1" 200 None
2024-11-10 00:35:43,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-10 00:35:43,687 [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-10 00:35:44,160 [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-10 00:35:44,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-10 00:35:45,079 [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-10 00:35:45,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-10 00:35:45,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c/status HTTP/1.1" 200 None
2024-11-10 00:35:45,903 [ scc.repo] DEBUG - PR 592 jburel 'Replace pkg_resources'
2024-11-10 00:35:46,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/591 HTTP/1.1" 200 None
2024-11-10 00:35:46,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-10 00:35:47,396 [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-10 00:35:47,914 [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-10 00:35:48,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-10 00:35:48,807 [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-10 00:35:49,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-10 00:35:49,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe/status HTTP/1.1" 200 None
2024-11-10 00:35:49,713 [ scc.repo] DEBUG - PR 591 jburel 'Action update'
2024-11-10 00:35:50,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/590 HTTP/1.1" 200 None
2024-11-10 00:35:50,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-10 00:35:51,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-10 00:35:51,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-10 00:35:52,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-10 00:35:52,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/6cbcfa80ce4970cc57fddb99d1be440491982763?per_page=1 HTTP/1.1" 200 None
2024-11-10 00:35:52,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-10 00:35:53,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763/status HTTP/1.1" 200 None
2024-11-10 00:35:53,365 [ scc.repo] DEBUG - PR 590 knabar 'Update changelog'
2024-11-10 00:35:54,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/585 HTTP/1.1" 200 None
2024-11-10 00:35:54,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583 HTTP/1.1" 200 None
2024-11-10 00:35:55,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583/comments HTTP/1.1" 200 None
2024-11-10 00:35:55,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-10 00:35:56,074 [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-10 00:35:56,564 [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-10 00:35:57,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-10 00:35:57,489 [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-10 00:35:57,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-10 00:35:58,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd/status HTTP/1.1" 200 None
2024-11-10 00:35:58,311 [ scc.repo] DEBUG - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-10 00:35:58,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581 HTTP/1.1" 200 None
2024-11-10 00:35:59,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581/comments HTTP/1.1" 200 None
2024-11-10 00:35:59,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-11-10 00:36:00,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-11-10 00:36:00,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-11-10 00:36:01,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-11-10 00:36:01,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-10 00:36:02,073 [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-10 00:36:02,523 [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-10 00:36:03,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-10 00:36:03,446 [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-10 00:36:03,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-10 00:36:04,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-11-10 00:36:04,286 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-10 00:36:04,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-11-10 00:36:05,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-11-10 00:36:05,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-10 00:36:06,193 [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-10 00:36:06,676 [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-10 00:36:07,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-10 00:36:07,587 [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-10 00:36:08,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-10 00:36:08,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-11-10 00:36:08,441 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-10 00:36:08,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-11-10 00:36:09,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-11-10 00:36:09,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-11-10 00:36:10,422 [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-10 00:36:10,886 [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-10 00:36:10,888 [ scc.repo] DEBUG ## Branches found:
2024-11-10 00:36:10,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-10 00:36:10,889 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:36:10,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:36:10,894 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-10 00:36:10,899 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-10 00:36:10,899 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-10 00:36:10,904 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-10 00:36:10,908 [ scc.git] DEBUG Already up to date.
2024-11-10 00:36:10,908 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-11-10 00:36:12,244 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-10 00:36:12,244 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-11-10 00:36:12,249 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-11-10 00:36:12,585 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-10 00:36:12,585 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-11-10 00:36:12,590 [ scc.git] DEBUG Calling 'git fetch origin pull/583/head'
2024-11-10 00:36:13,440 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-10 00:36:13,440 [ scc.git] DEBUG * branch refs/pull/583/head -> FETCH_HEAD
2024-11-10 00:36:13,446 [ scc.git] DEBUG Calling 'git fetch origin pull/590/head'
2024-11-10 00:36:13,801 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-10 00:36:13,801 [ scc.git] DEBUG * branch refs/pull/590/head -> FETCH_HEAD
2024-11-10 00:36:13,806 [ scc.git] DEBUG Calling 'git fetch origin pull/591/head'
2024-11-10 00:36:14,498 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-10 00:36:14,499 [ scc.git] DEBUG * branch refs/pull/591/head -> FETCH_HEAD
2024-11-10 00:36:14,504 [ scc.git] DEBUG Calling 'git fetch origin pull/592/head'
2024-11-10 00:36:14,913 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-10 00:36:14,913 [ scc.git] DEBUG * branch refs/pull/592/head -> FETCH_HEAD
2024-11-10 00:36:14,918 [ scc.git] DEBUG Calling 'git fetch origin pull/594/head'
2024-11-10 00:36:15,397 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-10 00:36:15,397 [ scc.git] DEBUG * branch refs/pull/594/head -> FETCH_HEAD
2024-11-10 00:36:15,402 [ scc.git] DEBUG ## Unique users: []
2024-11-10 00:36:15,402 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:36:15,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:36:15,406 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-11-10 00:36:15,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:36:15,417 [ 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-10 00:36:15,685 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-11-10 00:36:15,685 [ scc.git] DEBUG Auto-merging setup.py
2024-11-10 00:36:15,686 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:36:15,690 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-11-10 00:36:15,690 [ scc.git] DEBUG setup.py | 1 +
2024-11-10 00:36:15,690 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-11-10 00:36:15,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:36:15,826 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-11-10 00:36:15,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:36:15,839 [ 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-10 00:36:16,188 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-11-10 00:36:16,188 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-11-10 00:36:16,199 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:36:16,204 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-11-10 00:36:16,204 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-11-10 00:36:16,204 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-11-10 00:36:16,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:36:16,348 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dd2879608e047a7d71a648a23e6955ce591950fd'
2024-11-10 00:36:16,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:36:16,361 [ 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-10 00:36:16,556 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:36:16,559 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_content.html | 8 ++++++--
2024-11-10 00:36:16,559 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_dropdown2.html | 2 --
2024-11-10 00:36:16,559 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-10 00:36:16,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:36:16,728 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6cbcfa80ce4970cc57fddb99d1be440491982763'
2024-11-10 00:36:16,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:36:16,741 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 590 (Update changelog) 6cbcfa80ce4970cc57fddb99d1be440491982763'
2024-11-10 00:36:16,825 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:36:16,828 [ scc.git] DEBUG CHANGELOG.md | 16 ++++++++++++++++
2024-11-10 00:36:16,828 [ scc.git] DEBUG 1 file changed, 16 insertions(+)
2024-11-10 00:36:17,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:36:17,105 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-10 00:36:17,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:36:17,119 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 591 (Action update) 8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-10 00:36:17,246 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:36:17,249 [ scc.git] DEBUG .github/workflows/codeql-analysis.yml | 2 +-
2024-11-10 00:36:17,249 [ scc.git] DEBUG .github/workflows/install.yml | 4 ++--
2024-11-10 00:36:17,249 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-11-10 00:36:17,249 [ scc.git] DEBUG .github/workflows/tox.yml | 4 ++--
2024-11-10 00:36:17,249 [ scc.git] DEBUG .gitignore | 1 +
2024-11-10 00:36:17,249 [ scc.git] DEBUG 5 files changed, 9 insertions(+), 8 deletions(-)
2024-11-10 00:36:17,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:36:17,481 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...721002a9ad481311a44d093e26641344492e149c'
2024-11-10 00:36:17,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:36:17,494 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 592 (Replace pkg_resources) 721002a9ad481311a44d093e26641344492e149c'
2024-11-10 00:36:17,664 [ scc.git] DEBUG Auto-merging setup.py
2024-11-10 00:36:17,665 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:36:17,668 [ scc.git] DEBUG omero/plugins/web.py | 6 +++---
2024-11-10 00:36:17,668 [ scc.git] DEBUG setup.py | 3 ++-
2024-11-10 00:36:17,668 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 4 deletions(-)
2024-11-10 00:36:17,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:36:17,858 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6bba7f773bb6c4217607439f9adab8814bcd0ac6'
2024-11-10 00:36:17,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:36:17,870 [ 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-10 00:36:17,896 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-10 00:36:17,899 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/omero_table.html | 5 +++--
2024-11-10 00:36:17,899 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-11-10 00:36:18,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:36:18,240 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-10 00:36:18,278 [ scc.git] DEBUG Get sha1 of %s
2024-11-10 00:36:18,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-10 00:36:18,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-10 00:36:18,319 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-10 00:36:18,329 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39816b4b80> has no local changes
2024-11-10 00:36:18,330 [ 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#227 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/227/)'
2024-11-10 00:36:18,340 [ scc.git] DEBUG [detached HEAD eb28d7b49] merge master -Dorg -Ssuccess-only
2024-11-10 00:36:18,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:36:18,341 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-10 00:36:18,390 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-11-10 00:36:18,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:36:18,652 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-11-10 00:36:19,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:36:19,037 [ scc.config] DEBUG Found submodule.omero-py.url
2024-11-10 00:36:19,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:36:19,414 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-11-10 00:36:19,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:36:19,800 [ scc.config] DEBUG Found submodule.omero-web.url
2024-11-10 00:36:20,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-10 00:36:20,187 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-10 00:36:20,213 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3984abff10> has local changes
2024-11-10 00:36:20,213 [ 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#227 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/227/)'
2024-11-10 00:36:20,222 [ scc.git] DEBUG [detached HEAD 97b7cff] merge master -Dorg -Ssuccess-only
2024-11-10 00:36:20,222 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-10 00:36:20,223 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-11-10 00:36:20,223 [ scc.merge] INFO Already up to date.
2024-11-10 00:36:20,223 [ scc.merge] INFO
2024-11-10 00:36:20,223 [ scc.merge] INFO Merged PRs:
2024-11-10 00:36:20,223 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-10 00:36:20,223 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-10 00:36:20,223 [ scc.merge] INFO
2024-11-10 00:36:20,223 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-11-10 00:36:20,223 [ scc.merge] INFO Already up to date.
2024-11-10 00:36:20,223 [ scc.merge] INFO
2024-11-10 00:36:20,223 [ scc.merge] INFO Merged PRs:
2024-11-10 00:36:20,223 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-10 00:36:20,223 [ scc.merge] INFO
2024-11-10 00:36:20,223 [ scc.merge] INFO Repository: ome/omero-marshal
2024-11-10 00:36:20,223 [ scc.merge] INFO Excluded PRs:
2024-11-10 00:36:20,223 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-11-10 00:36:20,223 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-11-10 00:36:20,223 [ scc.merge] INFO Already up to date.
2024-11-10 00:36:20,223 [ scc.merge] INFO
2024-11-10 00:36:20,223 [ scc.merge] INFO Merged PRs:
2024-11-10 00:36:20,223 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-10 00:36:20,223 [ scc.merge] INFO
2024-11-10 00:36:20,223 [ scc.merge] INFO Repository: ome/omero-py
2024-11-10 00:36:20,224 [ scc.merge] INFO Excluded PRs:
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-11-10 00:36:20,224 [ scc.merge] INFO Already up to date.
2024-11-10 00:36:20,224 [ scc.merge] INFO
2024-11-10 00:36:20,224 [ scc.merge] INFO Merged PRs:
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation'
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-10 00:36:20,224 [ scc.merge] INFO
2024-11-10 00:36:20,224 [ scc.merge] INFO Repository: ome/omero-scripts
2024-11-10 00:36:20,224 [ scc.merge] INFO Excluded PRs:
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-10 00:36:20,224 [ scc.merge] INFO Already up to date.
2024-11-10 00:36:20,224 [ scc.merge] INFO
2024-11-10 00:36:20,224 [ scc.merge] INFO Merged PRs:
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-10 00:36:20,224 [ scc.merge] INFO
2024-11-10 00:36:20,224 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-10 00:36:20,224 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-10 00:36:20,224 [ scc.merge] INFO
2024-11-10 00:36:20,225 [ scc.merge] INFO Repository: ome/omero-web
2024-11-10 00:36:20,225 [ scc.merge] INFO Excluded PRs:
2024-11-10 00:36:20,225 [ scc.merge] INFO - PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-10 00:36:20,225 [ scc.merge] INFO - PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
2024-11-10 00:36:20,225 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-11-10 00:36:20,225 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-11-10 00:36:20,225 [ scc.merge] INFO Already up to date.
2024-11-10 00:36:20,225 [ scc.merge] INFO
2024-11-10 00:36:20,225 [ scc.merge] INFO Merged PRs:
2024-11-10 00:36:20,225 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-10 00:36:20,225 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-10 00:36:20,225 [ scc.merge] INFO - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-10 00:36:20,225 [ scc.merge] INFO - PR 590 knabar 'Update changelog'
2024-11-10 00:36:20,225 [ scc.merge] INFO - PR 591 jburel 'Action update'
2024-11-10 00:36:20,225 [ scc.merge] INFO - PR 592 jburel 'Replace pkg_resources'
2024-11-10 00:36:20,225 [ scc.merge] INFO - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-10 00:36:20,225 [ scc.merge] INFO
2024-11-10 00:36:20,225 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-10 00:36:20,226 [ scc.git] DEBUG Calling 'git remote'
2024-11-10 00:36:20,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-10 00:36:20,231 [ scc.git] DEBUG Calling 'git remote'
2024-11-10 00:36:20,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:36:20,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-10 00:36:20,236 [ scc.git] DEBUG Calling 'git remote'
2024-11-10 00:36:20,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:36:20,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-10 00:36:20,240 [ scc.git] DEBUG Calling 'git remote'
2024-11-10 00:36:20,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:36:20,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-10 00:36:20,244 [ scc.git] DEBUG Calling 'git remote'
2024-11-10 00:36:20,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-10 00:36:20,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-10 00:36:20,248 [ scc.git] DEBUG Calling 'git remote'
2024-11-10 00:36:20,253 [ 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-10 00:36:47,419 [ 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}
