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-10-12 00:41:22,665 [ scc.config] DEBUG Found github.token
2024-10-12 00:41:22,667 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-10-12 00:41:22,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:41:23,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:41:23,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-10-12 00:41:23,608 [ scc.gh] DEBUG 4359 remaining from 5000 (Reset at 01:10
2024-10-12 00:41:23,609 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-10-12 00:41:23,612 [ scc.git] DEBUG Check current status
2024-10-12 00:41:23,613 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-10-12 00:41:23,616 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-10-12 00:41:23,616 [ scc.git] DEBUG Calling 'git submodule status'
2024-10-12 00:41:23,651 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-10-12 00:41:23,654 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-10-12 00:41:23,657 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-10-12 00:41:23,660 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-10-12 00:41:23,663 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-10-12 00:41:23,667 [ scc.config] DEBUG Found remote.origin.url
2024-10-12 00:41:24,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-10-12 00:41:24,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-10-12 00:41:24,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-10-12 00:41:25,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-10-12 00:41:25,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-10-12 00:41:25,703 [ scc.git] DEBUG Resetting...
2024-10-12 00:41:25,703 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-10-12 00:41:25,709 [ scc.git] DEBUG HEAD is now at e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-10-12 00:41:25,709 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-10-12 00:41:25,761 [ scc.git] DEBUG Check current status
2024-10-12 00:41:25,761 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-10-12 00:41:25,764 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-10-12 00:41:25,764 [ scc.git] DEBUG Calling 'git submodule status'
2024-10-12 00:41:25,802 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-10-12 00:41:25,805 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-10-12 00:41:25,809 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-10-12 00:41:25,812 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-10-12 00:41:25,815 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-10-12 00:41:25,816 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-10-12 00:41:25,816 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-10-12 00:41:25,816 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-10-12 00:41:25,816 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-10-12 00:41:25,816 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-10-12 00:41:25,816 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:41:26,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-10-12 00:41:26,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-10-12 00:41:26,592 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-12 00:41:26,592 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-10-12 00:41:26,592 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:41:26,592 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:41:26,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:26,596 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:41:26,599 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:41:26,599 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:41:26,602 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:41:26,606 [ scc.git] DEBUG Already up to date.
2024-10-12 00:41:26,606 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-10-12 00:41:26,922 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-10-12 00:41:26,922 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-10-12 00:41:26,927 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:41:26,927 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:41:26,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:26,930 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-10-12 00:41:26,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:26,939 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 293 (Bump omero-py from `749a68a` to `4fd72ef`) 9660559833988d271074de56e54f2462a7be74e9'
2024-10-12 00:41:26,948 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:41:26,950 [ scc.git] DEBUG omero-py | 2 +-
2024-10-12 00:41:26,950 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-10-12 00:41:27,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:41:27,110 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:41:27,370 [ scc.git] DEBUG Submodule path 'omero-py': checked out '4fd72efaa8cdbec9da98e1d28678af16878a86ba'
2024-10-12 00:41:27,371 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:41:27,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:27,375 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:41:27,403 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9caf98bfd0> has no local changes
2024-10-12 00:41:27,403 [ 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`'
Generated by OMERO-python-superbuild-push#199 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/199/)'
2024-10-12 00:41:27,428 [ scc.git] DEBUG [detached HEAD 58ce2c3] merge master -Dorg -Snone
2024-10-12 00:41:27,428 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-10-12 00:41:27,428 [ scc.merge] INFO Already up to date.
2024-10-12 00:41:27,428 [ scc.merge] INFO
2024-10-12 00:41:27,428 [ scc.merge] INFO Merged PRs:
2024-10-12 00:41:27,428 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-10-12 00:41:27,428 [ scc.merge] INFO
2024-10-12 00:41:27,428 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-10-12 00:41:27,429 [ 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-10-12 00:41:29,710 [ scc.config] DEBUG Found github.token
2024-10-12 00:41:29,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-10-12 00:41:29,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:41:30,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:41:30,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-10-12 00:41:30,648 [ scc.gh] DEBUG 4349 remaining from 5000 (Reset at 01:10
2024-10-12 00:41:30,649 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-10-12 00:41:30,653 [ scc.git] DEBUG Check current status
2024-10-12 00:41:30,653 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-10-12 00:41:30,657 [ scc.git] DEBUG 58ce2c3 merge master -Dorg -Snone
2024-10-12 00:41:30,657 [ scc.git] DEBUG Calling 'git submodule status'
2024-10-12 00:41:30,696 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-10-12 00:41:30,699 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-10-12 00:41:30,703 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-10-12 00:41:30,706 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-10-12 00:41:30,710 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-10-12 00:41:30,715 [ scc.config] DEBUG Found remote.origin.url
2024-10-12 00:41:30,715 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-10-12 00:41:30,717 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-10-12 00:41:31,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-10-12 00:41:31,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-10-12 00:41:31,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-10-12 00:41:32,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-10-12 00:41:32,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-10-12 00:41:32,780 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:41:32,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-10-12 00:41:32,825 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-10-12 00:41:32,829 [ scc.git] DEBUG Check current status
2024-10-12 00:41:32,829 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-10-12 00:41:32,832 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-10-12 00:41:32,832 [ scc.git] DEBUG Calling 'git submodule status'
2024-10-12 00:41:32,868 [ scc.config] DEBUG Found remote.origin.url
2024-10-12 00:41:33,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-10-12 00:41:33,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-10-12 00:41:34,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-10-12 00:41:34,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-10-12 00:41:34,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-10-12 00:41:34,956 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:41:34,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:41:34,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-10-12 00:41:34,995 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-10-12 00:41:34,999 [ scc.git] DEBUG Check current status
2024-10-12 00:41:35,000 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-10-12 00:41:35,004 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-10-12 00:41:35,004 [ scc.git] DEBUG Calling 'git submodule status'
2024-10-12 00:41:35,043 [ scc.config] DEBUG Found remote.origin.url
2024-10-12 00:41:35,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-10-12 00:41:35,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-10-12 00:41:36,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-10-12 00:41:36,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-10-12 00:41:37,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-10-12 00:41:37,165 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:41:37,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:41:37,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-10-12 00:41:37,201 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-10-12 00:41:37,205 [ scc.git] DEBUG Check current status
2024-10-12 00:41:37,205 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-10-12 00:41:37,208 [ scc.git] DEBUG 4fd72efa Bump version: 5.19.5 → 5.19.6.dev0
2024-10-12 00:41:37,208 [ scc.git] DEBUG Calling 'git submodule status'
2024-10-12 00:41:37,245 [ scc.config] DEBUG Found remote.origin.url
2024-10-12 00:41:37,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-10-12 00:41:38,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-10-12 00:41:38,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-10-12 00:41:38,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-10-12 00:41:39,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-10-12 00:41:39,225 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:41:39,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:41:39,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-10-12 00:41:39,264 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-10-12 00:41:39,269 [ scc.git] DEBUG Check current status
2024-10-12 00:41:39,269 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-10-12 00:41:39,341 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-10-12 00:41:39,342 [ scc.git] DEBUG Calling 'git submodule status'
2024-10-12 00:41:39,379 [ scc.config] DEBUG Found remote.origin.url
2024-10-12 00:41:39,380 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-10-12 00:41:39,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-10-12 00:41:40,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-10-12 00:41:40,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-10-12 00:41:40,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-10-12 00:41:41,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-10-12 00:41:41,305 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:41:41,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:41:41,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-10-12 00:41:41,344 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-10-12 00:41:41,349 [ scc.git] DEBUG Check current status
2024-10-12 00:41:41,349 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-10-12 00:41:41,362 [ scc.git] DEBUG da5b7d11f Bump version: 5.27.2 → 5.27.3.dev0
2024-10-12 00:41:41,363 [ scc.git] DEBUG Calling 'git submodule status'
2024-10-12 00:41:41,404 [ scc.config] DEBUG Found remote.origin.url
2024-10-12 00:41:41,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-10-12 00:41:42,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-10-12 00:41:42,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-10-12 00:41:43,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-10-12 00:41:43,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-10-12 00:41:43,434 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:41:43,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:41:43,469 [ scc.git] DEBUG Resetting...
2024-10-12 00:41:43,469 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-10-12 00:41:43,474 [ scc.git] DEBUG HEAD is now at 58ce2c3 merge master -Dorg -Snone
2024-10-12 00:41:43,474 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-10-12 00:41:43,519 [ scc.git] DEBUG Check current status
2024-10-12 00:41:43,519 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-10-12 00:41:43,522 [ scc.git] DEBUG 58ce2c3 merge master -Dorg -Snone
2024-10-12 00:41:43,523 [ scc.git] DEBUG Calling 'git submodule status'
2024-10-12 00:41:43,559 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-10-12 00:41:43,561 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-10-12 00:41:43,564 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-10-12 00:41:43,568 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-10-12 00:41:43,571 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-10-12 00:41:43,572 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-10-12 00:41:43,572 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-10-12 00:41:43,572 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-10-12 00:41:43,572 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-10-12 00:41:43,572 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-10-12 00:41:43,572 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-10-12 00:41:43,572 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:41:43,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-10-12 00:41:44,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-10-12 00:41:44,356 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-12 00:41:45,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-10-12 00:41:45,483 [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-10-12 00:41:45,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-10-12 00:41:46,303 [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-10-12 00:41:46,303 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-10-12 00:41:46,304 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:41:46,304 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:41:46,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:46,308 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:41:46,311 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:41:46,311 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:41:46,315 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:41:46,320 [ scc.git] DEBUG Already up to date.
2024-10-12 00:41:46,320 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-10-12 00:41:46,644 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-10-12 00:41:46,644 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-10-12 00:41:46,648 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:41:46,648 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:41:46,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:46,652 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-10-12 00:41:46,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:46,659 [ 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-10-12 00:41:46,663 [ scc.git] DEBUG Already up to date.
2024-10-12 00:41:46,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:41:46,799 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:41:46,837 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:41:46,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:46,840 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:41:47,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-10-12 00:41:47,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-10-12 00:41:48,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-10-12 00:41:48,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-10-12 00:41:49,153 [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-10-12 00:41:49,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-10-12 00:41:49,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-10-12 00:41:49,973 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-10-12 00:41:49,973 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:41:49,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-10-12 00:41:49,973 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:41:49,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:49,977 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:41:49,981 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:41:49,981 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:41:49,985 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:41:49,988 [ scc.git] DEBUG Already up to date.
2024-10-12 00:41:49,989 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-10-12 00:41:50,352 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-10-12 00:41:50,352 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-10-12 00:41:50,356 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:41:50,356 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:41:50,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:50,360 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-10-12 00:41:50,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:50,368 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-10-12 00:41:50,380 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-10-12 00:41:50,380 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-10-12 00:41:50,380 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-10-12 00:41:50,380 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-10-12 00:41:50,380 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-10-12 00:41:50,381 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-10-12 00:41:50,381 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-10-12 00:41:50,381 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-10-12 00:41:50,381 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-10-12 00:41:50,381 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:41:50,384 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-10-12 00:41:50,384 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-10-12 00:41:50,384 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-10-12 00:41:50,384 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-10-12 00:41:50,384 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-10-12 00:41:50,384 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-10-12 00:41:50,386 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-10-12 00:41:50,386 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-10-12 00:41:50,386 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-10-12 00:41:50,386 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-10-12 00:41:50,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:41:50,513 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:41:50,548 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:41:50,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:50,551 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:41:50,584 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:41:50,589 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f737707a790> has no local changes
2024-10-12 00:41:50,589 [ 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#199 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/199/)'
2024-10-12 00:41:50,596 [ scc.git] DEBUG [detached HEAD 1f56467] merge master -Dorg -Ssuccess-only
2024-10-12 00:41:50,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:41:50,597 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:41:51,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-10-12 00:41:51,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-10-12 00:41:51,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-10-12 00:41:53,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-10-12 00:41:53,538 [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-10-12 00:41:54,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-10-12 00:41:54,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-10-12 00:41:54,454 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-10-12 00:41:54,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-10-12 00:41:55,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-10-12 00:41:55,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-10-12 00:41:56,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-10-12 00:41:56,197 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:41:56,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-10-12 00:41:56,197 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:41:56,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:56,202 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:41:56,205 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:41:56,205 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:41:56,209 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:41:56,213 [ scc.git] DEBUG Already up to date.
2024-10-12 00:41:56,213 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-10-12 00:41:56,741 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-10-12 00:41:56,741 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-10-12 00:41:56,746 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:41:56,746 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:41:56,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:56,750 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-10-12 00:41:56,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:56,758 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-10-12 00:41:56,767 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-10-12 00:41:56,768 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:41:56,770 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-10-12 00:41:56,770 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-10-12 00:41:56,770 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-10-12 00:41:56,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:41:56,905 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:41:56,940 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:41:56,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:41:56,944 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:41:56,978 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:41:56,983 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73770b4730> has no local changes
2024-10-12 00:41:56,983 [ 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#199 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/199/)'
2024-10-12 00:41:56,990 [ scc.git] DEBUG [detached HEAD 89b5708] merge master -Dorg -Ssuccess-only
2024-10-12 00:41:56,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:41:56,990 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:41:57,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-10-12 00:41:58,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/431 HTTP/1.1" 200 None
2024-10-12 00:41:58,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-10-12 00:41:59,101 [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-10-12 00:41:59,590 [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-10-12 00:42:00,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-10-12 00:42:00,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0e500ec05bf9227b66b28a480b40e0936241d953?per_page=1 HTTP/1.1" 200 None
2024-10-12 00:42:00,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-10-12 00:42:01,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/status HTTP/1.1" 200 None
2024-10-12 00:42:01,367 [ scc.repo] DEBUG - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-10-12 00:42:01,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-10-12 00:42:02,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-10-12 00:42:02,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427/comments HTTP/1.1" 200 None
2024-10-12 00:42:02,763 [ scc.repo] DEBUG # ... Include label: include
2024-10-12 00:42:03,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-10-12 00:42:03,796 [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-10-12 00:42:04,225 [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-10-12 00:42:04,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-10-12 00:42:05,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1?per_page=1 HTTP/1.1" 200 None
2024-10-12 00:42:05,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-10-12 00:42:05,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/status HTTP/1.1" 200 None
2024-10-12 00:42:05,990 [ scc.repo] DEBUG - PR 427 Rdornier 'Add fileset folder creation'
2024-10-12 00:42:06,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-10-12 00:42:06,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-10-12 00:42:07,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-10-12 00:42:07,911 [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-10-12 00:42:08,376 [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-10-12 00:42:08,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-10-12 00:42:09,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-10-12 00:42:09,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-10-12 00:42:10,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-10-12 00:42:10,200 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-10-12 00:42:10,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-10-12 00:42:11,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-10-12 00:42:11,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-10-12 00:42:12,125 [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-10-12 00:42:12,551 [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-10-12 00:42:13,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-10-12 00:42:13,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-10-12 00:42:14,110 [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-10-12 00:42:14,614 [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-10-12 00:42:15,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-10-12 00:42:15,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-10-12 00:42:15,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-10-12 00:42:16,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-10-12 00:42:16,365 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-10-12 00:42:16,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-10-12 00:42:16,810 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-10-12 00:42:17,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-10-12 00:42:17,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-10-12 00:42:18,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-10-12 00:42:18,767 [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-10-12 00:42:19,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-10-12 00:42:19,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-10-12 00:42:19,639 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-10-12 00:42:20,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-10-12 00:42:20,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-10-12 00:42:21,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-10-12 00:42:21,508 [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-10-12 00:42:22,001 [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-10-12 00:42:22,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-10-12 00:42:22,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-10-12 00:42:23,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-10-12 00:42:23,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-10-12 00:42:23,742 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-10-12 00:42:24,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-10-12 00:42:24,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-10-12 00:42:25,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-10-12 00:42:25,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-10-12 00:42:26,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-10-12 00:42:26,536 [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-10-12 00:42:26,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-10-12 00:42:27,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-10-12 00:42:27,350 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-10-12 00:42:27,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-10-12 00:42:28,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-10-12 00:42:28,733 [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-10-12 00:42:29,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-10-12 00:42:29,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-10-12 00:42:29,624 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-10-12 00:42:30,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-10-12 00:42:30,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-10-12 00:42:31,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-10-12 00:42:31,646 [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-10-12 00:42:32,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-10-12 00:42:32,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-10-12 00:42:32,477 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-10-12 00:42:32,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-10-12 00:42:33,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-10-12 00:42:33,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-10-12 00:42:34,421 [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-10-12 00:42:34,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-10-12 00:42:35,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-10-12 00:42:35,324 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-10-12 00:42:35,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-10-12 00:42:36,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-10-12 00:42:36,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-10-12 00:42:37,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-10-12 00:42:37,118 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:42:37,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-10-12 00:42:37,119 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:42:37,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:37,124 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:42:37,128 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:42:37,129 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:42:37,133 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:42:37,137 [ scc.git] DEBUG Already up to date.
2024-10-12 00:42:37,137 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-10-12 00:42:37,485 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-10-12 00:42:37,485 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-10-12 00:42:37,489 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-10-12 00:42:37,786 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-10-12 00:42:37,786 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-10-12 00:42:37,791 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-10-12 00:42:38,095 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-10-12 00:42:38,095 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-10-12 00:42:38,099 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-10-12 00:42:38,396 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-10-12 00:42:38,396 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-10-12 00:42:38,399 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-10-12 00:42:38,684 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-10-12 00:42:38,684 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-10-12 00:42:38,688 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-10-12 00:42:38,972 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-10-12 00:42:38,972 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-10-12 00:42:38,976 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-10-12 00:42:39,269 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-10-12 00:42:39,269 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-10-12 00:42:39,272 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-10-12 00:42:39,558 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-10-12 00:42:39,559 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-10-12 00:42:39,562 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-10-12 00:42:39,870 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-10-12 00:42:39,870 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-10-12 00:42:39,873 [ scc.git] DEBUG Calling 'git fetch origin pull/431/head'
2024-10-12 00:42:40,159 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-10-12 00:42:40,159 [ scc.git] DEBUG * branch refs/pull/431/head -> FETCH_HEAD
2024-10-12 00:42:40,164 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:42:40,165 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:42:40,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:40,170 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-10-12 00:42:40,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:40,185 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-10-12 00:42:40,264 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-10-12 00:42:40,264 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-10-12 00:42:40,264 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:42:40,268 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-10-12 00:42:40,268 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-10-12 00:42:40,268 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-10-12 00:42:40,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:42:40,415 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-10-12 00:42:40,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:40,429 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-10-12 00:42:41,027 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-10-12 00:42:41,027 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-10-12 00:42:41,028 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:42:41,035 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-10-12 00:42:41,035 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-10-12 00:42:41,035 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-10-12 00:42:41,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:42:41,173 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-10-12 00:42:41,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:41,186 [ 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-10-12 00:42:41,206 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-10-12 00:42:41,207 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:42:41,210 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-10-12 00:42:41,210 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-10-12 00:42:41,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:42:41,551 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-10-12 00:42:41,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:41,565 [ 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-10-12 00:42:41,992 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-10-12 00:42:41,992 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-10-12 00:42:41,993 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:42:41,996 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-10-12 00:42:41,996 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-10-12 00:42:41,996 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-10-12 00:42:42,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:42:42,134 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-10-12 00:42:42,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:42,151 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-10-12 00:42:42,183 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:42:42,186 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-10-12 00:42:42,186 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-10-12 00:42:42,186 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-10-12 00:42:42,186 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-10-12 00:42:42,186 [ scc.git] DEBUG create mode 100644 connect.py
2024-10-12 00:42:42,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:42:42,517 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-10-12 00:42:42,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:42,532 [ 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-10-12 00:42:42,772 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-10-12 00:42:42,773 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:42:42,776 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-10-12 00:42:42,776 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-10-12 00:42:42,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:42:42,915 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-10-12 00:42:42,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:42,930 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-10-12 00:42:42,949 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-10-12 00:42:42,949 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:42:42,953 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-10-12 00:42:42,953 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-10-12 00:42:43,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:42:43,291 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-10-12 00:42:43,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:43,309 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-10-12 00:42:43,619 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-10-12 00:42:43,620 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:42:43,626 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-10-12 00:42:43,626 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-10-12 00:42:43,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:42:43,755 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-10-12 00:42:43,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:43,769 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Add fileset folder creation) ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-10-12 00:42:43,788 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:42:43,792 [ scc.git] DEBUG .gitignore | 1 +
2024-10-12 00:42:43,792 [ scc.git] DEBUG src/omero/plugins/download.py | 17 ++++++++++++-----
2024-10-12 00:42:43,792 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 5 deletions(-)
2024-10-12 00:42:44,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:42:44,145 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0e500ec05bf9227b66b28a480b40e0936241d953'
2024-10-12 00:42:44,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:44,159 [ 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-10-12 00:42:44,178 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:42:44,182 [ scc.git] DEBUG src/omero/hdfstorageV2.py | 1 +
2024-10-12 00:42:44,182 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2024-10-12 00:42:44,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:42:44,520 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:42:44,559 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:42:44,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:44,562 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:42:44,598 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:42:44,604 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f737600ac70> has no local changes
2024-10-12 00:42:44,604 [ 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#199 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/199/)'
2024-10-12 00:42:44,613 [ scc.git] DEBUG [detached HEAD 97c6bb66] merge master -Dorg -Ssuccess-only
2024-10-12 00:42:44,613 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:42:44,614 [ scc.git] INFO Overriding base-branch from master to develop
2024-10-12 00:42:44,614 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:42:45,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-10-12 00:42:45,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-10-12 00:42:46,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-10-12 00:42:46,516 [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-10-12 00:42:46,993 [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-10-12 00:42:47,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-10-12 00:42:47,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-10-12 00:42:47,849 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-10-12 00:42:48,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-10-12 00:42:48,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-10-12 00:42:49,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-10-12 00:42:49,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-10-12 00:42:50,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-10-12 00:42:50,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-10-12 00:42:51,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-10-12 00:42:51,751 [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-10-12 00:42:52,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-10-12 00:42:52,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-10-12 00:42:52,610 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-10-12 00:42:53,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-10-12 00:42:53,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-10-12 00:42:53,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-10-12 00:42:54,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-10-12 00:42:54,451 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:42:54,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-10-12 00:42:54,451 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:42:54,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:54,456 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-10-12 00:42:54,460 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:42:54,460 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-10-12 00:42:54,465 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-10-12 00:42:54,470 [ scc.git] DEBUG Already up to date.
2024-10-12 00:42:54,470 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-10-12 00:42:54,804 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-10-12 00:42:54,804 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-10-12 00:42:54,808 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-10-12 00:42:55,103 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-10-12 00:42:55,103 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-10-12 00:42:55,106 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:42:55,106 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:42:55,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:55,110 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-10-12 00:42:55,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:55,119 [ 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-10-12 00:42:55,128 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-10-12 00:42:55,128 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-10-12 00:42:55,128 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-12 00:42:55,129 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-12 00:42:55,132 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-10-12 00:42:55,137 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-10-12 00:42:55,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:42:55,278 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-10-12 00:42:55,283 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-10-12 00:42:55,287 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#199](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/199/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/199/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-10-12 00:42:55,290 [ scc.config] DEBUG Found github.token
2024-10-12 00:42:55,290 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-10-12 00:42:55,290 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-10-12 00:42:55,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:55,298 [ 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-10-12 00:42:55,306 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:42:55,308 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-10-12 00:42:55,308 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-10-12 00:42:55,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:42:55,665 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:42:55,701 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:42:55,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:42:55,705 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:42:55,740 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:42:55,745 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f737601cbe0> has no local changes
2024-10-12 00:42:55,745 [ 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#199 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/199/)'
2024-10-12 00:42:55,752 [ scc.git] DEBUG [detached HEAD 3848961] merge master -Dorg -Ssuccess-only
2024-10-12 00:42:55,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:42:55,752 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:42:56,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-10-12 00:42:56,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/585 HTTP/1.1" 200 None
2024-10-12 00:42:57,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583 HTTP/1.1" 200 None
2024-10-12 00:42:57,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/aa50f469842b9687c74df8765d72241e6e37d32c HTTP/1.1" 200 None
2024-10-12 00:42:58,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/aa50f469842b9687c74df8765d72241e6e37d32c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-12 00:42:58,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/aa50f469842b9687c74df8765d72241e6e37d32c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-12 00:42:59,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/aa50f469842b9687c74df8765d72241e6e37d32c HTTP/1.1" 200 None
2024-10-12 00:42:59,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/aa50f469842b9687c74df8765d72241e6e37d32c?per_page=1 HTTP/1.1" 200 None
2024-10-12 00:43:00,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/aa50f469842b9687c74df8765d72241e6e37d32c HTTP/1.1" 200 None
2024-10-12 00:43:00,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/aa50f469842b9687c74df8765d72241e6e37d32c/status HTTP/1.1" 200 None
2024-10-12 00:43:00,594 [ scc.repo] DEBUG - PR 583 DavidStirling 'Allow users to click a group name to show data from all users in that group'
2024-10-12 00:43:01,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581 HTTP/1.1" 200 None
2024-10-12 00:43:01,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581/comments HTTP/1.1" 200 None
2024-10-12 00:43:01,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/580 HTTP/1.1" 200 None
2024-10-12 00:43:02,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc HTTP/1.1" 200 None
2024-10-12 00:43:02,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-12 00:43:03,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-12 00:43:03,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc HTTP/1.1" 200 None
2024-10-12 00:43:04,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc?per_page=1 HTTP/1.1" 200 None
2024-10-12 00:43:04,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc HTTP/1.1" 200 None
2024-10-12 00:43:05,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc/status HTTP/1.1" 200 None
2024-10-12 00:43:05,220 [ scc.repo] DEBUG - PR 580 sbesson 'omeroweb.webgateway.obj_id_bitmask: handle empty query results'
2024-10-12 00:43:05,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-10-12 00:43:06,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-10-12 00:43:06,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-10-12 00:43:06,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-10-12 00:43:07,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-10-12 00:43:07,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-10-12 00:43:08,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-10-12 00:43:08,939 [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-10-12 00:43:09,491 [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-10-12 00:43:09,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-10-12 00:43:10,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-10-12 00:43:10,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-10-12 00:43:11,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-10-12 00:43:11,250 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-10-12 00:43:11,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-10-12 00:43:12,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-10-12 00:43:12,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-10-12 00:43:13,174 [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-10-12 00:43:13,699 [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-10-12 00:43:14,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-10-12 00:43:14,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-10-12 00:43:15,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-10-12 00:43:15,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-10-12 00:43:15,424 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-10-12 00:43:15,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-10-12 00:43:16,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-10-12 00:43:16,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-10-12 00:43:17,414 [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-10-12 00:43:17,924 [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-10-12 00:43:17,927 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:43:17,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-10-12 00:43:17,927 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:43:17,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:43:17,932 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:43:17,935 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:43:17,935 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:43:17,940 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:43:17,944 [ scc.git] DEBUG Already up to date.
2024-10-12 00:43:17,944 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-10-12 00:43:18,258 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-10-12 00:43:18,258 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-10-12 00:43:18,263 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-10-12 00:43:18,568 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-10-12 00:43:18,569 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-10-12 00:43:18,573 [ scc.git] DEBUG Calling 'git fetch origin pull/580/head'
2024-10-12 00:43:18,864 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-10-12 00:43:18,864 [ scc.git] DEBUG * branch refs/pull/580/head -> FETCH_HEAD
2024-10-12 00:43:18,869 [ scc.git] DEBUG Calling 'git fetch origin pull/583/head'
2024-10-12 00:43:19,163 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-10-12 00:43:19,163 [ scc.git] DEBUG * branch refs/pull/583/head -> FETCH_HEAD
2024-10-12 00:43:19,167 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:43:19,168 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:43:19,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:43:19,172 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-10-12 00:43:19,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:43:19,182 [ 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-10-12 00:43:19,198 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-10-12 00:43:19,198 [ scc.git] DEBUG Auto-merging setup.py
2024-10-12 00:43:19,199 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:43:19,202 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-10-12 00:43:19,202 [ scc.git] DEBUG setup.py | 1 +
2024-10-12 00:43:19,202 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-10-12 00:43:19,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:43:19,327 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-10-12 00:43:19,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:43:19,340 [ 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-10-12 00:43:19,361 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-10-12 00:43:19,361 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-10-12 00:43:19,362 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:43:19,366 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-10-12 00:43:19,366 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-10-12 00:43:19,366 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-10-12 00:43:19,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:43:19,713 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc'
2024-10-12 00:43:19,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:43:19,725 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 580 (omeroweb.webgateway.obj_id_bitmask: handle empty query results) 1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc'
2024-10-12 00:43:19,742 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:43:19,746 [ scc.git] DEBUG omeroweb/webgateway/views.py | 6 ++++++
2024-10-12 00:43:19,746 [ scc.git] DEBUG 1 file changed, 6 insertions(+)
2024-10-12 00:43:20,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:43:20,102 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...aa50f469842b9687c74df8765d72241e6e37d32c'
2024-10-12 00:43:20,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:43:20,115 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 583 (Allow users to click a group name to show data from all users in that group) aa50f469842b9687c74df8765d72241e6e37d32c'
2024-10-12 00:43:20,133 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:43:20,136 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_content.html | 6 +++++-
2024-10-12 00:43:20,136 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_dropdown2.html | 2 --
2024-10-12 00:43:20,136 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 3 deletions(-)
2024-10-12 00:43:20,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:43:20,480 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:43:20,519 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:43:20,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:43:20,523 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:43:20,558 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:43:20,566 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7374f6dfa0> has no local changes
2024-10-12 00:43:20,566 [ 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 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (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 580 sbesson 'omeroweb.webgateway.obj_id_bitmask: handle empty query results'
- PR 583 DavidStirling 'Allow users to click a group name to show data from all users in that group'
Generated by OMERO-python-superbuild-push#199 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/199/)'
2024-10-12 00:43:20,575 [ scc.git] DEBUG [detached HEAD 68106f2b9] merge master -Dorg -Ssuccess-only
2024-10-12 00:43:20,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:43:20,576 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:43:20,622 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-10-12 00:43:20,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:43:20,869 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-10-12 00:43:21,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:43:21,246 [ scc.config] DEBUG Found submodule.omero-py.url
2024-10-12 00:43:21,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:43:21,630 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-10-12 00:43:22,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:43:22,059 [ scc.config] DEBUG Found submodule.omero-web.url
2024-10-12 00:43:22,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:43:22,437 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:43:22,466 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f737730bfd0> has local changes
2024-10-12 00:43:22,466 [ 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`'
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 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (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 580 sbesson 'omeroweb.webgateway.obj_id_bitmask: handle empty query results'
- PR 583 DavidStirling 'Allow users to click a group name to show data from all users in that group'
Generated by OMERO-python-superbuild-push#199 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/199/)'
2024-10-12 00:43:22,475 [ scc.git] DEBUG [detached HEAD 631e515] merge master -Dorg -Ssuccess-only
2024-10-12 00:43:22,475 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-10-12 00:43:22,475 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-10-12 00:43:22,476 [ scc.merge] INFO Already up to date.
2024-10-12 00:43:22,476 [ scc.merge] INFO
2024-10-12 00:43:22,476 [ scc.merge] INFO Merged PRs:
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-10-12 00:43:22,476 [ scc.merge] INFO
2024-10-12 00:43:22,476 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-10-12 00:43:22,476 [ scc.merge] INFO Already up to date.
2024-10-12 00:43:22,476 [ scc.merge] INFO
2024-10-12 00:43:22,476 [ scc.merge] INFO Merged PRs:
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-10-12 00:43:22,476 [ scc.merge] INFO
2024-10-12 00:43:22,476 [ scc.merge] INFO Repository: ome/omero-marshal
2024-10-12 00:43:22,476 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-10-12 00:43:22,476 [ scc.merge] INFO Already up to date.
2024-10-12 00:43:22,476 [ scc.merge] INFO
2024-10-12 00:43:22,476 [ scc.merge] INFO Merged PRs:
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-10-12 00:43:22,476 [ scc.merge] INFO
2024-10-12 00:43:22,476 [ scc.merge] INFO Repository: ome/omero-py
2024-10-12 00:43:22,476 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-10-12 00:43:22,476 [ scc.merge] INFO Already up to date.
2024-10-12 00:43:22,476 [ scc.merge] INFO
2024-10-12 00:43:22,476 [ scc.merge] INFO Merged PRs:
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-10-12 00:43:22,476 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation'
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-10-12 00:43:22,477 [ scc.merge] INFO
2024-10-12 00:43:22,477 [ scc.merge] INFO Repository: ome/omero-scripts
2024-10-12 00:43:22,477 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-10-12 00:43:22,477 [ scc.merge] INFO Already up to date.
2024-10-12 00:43:22,477 [ scc.merge] INFO
2024-10-12 00:43:22,477 [ scc.merge] INFO Merged PRs:
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-10-12 00:43:22,477 [ scc.merge] INFO
2024-10-12 00:43:22,477 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-10-12 00:43:22,477 [ scc.merge] INFO
2024-10-12 00:43:22,477 [ scc.merge] INFO Repository: ome/omero-web
2024-10-12 00:43:22,477 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-10-12 00:43:22,477 [ scc.merge] INFO Already up to date.
2024-10-12 00:43:22,477 [ scc.merge] INFO
2024-10-12 00:43:22,477 [ scc.merge] INFO Merged PRs:
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 580 sbesson 'omeroweb.webgateway.obj_id_bitmask: handle empty query results'
2024-10-12 00:43:22,477 [ scc.merge] INFO - PR 583 DavidStirling 'Allow users to click a group name to show data from all users in that group'
2024-10-12 00:43:22,477 [ scc.merge] INFO
2024-10-12 00:43:22,477 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-10-12 00:43:22,478 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:43:22,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-10-12 00:43:22,482 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:43:22,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:43:22,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-10-12 00:43:22,486 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:43:22,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:43:22,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-10-12 00:43:22,489 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:43:22,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:43:22,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-10-12 00:43:22,493 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:43:22,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-10-12 00:43:22,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-10-12 00:43:22,497 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:43:22,500 [ 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 da5b7d11f
nothing to commit, working tree clean
HEAD detached from e849d72
nothing to commit, working tree clean
2024-10-12 00:43:50,139 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/b04263cd/images/svgs/logo.svg){kind=logo}
