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-15 00:36:19,907 [ scc.config] DEBUG Found github.token
2024-11-15 00:36:19,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-15 00:36:20,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:36:20,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:36:20,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-15 00:36:20,879 [ scc.gh] DEBUG 4338 remaining from 5000 (Reset at 00:11
2024-11-15 00:36:20,881 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-15 00:36:20,887 [ scc.git] DEBUG Check current status
2024-11-15 00:36:20,888 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-15 00:36:20,894 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-15 00:36:20,894 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-15 00:36:20,935 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-15 00:36:20,938 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-15 00:36:20,941 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-15 00:36:20,945 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-15 00:36:20,948 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-15 00:36:20,953 [ scc.config] DEBUG Found remote.origin.url
2024-11-15 00:36:21,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-15 00:36:21,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-15 00:36:22,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-15 00:36:22,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-15 00:36:23,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-15 00:36:23,091 [ scc.git] DEBUG Resetting...
2024-11-15 00:36:23,091 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-15 00:36:23,098 [ scc.git] DEBUG HEAD is now at e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-15 00:36:23,098 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-15 00:36:23,147 [ scc.git] DEBUG Check current status
2024-11-15 00:36:23,147 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-15 00:36:23,152 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-15 00:36:23,152 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-15 00:36:23,190 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-15 00:36:23,192 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-15 00:36:23,196 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-15 00:36:23,199 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-15 00:36:23,203 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-15 00:36:23,204 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-15 00:36:23,204 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-15 00:36:23,204 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-15 00:36:23,204 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-15 00:36:23,204 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-15 00:36:23,204 [ scc.repo] DEBUG ## PRs found:
2024-11-15 00:36:23,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-15 00:36:24,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-15 00:36:24,042 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-15 00:36:24,042 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-15 00:36:24,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-15 00:36:24,517 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-15 00:36:24,517 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-15 00:36:24,517 [ scc.repo] DEBUG ## Branches found:
2024-11-15 00:36:24,517 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:36:24,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:24,522 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-15 00:36:24,526 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-15 00:36:24,526 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-15 00:36:24,530 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-15 00:36:24,534 [ scc.git] DEBUG Already up to date.
2024-11-15 00:36:24,534 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-15 00:36:24,885 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-15 00:36:24,885 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-15 00:36:24,890 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-15 00:36:25,182 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-15 00:36:25,182 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-15 00:36:25,188 [ scc.git] DEBUG ## Unique users: []
2024-11-15 00:36:25,188 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:36:25,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:25,193 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-15 00:36:25,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:25,219 [ 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-15 00:36:25,229 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:36:25,231 [ scc.git] DEBUG omero-py | 2 +-
2024-11-15 00:36:25,231 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-15 00:36:25,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:36:25,378 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-15 00:36:25,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:25,403 [ 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-15 00:36:25,465 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:36:25,467 [ scc.git] DEBUG omero-web | 2 +-
2024-11-15 00:36:25,467 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-15 00:36:25,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:36:25,766 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-15 00:36:25,984 [ scc.git] DEBUG Submodule path 'omero-py': checked out '4fd72efaa8cdbec9da98e1d28678af16878a86ba'
2024-11-15 00:36:26,265 [ scc.git] DEBUG Submodule path 'omero-web': checked out '213bb61adc23aed4a750f2a83dc94b7efdb22cee'
2024-11-15 00:36:26,266 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:36:26,266 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:26,271 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-15 00:36:26,579 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08924e1a00> has no local changes
2024-11-15 00:36:26,579 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/232/)'
2024-11-15 00:36:26,606 [ scc.git] DEBUG [detached HEAD 64b040a] merge master -Dorg -Snone
2024-11-15 00:36:26,606 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-15 00:36:26,606 [ scc.merge] INFO Already up to date.
2024-11-15 00:36:26,606 [ scc.merge] INFO
2024-11-15 00:36:26,606 [ scc.merge] INFO Merged PRs:
2024-11-15 00:36:26,606 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-15 00:36:26,606 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-15 00:36:26,606 [ scc.merge] INFO
2024-11-15 00:36:26,606 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-15 00:36:26,607 [ 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-15 00:36:28,921 [ scc.config] DEBUG Found github.token
2024-11-15 00:36:28,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-15 00:36:29,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:36:29,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:36:29,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-15 00:36:29,863 [ scc.gh] DEBUG 4326 remaining from 5000 (Reset at 00:11
2024-11-15 00:36:29,864 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-15 00:36:29,868 [ scc.git] DEBUG Check current status
2024-11-15 00:36:29,869 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-15 00:36:29,872 [ scc.git] DEBUG 64b040a merge master -Dorg -Snone
2024-11-15 00:36:29,873 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-15 00:36:29,909 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-15 00:36:29,912 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-15 00:36:29,915 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-15 00:36:29,918 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-15 00:36:29,927 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-15 00:36:29,931 [ scc.config] DEBUG Found remote.origin.url
2024-11-15 00:36:29,932 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-11-15 00:36:29,933 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-11-15 00:36:30,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-15 00:36:30,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-15 00:36:31,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-15 00:36:31,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-15 00:36:32,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-15 00:36:32,018 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-15 00:36:32,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-15 00:36:32,073 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-15 00:36:32,078 [ scc.git] DEBUG Check current status
2024-11-15 00:36:32,078 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-15 00:36:32,086 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-11-15 00:36:32,086 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-15 00:36:32,135 [ scc.config] DEBUG Found remote.origin.url
2024-11-15 00:36:32,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-11-15 00:36:32,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-15 00:36:33,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-15 00:36:33,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-15 00:36:34,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-15 00:36:34,141 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-15 00:36:34,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:36:34,190 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-15 00:36:34,190 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-15 00:36:34,195 [ scc.git] DEBUG Check current status
2024-11-15 00:36:34,195 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-15 00:36:34,201 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-11-15 00:36:34,202 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-15 00:36:34,245 [ scc.config] DEBUG Found remote.origin.url
2024-11-15 00:36:34,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-11-15 00:36:35,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-15 00:36:35,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-15 00:36:35,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-15 00:36:36,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-15 00:36:36,308 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-15 00:36:36,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:36:36,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-15 00:36:36,350 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-15 00:36:36,355 [ scc.git] DEBUG Check current status
2024-11-15 00:36:36,356 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-15 00:36:36,442 [ scc.git] DEBUG 4fd72efa Bump version: 5.19.5 → 5.19.6.dev0
2024-11-15 00:36:36,442 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-15 00:36:36,485 [ scc.config] DEBUG Found remote.origin.url
2024-11-15 00:36:36,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-11-15 00:36:37,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-15 00:36:37,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-15 00:36:38,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-15 00:36:38,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-15 00:36:38,588 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-15 00:36:38,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:36:38,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-15 00:36:38,628 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-15 00:36:38,634 [ scc.git] DEBUG Check current status
2024-11-15 00:36:38,634 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-15 00:36:38,702 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-15 00:36:38,702 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-15 00:36:38,751 [ scc.config] DEBUG Found remote.origin.url
2024-11-15 00:36:38,752 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-11-15 00:36:39,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-11-15 00:36:39,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-15 00:36:39,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-15 00:36:40,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-15 00:36:40,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-15 00:36:40,786 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-15 00:36:40,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:36:40,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-15 00:36:40,835 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-15 00:36:40,841 [ scc.git] DEBUG Check current status
2024-11-15 00:36:40,841 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-15 00:36:40,867 [ scc.git] DEBUG 213bb61ad Merge pull request #580 from sbesson/obj_id_mask_no_match
2024-11-15 00:36:40,868 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-15 00:36:40,920 [ scc.config] DEBUG Found remote.origin.url
2024-11-15 00:36:41,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-11-15 00:36:41,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-15 00:36:42,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-15 00:36:42,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-15 00:36:42,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-15 00:36:42,970 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-15 00:36:43,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:36:43,021 [ scc.git] DEBUG Resetting...
2024-11-15 00:36:43,021 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-15 00:36:43,028 [ scc.git] DEBUG HEAD is now at 64b040a merge master -Dorg -Snone
2024-11-15 00:36:43,029 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-15 00:36:43,087 [ scc.git] DEBUG Check current status
2024-11-15 00:36:43,088 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-15 00:36:43,092 [ scc.git] DEBUG 64b040a merge master -Dorg -Snone
2024-11-15 00:36:43,093 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-15 00:36:43,136 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-15 00:36:43,139 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-15 00:36:43,143 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-15 00:36:43,147 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-15 00:36:43,152 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-15 00:36:43,153 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-15 00:36:43,153 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-15 00:36:43,153 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-15 00:36:43,153 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-15 00:36:43,153 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-15 00:36:43,153 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-11-15 00:36:43,153 [ scc.repo] DEBUG ## PRs found:
2024-11-15 00:36:43,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-15 00:36:43,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-15 00:36:43,924 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-15 00:36:44,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-15 00:36:44,962 [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-15 00:36:45,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-15 00:36:45,919 [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-15 00:36:45,920 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-15 00:36:46,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-15 00:36:46,370 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-15 00:36:46,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-15 00:36:47,399 [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-15 00:36:47,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-15 00:36:48,308 [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-15 00:36:48,309 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-15 00:36:48,309 [ scc.repo] DEBUG ## Branches found:
2024-11-15 00:36:48,309 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:36:48,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:48,314 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-15 00:36:48,318 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-15 00:36:48,318 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-15 00:36:48,322 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-15 00:36:48,326 [ scc.git] DEBUG Already up to date.
2024-11-15 00:36:48,326 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-15 00:36:48,634 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-15 00:36:48,634 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-15 00:36:48,640 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-15 00:36:48,925 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-15 00:36:48,925 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-15 00:36:48,930 [ scc.git] DEBUG ## Unique users: []
2024-11-15 00:36:48,930 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:36:48,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:48,936 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-15 00:36:48,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:48,943 [ 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-15 00:36:48,947 [ scc.git] DEBUG Already up to date.
2024-11-15 00:36:49,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:36:49,081 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-15 00:36:49,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:49,090 [ 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-15 00:36:49,094 [ scc.git] DEBUG Already up to date.
2024-11-15 00:36:49,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:36:49,476 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-15 00:36:49,517 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:36:49,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:49,522 [ scc.repo] DEBUG ## PRs found:
2024-11-15 00:36:49,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-11-15 00:36:50,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-11-15 00:36:50,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-11-15 00:36:51,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-15 00:36:51,994 [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-15 00:36:52,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-15 00:36:52,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-11-15 00:36:52,849 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-15 00:36:52,849 [ scc.repo] DEBUG ## Branches found:
2024-11-15 00:36:52,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-15 00:36:52,849 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:36:52,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:52,855 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-15 00:36:52,860 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-15 00:36:52,860 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-15 00:36:52,865 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-15 00:36:52,869 [ scc.git] DEBUG Already up to date.
2024-11-15 00:36:52,869 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-11-15 00:36:53,177 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-11-15 00:36:53,178 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-11-15 00:36:53,182 [ scc.git] DEBUG ## Unique users: []
2024-11-15 00:36:53,182 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:36:53,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:53,187 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-11-15 00:36:53,193 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:53,198 [ 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-15 00:36:53,549 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-11-15 00:36:53,549 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-11-15 00:36:53,549 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-11-15 00:36:53,549 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-11-15 00:36:53,549 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-11-15 00:36:53,549 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-11-15 00:36:53,549 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-11-15 00:36:53,549 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-11-15 00:36:53,549 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-11-15 00:36:53,550 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:36:53,554 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-11-15 00:36:53,554 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-11-15 00:36:53,554 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-11-15 00:36:53,554 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-11-15 00:36:53,554 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-11-15 00:36:53,554 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-11-15 00:36:53,554 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-11-15 00:36:53,554 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-11-15 00:36:53,554 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-11-15 00:36:53,557 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-11-15 00:36:53,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:36:53,694 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-15 00:36:53,735 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:36:53,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:53,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-15 00:36:53,779 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-15 00:36:53,786 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9a775abf40> has no local changes
2024-11-15 00:36:53,786 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/232/)'
2024-11-15 00:36:53,796 [ scc.git] DEBUG [detached HEAD a0d9637] merge master -Dorg -Ssuccess-only
2024-11-15 00:36:53,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:36:53,797 [ scc.repo] DEBUG ## PRs found:
2024-11-15 00:36:54,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-11-15 00:36:54,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-11-15 00:36:55,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-11-15 00:36:55,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-15 00:36:56,160 [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-15 00:36:56,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-15 00:36:57,082 [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-15 00:36:57,083 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-15 00:36:57,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-11-15 00:36:58,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-11-15 00:36:58,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-11-15 00:36:58,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-11-15 00:36:58,953 [ scc.repo] DEBUG ## Branches found:
2024-11-15 00:36:58,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-15 00:36:58,953 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:36:58,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:58,958 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-15 00:36:58,962 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-15 00:36:58,962 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-15 00:36:58,966 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-15 00:36:58,973 [ scc.git] DEBUG Already up to date.
2024-11-15 00:36:58,973 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-11-15 00:36:59,315 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-11-15 00:36:59,316 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-11-15 00:36:59,320 [ scc.git] DEBUG ## Unique users: []
2024-11-15 00:36:59,320 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:36:59,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:59,325 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-15 00:36:59,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:59,334 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-15 00:36:59,345 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-11-15 00:36:59,345 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:36:59,348 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-11-15 00:36:59,349 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-11-15 00:36:59,349 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-11-15 00:36:59,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:36:59,494 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-15 00:36:59,535 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:36:59,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:36:59,540 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-15 00:36:59,583 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-15 00:36:59,589 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9a77adb430> has no local changes
2024-11-15 00:36:59,590 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/232/)'
2024-11-15 00:36:59,600 [ scc.git] DEBUG [detached HEAD 528f940] merge master -Dorg -Ssuccess-only
2024-11-15 00:36:59,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:36:59,601 [ scc.repo] DEBUG ## PRs found:
2024-11-15 00:37:00,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-11-15 00:37:00,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/431 HTTP/1.1" 200 None
2024-11-15 00:37:01,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-15 00:37:01,739 [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-15 00:37:02,196 [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-15 00:37:02,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-15 00:37:03,085 [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-15 00:37:03,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-15 00:37:03,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/status HTTP/1.1" 200 None
2024-11-15 00:37:03,933 [ scc.repo] DEBUG - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-15 00:37:04,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-11-15 00:37:04,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-11-15 00:37:05,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427/comments HTTP/1.1" 200 None
2024-11-15 00:37:05,414 [ scc.repo] DEBUG # ... Include label: include
2024-11-15 00:37:05,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-15 00:37:06,401 [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-15 00:37:06,885 [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-15 00:37:07,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-15 00:37:07,797 [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-15 00:37:08,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-15 00:37:08,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/status HTTP/1.1" 200 None
2024-11-15 00:37:08,634 [ scc.repo] DEBUG - PR 427 Rdornier 'Add fileset folder creation'
2024-11-15 00:37:09,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-11-15 00:37:09,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-11-15 00:37:10,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-15 00:37:10,707 [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-15 00:37:11,177 [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-15 00:37:11,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-15 00:37:12,134 [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-15 00:37:12,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-15 00:37:13,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-11-15 00:37:13,050 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-11-15 00:37:13,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-11-15 00:37:13,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-11-15 00:37:14,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-11-15 00:37:15,000 [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-15 00:37:15,474 [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-15 00:37:15,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-11-15 00:37:16,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-15 00:37:16,930 [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-15 00:37:17,392 [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-15 00:37:17,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-15 00:37:18,208 [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-15 00:37:18,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-15 00:37:19,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-11-15 00:37:19,141 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-11-15 00:37:19,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-11-15 00:37:19,622 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-11-15 00:37:20,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-11-15 00:37:20,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-11-15 00:37:21,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-15 00:37:21,566 [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-15 00:37:22,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-15 00:37:22,422 [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-15 00:37:22,423 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-15 00:37:22,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-11-15 00:37:23,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-11-15 00:37:23,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-15 00:37:24,367 [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-15 00:37:24,853 [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-15 00:37:25,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-15 00:37:25,689 [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-15 00:37:26,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-15 00:37:26,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-11-15 00:37:26,617 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-11-15 00:37:27,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-11-15 00:37:27,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-11-15 00:37:28,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-11-15 00:37:28,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-11-15 00:37:29,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-15 00:37:29,450 [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-15 00:37:29,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-15 00:37:30,362 [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-15 00:37:30,362 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-15 00:37:30,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-11-15 00:37:31,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-15 00:37:31,781 [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-15 00:37:32,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-15 00:37:32,709 [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-15 00:37:32,710 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-15 00:37:33,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-11-15 00:37:33,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-11-15 00:37:34,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-15 00:37:34,627 [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-15 00:37:35,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-15 00:37:35,567 [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-15 00:37:35,568 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-15 00:37:36,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-11-15 00:37:36,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-11-15 00:37:37,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-15 00:37:37,522 [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-15 00:37:38,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-15 00:37:38,420 [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-15 00:37:38,420 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-11-15 00:37:38,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-11-15 00:37:39,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-11-15 00:37:39,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-11-15 00:37:40,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-11-15 00:37:40,383 [ scc.repo] DEBUG ## Branches found:
2024-11-15 00:37:40,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-15 00:37:40,384 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:37:40,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:40,389 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-15 00:37:40,394 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-15 00:37:40,394 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-15 00:37:40,399 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-15 00:37:40,405 [ scc.git] DEBUG Already up to date.
2024-11-15 00:37:40,405 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-11-15 00:37:41,945 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-15 00:37:41,945 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-11-15 00:37:41,949 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-11-15 00:37:42,288 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-15 00:37:42,288 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-11-15 00:37:42,293 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-11-15 00:37:42,632 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-15 00:37:42,633 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-11-15 00:37:42,638 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-11-15 00:37:42,932 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-15 00:37:42,932 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-11-15 00:37:42,936 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-11-15 00:37:43,620 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-15 00:37:43,620 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-11-15 00:37:43,625 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-11-15 00:37:43,919 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-15 00:37:43,919 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-11-15 00:37:43,923 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-11-15 00:37:44,209 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-15 00:37:44,209 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-11-15 00:37:44,214 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-11-15 00:37:44,735 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-15 00:37:44,736 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-11-15 00:37:44,741 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-11-15 00:37:45,458 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-15 00:37:45,458 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-11-15 00:37:45,464 [ scc.git] DEBUG Calling 'git fetch origin pull/431/head'
2024-11-15 00:37:45,762 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-15 00:37:45,762 [ scc.git] DEBUG * branch refs/pull/431/head -> FETCH_HEAD
2024-11-15 00:37:45,767 [ scc.git] DEBUG ## Unique users: []
2024-11-15 00:37:45,767 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:37:45,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:45,771 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-15 00:37:45,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:45,787 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-15 00:37:45,921 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-11-15 00:37:45,922 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-11-15 00:37:45,923 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:37:45,927 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-11-15 00:37:45,927 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-11-15 00:37:45,927 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-11-15 00:37:46,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:37:46,066 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-15 00:37:46,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:46,084 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-15 00:37:46,488 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-15 00:37:46,488 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-11-15 00:37:46,489 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:37:46,496 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-11-15 00:37:46,496 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-11-15 00:37:46,496 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-11-15 00:37:46,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:37:46,653 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-11-15 00:37:46,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:46,669 [ 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-15 00:37:46,690 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-11-15 00:37:46,691 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:37:46,694 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-11-15 00:37:46,694 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-11-15 00:37:47,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:37:47,042 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-11-15 00:37:47,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:47,059 [ 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-15 00:37:47,246 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-11-15 00:37:47,246 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-11-15 00:37:47,247 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:37:47,251 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-11-15 00:37:47,251 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-11-15 00:37:47,251 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-11-15 00:37:47,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:37:47,422 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-15 00:37:47,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:47,440 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-15 00:37:47,512 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:37:47,515 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-11-15 00:37:47,515 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-11-15 00:37:47,515 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-11-15 00:37:47,515 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-11-15 00:37:47,515 [ scc.git] DEBUG create mode 100644 connect.py
2024-11-15 00:37:47,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:37:47,820 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-11-15 00:37:47,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:47,837 [ 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-15 00:37:47,871 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-11-15 00:37:47,872 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:37:47,875 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-11-15 00:37:47,875 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-11-15 00:37:48,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:37:48,209 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-11-15 00:37:48,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:48,226 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-11-15 00:37:48,288 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-11-15 00:37:48,289 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:37:48,293 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-11-15 00:37:48,293 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-11-15 00:37:48,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:37:48,602 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-15 00:37:48,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:48,620 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-15 00:37:48,716 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-15 00:37:48,718 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:37:48,728 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-11-15 00:37:48,728 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-11-15 00:37:48,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:37:49,000 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-15 00:37:49,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:49,018 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Add fileset folder creation) ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-15 00:37:49,344 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:37:49,347 [ scc.git] DEBUG .gitignore | 1 +
2024-11-15 00:37:49,347 [ scc.git] DEBUG src/omero/plugins/download.py | 17 ++++++++++++-----
2024-11-15 00:37:49,347 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 5 deletions(-)
2024-11-15 00:37:49,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:37:49,496 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0e500ec05bf9227b66b28a480b40e0936241d953'
2024-11-15 00:37:49,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:49,514 [ 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-15 00:37:49,532 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:37:49,535 [ scc.git] DEBUG src/omero/hdfstorageV2.py | 1 +
2024-11-15 00:37:49,535 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2024-11-15 00:37:49,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:37:49,880 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-15 00:37:49,919 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:37:49,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:37:49,925 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-15 00:37:49,970 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-15 00:37:49,977 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9a76571eb0> has no local changes
2024-11-15 00:37:49,977 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/232/)'
2024-11-15 00:37:49,987 [ scc.git] DEBUG [detached HEAD 6a709f08] merge master -Dorg -Ssuccess-only
2024-11-15 00:37:49,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:37:49,988 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-15 00:37:49,988 [ scc.repo] DEBUG ## PRs found:
2024-11-15 00:37:50,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-15 00:37:50,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-15 00:37:51,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-15 00:37:51,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-15 00:37:52,424 [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-15 00:37:52,915 [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-15 00:37:53,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-15 00:37:53,825 [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-15 00:37:53,826 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-15 00:37:54,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-15 00:37:54,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-15 00:37:55,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-15 00:37:55,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-15 00:37:56,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-15 00:37:56,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-15 00:37:57,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-15 00:37:57,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-15 00:37:58,161 [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-15 00:37:58,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-15 00:37:58,999 [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-15 00:37:59,000 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-15 00:37:59,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-15 00:38:00,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-15 00:38:00,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-15 00:38:00,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-15 00:38:00,962 [ scc.repo] DEBUG ## Branches found:
2024-11-15 00:38:00,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-15 00:38:00,962 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:38:00,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:00,969 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-15 00:38:00,974 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-15 00:38:00,975 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-15 00:38:00,980 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-15 00:38:00,986 [ scc.git] DEBUG Already up to date.
2024-11-15 00:38:00,987 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-15 00:38:01,368 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-15 00:38:01,368 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-15 00:38:01,373 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-15 00:38:01,870 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-15 00:38:01,870 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-15 00:38:01,876 [ scc.git] DEBUG ## Unique users: []
2024-11-15 00:38:01,877 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:38:01,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:01,884 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-15 00:38:01,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:01,898 [ 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-15 00:38:02,017 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-15 00:38:02,017 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-15 00:38:02,017 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-15 00:38:02,018 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-15 00:38:02,024 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-15 00:38:02,032 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-15 00:38:02,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:02,176 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-15 00:38:02,186 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-15 00:38:02,194 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#232](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/232/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/232/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-15 00:38:02,202 [ scc.config] DEBUG Found github.token
2024-11-15 00:38:02,202 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-15 00:38:02,202 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-15 00:38:02,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:02,219 [ 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-15 00:38:02,252 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:38:02,256 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-15 00:38:02,256 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-15 00:38:02,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:02,572 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-15 00:38:02,685 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:38:02,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:02,690 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-15 00:38:02,737 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-15 00:38:02,743 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9a76511640> has no local changes
2024-11-15 00:38:02,744 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/232/)'
2024-11-15 00:38:02,752 [ scc.git] DEBUG [detached HEAD ca440b2] merge master -Dorg -Ssuccess-only
2024-11-15 00:38:02,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:38:02,753 [ scc.repo] DEBUG ## PRs found:
2024-11-15 00:38:03,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-11-15 00:38:03,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/597 HTTP/1.1" 200 None
2024-11-15 00:38:04,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/597/comments HTTP/1.1" 200 None
2024-11-15 00:38:04,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6e83df33bc34cb8562cb979c9890f4ec702d5c6f HTTP/1.1" 200 None
2024-11-15 00:38:05,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6e83df33bc34cb8562cb979c9890f4ec702d5c6f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-15 00:38:05,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6e83df33bc34cb8562cb979c9890f4ec702d5c6f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-15 00:38:06,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6e83df33bc34cb8562cb979c9890f4ec702d5c6f HTTP/1.1" 200 None
2024-11-15 00:38:06,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/6e83df33bc34cb8562cb979c9890f4ec702d5c6f?per_page=1 HTTP/1.1" 200 None
2024-11-15 00:38:07,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6e83df33bc34cb8562cb979c9890f4ec702d5c6f HTTP/1.1" 200 None
2024-11-15 00:38:07,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6e83df33bc34cb8562cb979c9890f4ec702d5c6f/status HTTP/1.1" 200 None
2024-11-15 00:38:07,625 [ scc.repo] DEBUG - PR 597 jburel 'Create release'
2024-11-15 00:38:08,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596 HTTP/1.1" 200 None
2024-11-15 00:38:08,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596/comments HTTP/1.1" 200 None
2024-11-15 00:38:09,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-11-15 00:38:09,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-15 00:38:10,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-15 00:38:10,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-11-15 00:38:10,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/3aae48f586d7b412538a45b34ddc471a26a286e8?per_page=1 HTTP/1.1" 200 None
2024-11-15 00:38:11,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-11-15 00:38:11,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/status HTTP/1.1" 200 None
2024-11-15 00:38:11,760 [ scc.repo] DEBUG - PR 596 sukunis 'Linkify can parse anchor tag'
2024-11-15 00:38:12,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595 HTTP/1.1" 200 None
2024-11-15 00:38:12,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595/comments HTTP/1.1" 200 None
2024-11-15 00:38:13,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-11-15 00:38:13,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-15 00:38:14,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-15 00:38:14,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-11-15 00:38:15,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/30278b64bb39134a3f1101b600d4a82256e6eaeb?per_page=1 HTTP/1.1" 200 None
2024-11-15 00:38:15,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-11-15 00:38:15,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/status HTTP/1.1" 200 None
2024-11-15 00:38:15,992 [ scc.repo] DEBUG - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2024-11-15 00:38:16,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/594 HTTP/1.1" 200 None
2024-11-15 00:38:17,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-15 00:38:17,481 [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-15 00:38:17,981 [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-15 00:38:18,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-15 00:38:18,921 [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-15 00:38:19,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-15 00:38:19,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6/status HTTP/1.1" 200 None
2024-11-15 00:38:19,786 [ scc.repo] DEBUG - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-15 00:38:20,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/592 HTTP/1.1" 200 None
2024-11-15 00:38:20,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-15 00:38:21,264 [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-15 00:38:21,811 [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-15 00:38:22,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-15 00:38:22,706 [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-15 00:38:23,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-15 00:38:23,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c/status HTTP/1.1" 200 None
2024-11-15 00:38:23,557 [ scc.repo] DEBUG - PR 592 jburel 'Replace pkg_resources'
2024-11-15 00:38:24,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/591 HTTP/1.1" 200 None
2024-11-15 00:38:24,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-15 00:38:25,025 [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-15 00:38:25,479 [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-15 00:38:26,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-15 00:38:26,558 [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-15 00:38:26,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-15 00:38:27,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe/status HTTP/1.1" 200 None
2024-11-15 00:38:27,406 [ scc.repo] DEBUG - PR 591 jburel 'Action update'
2024-11-15 00:38:27,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/590 HTTP/1.1" 200 None
2024-11-15 00:38:28,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-15 00:38:28,862 [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-15 00:38:29,354 [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-15 00:38:29,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-15 00:38:30,273 [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-15 00:38:30,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-15 00:38:31,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763/status HTTP/1.1" 200 None
2024-11-15 00:38:31,177 [ scc.repo] DEBUG - PR 590 knabar 'Update changelog'
2024-11-15 00:38:31,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/585 HTTP/1.1" 200 None
2024-11-15 00:38:32,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583 HTTP/1.1" 200 None
2024-11-15 00:38:32,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583/comments HTTP/1.1" 200 None
2024-11-15 00:38:33,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-15 00:38:33,674 [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-15 00:38:34,223 [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-15 00:38:34,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-15 00:38:35,121 [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-15 00:38:35,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-15 00:38:35,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd/status HTTP/1.1" 200 None
2024-11-15 00:38:35,989 [ scc.repo] DEBUG - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-15 00:38:36,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581 HTTP/1.1" 200 None
2024-11-15 00:38:36,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581/comments HTTP/1.1" 200 None
2024-11-15 00:38:37,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-11-15 00:38:37,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-11-15 00:38:38,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-11-15 00:38:38,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-11-15 00:38:39,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-15 00:38:39,948 [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-15 00:38:40,393 [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-15 00:38:40,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-15 00:38:41,274 [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-15 00:38:41,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-15 00:38:42,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-11-15 00:38:42,115 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-15 00:38:42,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-11-15 00:38:43,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-11-15 00:38:43,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-15 00:38:44,032 [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-15 00:38:44,485 [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-15 00:38:45,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-15 00:38:45,433 [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-15 00:38:45,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-15 00:38:46,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-11-15 00:38:46,386 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-15 00:38:46,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-11-15 00:38:47,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-11-15 00:38:47,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-11-15 00:38:48,351 [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-15 00:38:48,829 [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-15 00:38:48,831 [ scc.repo] DEBUG ## Branches found:
2024-11-15 00:38:48,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-15 00:38:48,832 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:38:48,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:48,837 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-15 00:38:48,842 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-15 00:38:48,842 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-15 00:38:48,846 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-15 00:38:48,851 [ scc.git] DEBUG Already up to date.
2024-11-15 00:38:48,852 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-11-15 00:38:50,385 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-15 00:38:50,385 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-11-15 00:38:50,390 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-11-15 00:38:50,739 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-15 00:38:50,739 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-11-15 00:38:50,745 [ scc.git] DEBUG Calling 'git fetch origin pull/583/head'
2024-11-15 00:38:51,807 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-15 00:38:51,808 [ scc.git] DEBUG * branch refs/pull/583/head -> FETCH_HEAD
2024-11-15 00:38:51,827 [ scc.git] DEBUG Calling 'git fetch origin pull/590/head'
2024-11-15 00:38:52,321 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-15 00:38:52,321 [ scc.git] DEBUG * branch refs/pull/590/head -> FETCH_HEAD
2024-11-15 00:38:52,327 [ scc.git] DEBUG Calling 'git fetch origin pull/591/head'
2024-11-15 00:38:53,025 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-15 00:38:53,025 [ scc.git] DEBUG * branch refs/pull/591/head -> FETCH_HEAD
2024-11-15 00:38:53,031 [ scc.git] DEBUG Calling 'git fetch origin pull/592/head'
2024-11-15 00:38:53,405 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-15 00:38:53,405 [ scc.git] DEBUG * branch refs/pull/592/head -> FETCH_HEAD
2024-11-15 00:38:53,411 [ scc.git] DEBUG Calling 'git fetch origin pull/594/head'
2024-11-15 00:38:54,071 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-15 00:38:54,072 [ scc.git] DEBUG * branch refs/pull/594/head -> FETCH_HEAD
2024-11-15 00:38:54,077 [ scc.git] DEBUG Calling 'git fetch origin pull/595/head'
2024-11-15 00:38:54,560 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-15 00:38:54,560 [ scc.git] DEBUG * branch refs/pull/595/head -> FETCH_HEAD
2024-11-15 00:38:54,566 [ scc.git] DEBUG Calling 'git fetch origin pull/596/head'
2024-11-15 00:38:54,889 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-15 00:38:54,889 [ scc.git] DEBUG * branch refs/pull/596/head -> FETCH_HEAD
2024-11-15 00:38:54,894 [ scc.git] DEBUG Calling 'git fetch origin pull/597/head'
2024-11-15 00:38:55,357 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-15 00:38:55,357 [ scc.git] DEBUG * branch refs/pull/597/head -> FETCH_HEAD
2024-11-15 00:38:55,360 [ scc.git] DEBUG ## Unique users: []
2024-11-15 00:38:55,360 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:38:55,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:55,365 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-11-15 00:38:55,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:55,376 [ 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-15 00:38:55,579 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-11-15 00:38:55,579 [ scc.git] DEBUG Auto-merging setup.py
2024-11-15 00:38:55,580 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:38:55,584 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-11-15 00:38:55,584 [ scc.git] DEBUG setup.py | 1 +
2024-11-15 00:38:55,584 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-11-15 00:38:55,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:55,727 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-11-15 00:38:55,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:55,740 [ 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-15 00:38:55,949 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-11-15 00:38:55,949 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-11-15 00:38:55,950 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:38:55,954 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-11-15 00:38:55,954 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-11-15 00:38:55,954 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-11-15 00:38:56,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:56,149 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dd2879608e047a7d71a648a23e6955ce591950fd'
2024-11-15 00:38:56,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:56,164 [ 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-15 00:38:56,343 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:38:56,347 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_content.html | 8 ++++++--
2024-11-15 00:38:56,347 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_dropdown2.html | 2 --
2024-11-15 00:38:56,347 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-15 00:38:56,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:56,531 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6cbcfa80ce4970cc57fddb99d1be440491982763'
2024-11-15 00:38:56,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:56,547 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 590 (Update changelog) 6cbcfa80ce4970cc57fddb99d1be440491982763'
2024-11-15 00:38:56,626 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:38:56,629 [ scc.git] DEBUG CHANGELOG.md | 16 ++++++++++++++++
2024-11-15 00:38:56,630 [ scc.git] DEBUG 1 file changed, 16 insertions(+)
2024-11-15 00:38:56,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:56,916 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-15 00:38:56,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:56,929 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 591 (Action update) 8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-15 00:38:57,066 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:38:57,069 [ scc.git] DEBUG .github/workflows/codeql-analysis.yml | 2 +-
2024-11-15 00:38:57,069 [ scc.git] DEBUG .github/workflows/install.yml | 4 ++--
2024-11-15 00:38:57,069 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-11-15 00:38:57,069 [ scc.git] DEBUG .github/workflows/tox.yml | 4 ++--
2024-11-15 00:38:57,069 [ scc.git] DEBUG .gitignore | 1 +
2024-11-15 00:38:57,069 [ scc.git] DEBUG 5 files changed, 9 insertions(+), 8 deletions(-)
2024-11-15 00:38:57,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:57,301 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...721002a9ad481311a44d093e26641344492e149c'
2024-11-15 00:38:57,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:57,315 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 592 (Replace pkg_resources) 721002a9ad481311a44d093e26641344492e149c'
2024-11-15 00:38:57,465 [ scc.git] DEBUG Auto-merging setup.py
2024-11-15 00:38:57,466 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:38:57,470 [ scc.git] DEBUG omero/plugins/web.py | 6 +++---
2024-11-15 00:38:57,470 [ scc.git] DEBUG setup.py | 3 ++-
2024-11-15 00:38:57,470 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 4 deletions(-)
2024-11-15 00:38:57,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:57,708 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6bba7f773bb6c4217607439f9adab8814bcd0ac6'
2024-11-15 00:38:57,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:57,722 [ 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-15 00:38:57,776 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:38:57,780 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/omero_table.html | 5 +++--
2024-11-15 00:38:57,780 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-11-15 00:38:58,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:58,095 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...30278b64bb39134a3f1101b600d4a82256e6eaeb'
2024-11-15 00:38:58,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:58,111 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 595 (linkify supports urls that include {}[] characters) 30278b64bb39134a3f1101b600d4a82256e6eaeb'
2024-11-15 00:38:58,256 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:38:58,260 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.webclient.actions.js | 2 +-
2024-11-15 00:38:58,261 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-15 00:38:58,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:58,512 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3aae48f586d7b412538a45b34ddc471a26a286e8'
2024-11-15 00:38:58,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:58,528 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 596 (Linkify can parse anchor tag) 3aae48f586d7b412538a45b34ddc471a26a286e8'
2024-11-15 00:38:58,615 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:38:58,618 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 26 ++++++++++++++++++++--
2024-11-15 00:38:58,618 [ scc.git] DEBUG 1 file changed, 24 insertions(+), 2 deletions(-)
2024-11-15 00:38:58,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:58,894 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6e83df33bc34cb8562cb979c9890f4ec702d5c6f'
2024-11-15 00:38:58,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:58,908 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 597 (Create release) 6e83df33bc34cb8562cb979c9890f4ec702d5c6f'
2024-11-15 00:38:58,927 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-15 00:38:58,929 [ scc.git] DEBUG .github/workflows/release.yml | 23 +++++++++++++++++++++++
2024-11-15 00:38:58,929 [ scc.git] DEBUG 1 file changed, 23 insertions(+)
2024-11-15 00:38:58,929 [ scc.git] DEBUG create mode 100644 .github/workflows/release.yml
2024-11-15 00:38:59,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:59,277 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-15 00:38:59,316 [ scc.git] DEBUG Get sha1 of %s
2024-11-15 00:38:59,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-15 00:38:59,321 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-15 00:38:59,357 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-15 00:38:59,366 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9a76520b80> has no local changes
2024-11-15 00:38:59,366 [ 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'
- PR 595 sukunis 'linkify supports urls that include {}[] characters'
- PR 596 sukunis 'Linkify can parse anchor tag'
- PR 597 jburel 'Create release'
Generated by OMERO-python-superbuild-push#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/232/)'
2024-11-15 00:38:59,377 [ scc.git] DEBUG [detached HEAD 441c49b29] merge master -Dorg -Ssuccess-only
2024-11-15 00:38:59,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:38:59,377 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-15 00:38:59,424 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-11-15 00:38:59,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:38:59,675 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-11-15 00:39:00,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:39:00,053 [ scc.config] DEBUG Found submodule.omero-py.url
2024-11-15 00:39:00,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:39:00,440 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-11-15 00:39:00,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:39:00,821 [ scc.config] DEBUG Found submodule.omero-web.url
2024-11-15 00:39:01,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-15 00:39:01,203 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-15 00:39:01,243 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9a77ac9a00> has local changes
2024-11-15 00:39:01,244 [ 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'
- PR 595 sukunis 'linkify supports urls that include {}[] characters'
- PR 596 sukunis 'Linkify can parse anchor tag'
- PR 597 jburel 'Create release'
Generated by OMERO-python-superbuild-push#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/232/)'
2024-11-15 00:39:01,259 [ scc.git] DEBUG [detached HEAD d3f8577] merge master -Dorg -Ssuccess-only
2024-11-15 00:39:01,259 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-11-15 00:39:01,260 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-15 00:39:01,260 [ scc.merge] INFO Already up to date.
2024-11-15 00:39:01,260 [ scc.merge] INFO
2024-11-15 00:39:01,261 [ scc.merge] INFO Merged PRs:
2024-11-15 00:39:01,261 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-15 00:39:01,261 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-15 00:39:01,261 [ scc.merge] INFO
2024-11-15 00:39:01,261 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-11-15 00:39:01,261 [ scc.merge] INFO Already up to date.
2024-11-15 00:39:01,261 [ scc.merge] INFO
2024-11-15 00:39:01,261 [ scc.merge] INFO Merged PRs:
2024-11-15 00:39:01,261 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-15 00:39:01,261 [ scc.merge] INFO
2024-11-15 00:39:01,261 [ scc.merge] INFO Repository: ome/omero-marshal
2024-11-15 00:39:01,261 [ scc.merge] INFO Excluded PRs:
2024-11-15 00:39:01,261 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-11-15 00:39:01,261 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-11-15 00:39:01,261 [ scc.merge] INFO Already up to date.
2024-11-15 00:39:01,261 [ scc.merge] INFO
2024-11-15 00:39:01,261 [ scc.merge] INFO Merged PRs:
2024-11-15 00:39:01,261 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-15 00:39:01,262 [ scc.merge] INFO
2024-11-15 00:39:01,262 [ scc.merge] INFO Repository: ome/omero-py
2024-11-15 00:39:01,262 [ scc.merge] INFO Excluded PRs:
2024-11-15 00:39:01,262 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-11-15 00:39:01,262 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-11-15 00:39:01,262 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-11-15 00:39:01,262 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-11-15 00:39:01,262 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-11-15 00:39:01,262 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-11-15 00:39:01,262 [ scc.merge] INFO Already up to date.
2024-11-15 00:39:01,262 [ scc.merge] INFO
2024-11-15 00:39:01,262 [ scc.merge] INFO Merged PRs:
2024-11-15 00:39:01,262 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-11-15 00:39:01,262 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-15 00:39:01,262 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-15 00:39:01,262 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-15 00:39:01,262 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-11-15 00:39:01,262 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-15 00:39:01,263 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-11-15 00:39:01,263 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-11-15 00:39:01,263 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation'
2024-11-15 00:39:01,263 [ scc.merge] INFO - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-15 00:39:01,263 [ scc.merge] INFO
2024-11-15 00:39:01,263 [ scc.merge] INFO Repository: ome/omero-scripts
2024-11-15 00:39:01,263 [ scc.merge] INFO Excluded PRs:
2024-11-15 00:39:01,263 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-15 00:39:01,263 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-15 00:39:01,263 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-15 00:39:01,263 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-15 00:39:01,263 [ scc.merge] INFO Already up to date.
2024-11-15 00:39:01,263 [ scc.merge] INFO
2024-11-15 00:39:01,263 [ scc.merge] INFO Merged PRs:
2024-11-15 00:39:01,263 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-15 00:39:01,263 [ scc.merge] INFO
2024-11-15 00:39:01,263 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-15 00:39:01,263 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-15 00:39:01,263 [ scc.merge] INFO
2024-11-15 00:39:01,264 [ scc.merge] INFO Repository: ome/omero-web
2024-11-15 00:39:01,264 [ scc.merge] INFO Excluded PRs:
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-11-15 00:39:01,264 [ scc.merge] INFO Already up to date.
2024-11-15 00:39:01,264 [ scc.merge] INFO
2024-11-15 00:39:01,264 [ scc.merge] INFO Merged PRs:
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 590 knabar 'Update changelog'
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 591 jburel 'Action update'
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 592 jburel 'Replace pkg_resources'
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2024-11-15 00:39:01,264 [ scc.merge] INFO - PR 596 sukunis 'Linkify can parse anchor tag'
2024-11-15 00:39:01,265 [ scc.merge] INFO - PR 597 jburel 'Create release'
2024-11-15 00:39:01,265 [ scc.merge] INFO
2024-11-15 00:39:01,265 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-15 00:39:01,265 [ scc.git] DEBUG Calling 'git remote'
2024-11-15 00:39:01,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-15 00:39:01,274 [ scc.git] DEBUG Calling 'git remote'
2024-11-15 00:39:01,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:39:01,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-15 00:39:01,283 [ scc.git] DEBUG Calling 'git remote'
2024-11-15 00:39:01,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:39:01,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-15 00:39:01,289 [ scc.git] DEBUG Calling 'git remote'
2024-11-15 00:39:01,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:39:01,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-15 00:39:01,295 [ scc.git] DEBUG Calling 'git remote'
2024-11-15 00:39:01,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-15 00:39:01,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-15 00:39:01,301 [ scc.git] DEBUG Calling 'git remote'
2024-11-15 00:39:01,307 [ 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-15 00:39:30,159 [ 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}
