Console Output
+ export BASE_REPO=omero-python-superbuild.git
+ BASE_REPO=omero-python-superbuild.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-11-12 00:34:13,703 [ scc.config] DEBUG Found github.token
2024-11-12 00:34:13,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-12 00:34:13,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:34:14,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:34:14,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-12 00:34:14,733 [ scc.gh] DEBUG 4328 remaining from 5000 (Reset at 00:11
2024-11-12 00:34:14,734 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-12 00:34:14,738 [ scc.git] DEBUG Check current status
2024-11-12 00:34:14,738 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-12 00:34:14,741 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-12 00:34:14,741 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-12 00:34:14,780 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-12 00:34:14,783 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-12 00:34:14,786 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-12 00:34:14,790 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-12 00:34:14,793 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-12 00:34:14,797 [ scc.config] DEBUG Found remote.origin.url
2024-11-12 00:34:15,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-12 00:34:15,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-12 00:34:15,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-12 00:34:16,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-12 00:34:16,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-12 00:34:16,789 [ scc.git] DEBUG Resetting...
2024-11-12 00:34:16,789 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-12 00:34:17,420 [ scc.git] DEBUG HEAD is now at e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-12 00:34:17,420 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-12 00:34:17,473 [ scc.git] DEBUG Check current status
2024-11-12 00:34:17,473 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-12 00:34:17,477 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-12 00:34:17,477 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-12 00:34:17,517 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-12 00:34:17,520 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-12 00:34:17,524 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-12 00:34:17,527 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-12 00:34:17,530 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-12 00:34:17,531 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-12 00:34:17,531 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-12 00:34:17,532 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-12 00:34:17,532 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-12 00:34:17,532 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-12 00:34:17,532 [ scc.repo] DEBUG ## PRs found:
2024-11-12 00:34:17,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-12 00:34:18,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-12 00:34:18,236 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-12 00:34:18,236 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-12 00:34:18,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-12 00:34:18,690 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-12 00:34:18,690 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-12 00:34:18,690 [ scc.repo] DEBUG ## Branches found:
2024-11-12 00:34:18,690 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:34:18,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:18,695 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-12 00:34:18,698 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-12 00:34:18,698 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-12 00:34:18,702 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-12 00:34:18,707 [ scc.git] DEBUG Already up to date.
2024-11-12 00:34:18,707 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-12 00:34:19,008 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-12 00:34:19,008 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-12 00:34:19,013 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-12 00:34:19,707 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-12 00:34:19,708 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-12 00:34:19,712 [ scc.git] DEBUG ## Unique users: []
2024-11-12 00:34:19,712 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:34:19,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:19,717 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-12 00:34:19,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:19,725 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 293 (Bump omero-py from `749a68a` to `4fd72ef`) 9660559833988d271074de56e54f2462a7be74e9'
2024-11-12 00:34:19,734 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:34:19,736 [ scc.git] DEBUG omero-py | 2 +-
2024-11-12 00:34:19,736 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-12 00:34:19,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:34:19,888 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-12 00:34:19,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:19,897 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 294 (Bump omero-web from `da5b7d1` to `213bb61`) 587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-12 00:34:19,906 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:34:19,909 [ scc.git] DEBUG omero-web | 2 +-
2024-11-12 00:34:19,909 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-12 00:34:20,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:34:20,287 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-12 00:34:20,386 [ scc.git] DEBUG Submodule path 'omero-py': checked out '4fd72efaa8cdbec9da98e1d28678af16878a86ba'
2024-11-12 00:34:20,433 [ scc.git] DEBUG Submodule path 'omero-web': checked out '213bb61adc23aed4a750f2a83dc94b7efdb22cee'
2024-11-12 00:34:20,434 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:34:20,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:20,438 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-12 00:34:20,555 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd99a71df10> has no local changes
2024-11-12 00:34:20,556 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
- PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
Generated by OMERO-python-superbuild-push#229 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/229/)'
2024-11-12 00:34:20,739 [ scc.git] DEBUG [detached HEAD 9fbfb84] merge master -Dorg -Snone
2024-11-12 00:34:20,740 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-12 00:34:20,740 [ scc.merge] INFO Already up to date.
2024-11-12 00:34:20,740 [ scc.merge] INFO
2024-11-12 00:34:20,740 [ scc.merge] INFO Merged PRs:
2024-11-12 00:34:20,740 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-12 00:34:20,740 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-12 00:34:20,740 [ scc.merge] INFO
2024-11-12 00:34:20,740 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-12 00:34:20,740 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-11-12 00:34:22,874 [ scc.config] DEBUG Found github.token
2024-11-12 00:34:22,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-12 00:34:23,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:34:23,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:34:23,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-12 00:34:23,835 [ scc.gh] DEBUG 4316 remaining from 5000 (Reset at 00:11
2024-11-12 00:34:23,836 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-12 00:34:23,840 [ scc.git] DEBUG Check current status
2024-11-12 00:34:23,840 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-12 00:34:23,844 [ scc.git] DEBUG 9fbfb84 merge master -Dorg -Snone
2024-11-12 00:34:23,844 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-12 00:34:23,884 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-12 00:34:23,887 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-12 00:34:23,891 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-12 00:34:23,894 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-12 00:34:23,898 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-12 00:34:23,902 [ scc.config] DEBUG Found remote.origin.url
2024-11-12 00:34:23,902 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-11-12 00:34:23,904 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-11-12 00:34:24,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-12 00:34:24,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-12 00:34:25,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-12 00:34:25,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-12 00:34:25,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-12 00:34:25,985 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-12 00:34:26,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-12 00:34:26,031 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-12 00:34:26,035 [ scc.git] DEBUG Check current status
2024-11-12 00:34:26,036 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-12 00:34:26,039 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-11-12 00:34:26,039 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-12 00:34:26,080 [ scc.config] DEBUG Found remote.origin.url
2024-11-12 00:34:26,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-11-12 00:34:26,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-12 00:34:27,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-12 00:34:27,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-12 00:34:28,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-12 00:34:28,106 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-12 00:34:28,144 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:34:28,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-12 00:34:28,146 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-12 00:34:28,151 [ scc.git] DEBUG Check current status
2024-11-12 00:34:28,151 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-12 00:34:28,155 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-11-12 00:34:28,155 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-12 00:34:28,200 [ scc.config] DEBUG Found remote.origin.url
2024-11-12 00:34:28,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-11-12 00:34:29,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-12 00:34:29,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-12 00:34:29,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-12 00:34:30,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-12 00:34:30,209 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-12 00:34:30,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:34:30,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-12 00:34:30,250 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-12 00:34:30,255 [ scc.git] DEBUG Check current status
2024-11-12 00:34:30,255 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-12 00:34:30,535 [ scc.git] DEBUG 4fd72efa Bump version: 5.19.5 → 5.19.6.dev0
2024-11-12 00:34:30,536 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-12 00:34:30,580 [ scc.config] DEBUG Found remote.origin.url
2024-11-12 00:34:30,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-11-12 00:34:31,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-12 00:34:31,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-12 00:34:32,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-12 00:34:32,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-12 00:34:32,420 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-12 00:34:32,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:34:32,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-12 00:34:32,459 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-12 00:34:32,463 [ scc.git] DEBUG Check current status
2024-11-12 00:34:32,463 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-12 00:34:32,475 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-12 00:34:32,475 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-12 00:34:32,519 [ scc.config] DEBUG Found remote.origin.url
2024-11-12 00:34:32,519 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-11-12 00:34:32,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-11-12 00:34:33,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-12 00:34:33,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-12 00:34:34,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-12 00:34:34,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-12 00:34:34,567 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-12 00:34:34,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:34:34,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-12 00:34:34,610 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-12 00:34:34,615 [ scc.git] DEBUG Check current status
2024-11-12 00:34:34,615 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-12 00:34:34,621 [ scc.git] DEBUG 213bb61ad Merge pull request #580 from sbesson/obj_id_mask_no_match
2024-11-12 00:34:34,621 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-12 00:34:34,667 [ scc.config] DEBUG Found remote.origin.url
2024-11-12 00:34:35,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-11-12 00:34:35,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-12 00:34:35,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-12 00:34:36,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-12 00:34:36,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-12 00:34:36,660 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-12 00:34:36,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:34:36,703 [ scc.git] DEBUG Resetting...
2024-11-12 00:34:36,703 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-12 00:34:36,710 [ scc.git] DEBUG HEAD is now at 9fbfb84 merge master -Dorg -Snone
2024-11-12 00:34:36,710 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-12 00:34:36,766 [ scc.git] DEBUG Check current status
2024-11-12 00:34:36,766 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-12 00:34:36,772 [ scc.git] DEBUG 9fbfb84 merge master -Dorg -Snone
2024-11-12 00:34:36,772 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-12 00:34:36,815 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-12 00:34:36,818 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-12 00:34:36,822 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-12 00:34:36,825 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-12 00:34:36,829 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-12 00:34:36,830 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-12 00:34:36,830 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-12 00:34:36,830 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-12 00:34:36,830 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-12 00:34:36,831 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-12 00:34:36,831 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-11-12 00:34:36,831 [ scc.repo] DEBUG ## PRs found:
2024-11-12 00:34:37,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-12 00:34:37,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-12 00:34:37,616 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-12 00:34:38,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-12 00:34:38,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:34:39,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-12 00:34:39,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/587bd8c5de8d393fbed353cefde81f5bad4ea13a?per_page=1 HTTP/1.1" 200 2
2024-11-12 00:34:39,420 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-12 00:34:39,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-12 00:34:39,879 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-12 00:34:40,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-12 00:34:40,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:34:41,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-12 00:34:41,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/9660559833988d271074de56e54f2462a7be74e9?per_page=1 HTTP/1.1" 200 2
2024-11-12 00:34:41,897 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-12 00:34:41,897 [ scc.repo] DEBUG ## Branches found:
2024-11-12 00:34:41,897 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:34:41,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:41,902 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-12 00:34:41,906 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-12 00:34:41,906 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-12 00:34:41,910 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-12 00:34:41,916 [ scc.git] DEBUG Already up to date.
2024-11-12 00:34:41,916 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-12 00:34:42,238 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-12 00:34:42,239 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-12 00:34:42,243 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-12 00:34:42,543 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-12 00:34:42,544 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-12 00:34:42,549 [ scc.git] DEBUG ## Unique users: []
2024-11-12 00:34:42,549 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:34:42,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:42,553 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-12 00:34:42,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:42,560 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 293 (Bump omero-py from `749a68a` to `4fd72ef`) 9660559833988d271074de56e54f2462a7be74e9'
2024-11-12 00:34:42,564 [ scc.git] DEBUG Already up to date.
2024-11-12 00:34:42,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:34:42,694 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-12 00:34:42,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:42,703 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 294 (Bump omero-web from `da5b7d1` to `213bb61`) 587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-12 00:34:42,708 [ scc.git] DEBUG Already up to date.
2024-11-12 00:34:43,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:34:43,084 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-12 00:34:43,127 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:34:43,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:43,131 [ scc.repo] DEBUG ## PRs found:
2024-11-12 00:34:43,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-11-12 00:34:44,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-11-12 00:34:44,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-11-12 00:34:45,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-12 00:34:45,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:34:45,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-12 00:34:46,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-11-12 00:34:46,308 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-12 00:34:46,308 [ scc.repo] DEBUG ## Branches found:
2024-11-12 00:34:46,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-12 00:34:46,308 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:34:46,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:46,313 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-12 00:34:46,316 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-12 00:34:46,317 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-12 00:34:46,320 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-12 00:34:46,326 [ scc.git] DEBUG Already up to date.
2024-11-12 00:34:46,326 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-11-12 00:34:46,721 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-11-12 00:34:46,721 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-11-12 00:34:46,726 [ scc.git] DEBUG ## Unique users: []
2024-11-12 00:34:46,726 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:34:46,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:46,731 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-11-12 00:34:46,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:46,740 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-11-12 00:34:46,979 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-11-12 00:34:46,979 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-11-12 00:34:46,979 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-11-12 00:34:46,979 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-11-12 00:34:46,979 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-11-12 00:34:46,979 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-11-12 00:34:46,979 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-11-12 00:34:46,979 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-11-12 00:34:46,979 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-11-12 00:34:46,980 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:34:46,984 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-11-12 00:34:46,984 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-11-12 00:34:46,984 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-11-12 00:34:46,984 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-11-12 00:34:46,984 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-11-12 00:34:46,984 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-11-12 00:34:46,984 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-11-12 00:34:46,984 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-11-12 00:34:46,984 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-11-12 00:34:46,986 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-11-12 00:34:47,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:34:47,129 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-12 00:34:47,170 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:34:47,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:47,174 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-12 00:34:47,210 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-12 00:34:47,216 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f60d927df40> has no local changes
2024-11-12 00:34:47,216 [ 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#229 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/229/)'
2024-11-12 00:34:47,226 [ scc.git] DEBUG [detached HEAD dd4e737] merge master -Dorg -Ssuccess-only
2024-11-12 00:34:47,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:34:47,227 [ scc.repo] DEBUG ## PRs found:
2024-11-12 00:34:47,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-11-12 00:34:48,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-11-12 00:34:48,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-11-12 00:34:49,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-12 00:34:49,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:34:50,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-12 00:34:50,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-11-12 00:34:50,431 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-12 00:34:50,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-11-12 00:34:51,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-11-12 00:34:51,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-11-12 00:34:52,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-11-12 00:34:52,204 [ scc.repo] DEBUG ## Branches found:
2024-11-12 00:34:52,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-12 00:34:52,205 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:34:52,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:52,210 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-12 00:34:52,214 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-12 00:34:52,214 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-12 00:34:52,218 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-12 00:34:52,223 [ scc.git] DEBUG Already up to date.
2024-11-12 00:34:52,224 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-11-12 00:34:52,528 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-11-12 00:34:52,528 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-11-12 00:34:52,533 [ scc.git] DEBUG ## Unique users: []
2024-11-12 00:34:52,533 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:34:52,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:52,538 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-12 00:34:52,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:52,546 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-12 00:34:52,557 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-11-12 00:34:52,558 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:34:52,561 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-11-12 00:34:52,561 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-11-12 00:34:52,561 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-11-12 00:34:52,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:34:52,695 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-12 00:34:52,738 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:34:52,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:34:52,743 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-12 00:34:52,780 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-12 00:34:52,786 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f60da01ee80> has no local changes
2024-11-12 00:34:52,786 [ 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#229 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/229/)'
2024-11-12 00:34:52,794 [ scc.git] DEBUG [detached HEAD b750b16] merge master -Dorg -Ssuccess-only
2024-11-12 00:34:52,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:34:52,795 [ scc.repo] DEBUG ## PRs found:
2024-11-12 00:34:53,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-11-12 00:34:54,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/431 HTTP/1.1" 200 None
2024-11-12 00:34:54,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-12 00:34:55,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:34:55,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:34:55,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-12 00:34:56,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0e500ec05bf9227b66b28a480b40e0936241d953?per_page=1 HTTP/1.1" 200 None
2024-11-12 00:34:56,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-12 00:34:57,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/status HTTP/1.1" 200 None
2024-11-12 00:34:57,202 [ scc.repo] DEBUG - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-12 00:34:57,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-11-12 00:34:58,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-11-12 00:34:58,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427/comments HTTP/1.1" 200 None
2024-11-12 00:34:58,586 [ scc.repo] DEBUG # ... Include label: include
2024-11-12 00:34:59,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-12 00:34:59,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:00,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:35:00,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-12 00:35:00,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1?per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:01,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-12 00:35:01,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/status HTTP/1.1" 200 None
2024-11-12 00:35:01,736 [ scc.repo] DEBUG - PR 427 Rdornier 'Add fileset folder creation'
2024-11-12 00:35:02,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-11-12 00:35:02,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-11-12 00:35:03,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-12 00:35:03,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:04,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:35:04,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-12 00:35:05,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:05,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-12 00:35:05,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-11-12 00:35:05,922 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-11-12 00:35:06,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-11-12 00:35:06,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-11-12 00:35:07,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-11-12 00:35:07,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:08,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:35:08,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-11-12 00:35:09,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-12 00:35:09,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:10,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:35:10,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-12 00:35:11,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:11,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-12 00:35:11,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-11-12 00:35:11,937 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-11-12 00:35:12,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-11-12 00:35:12,414 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-11-12 00:35:12,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-11-12 00:35:13,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-11-12 00:35:13,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-12 00:35:14,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:14,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-12 00:35:15,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-11-12 00:35:15,098 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-12 00:35:15,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-11-12 00:35:16,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-11-12 00:35:16,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-12 00:35:17,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:17,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:35:17,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-12 00:35:18,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:18,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-12 00:35:19,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-11-12 00:35:19,341 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-11-12 00:35:19,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-11-12 00:35:20,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-11-12 00:35:20,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-11-12 00:35:21,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-11-12 00:35:21,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-12 00:35:22,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:22,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-12 00:35:23,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-11-12 00:35:23,172 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-12 00:35:23,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-11-12 00:35:24,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-12 00:35:24,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:25,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-12 00:35:25,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-11-12 00:35:25,564 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-12 00:35:26,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-11-12 00:35:26,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-11-12 00:35:27,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-12 00:35:27,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:27,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-12 00:35:28,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-11-12 00:35:28,394 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-12 00:35:28,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-11-12 00:35:29,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-11-12 00:35:29,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-12 00:35:30,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:30,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-12 00:35:31,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-11-12 00:35:31,108 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-11-12 00:35:31,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-11-12 00:35:32,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-11-12 00:35:32,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-11-12 00:35:32,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-11-12 00:35:32,915 [ scc.repo] DEBUG ## Branches found:
2024-11-12 00:35:32,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-12 00:35:32,915 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:35:32,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:32,921 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-12 00:35:32,925 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-12 00:35:32,925 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-12 00:35:32,930 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-12 00:35:32,935 [ scc.git] DEBUG Already up to date.
2024-11-12 00:35:32,935 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-11-12 00:35:33,269 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-12 00:35:33,269 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-11-12 00:35:33,274 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-11-12 00:35:33,576 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-12 00:35:33,576 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-11-12 00:35:33,581 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-11-12 00:35:33,869 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-12 00:35:33,869 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-11-12 00:35:33,876 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-11-12 00:35:34,166 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-12 00:35:34,167 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-11-12 00:35:34,172 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-11-12 00:35:34,643 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-12 00:35:34,643 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-11-12 00:35:34,649 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-11-12 00:35:34,937 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-12 00:35:34,937 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-11-12 00:35:34,942 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-11-12 00:35:35,245 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-12 00:35:35,245 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-11-12 00:35:35,250 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-11-12 00:35:35,734 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-12 00:35:35,735 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-11-12 00:35:35,740 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-11-12 00:35:36,583 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-12 00:35:36,584 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-11-12 00:35:36,590 [ scc.git] DEBUG Calling 'git fetch origin pull/431/head'
2024-11-12 00:35:36,872 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-12 00:35:36,872 [ scc.git] DEBUG * branch refs/pull/431/head -> FETCH_HEAD
2024-11-12 00:35:36,877 [ scc.git] DEBUG ## Unique users: []
2024-11-12 00:35:36,877 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:35:36,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:36,883 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-12 00:35:36,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:36,897 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-12 00:35:36,920 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-11-12 00:35:36,920 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-11-12 00:35:36,930 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:35:36,934 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-11-12 00:35:36,934 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-11-12 00:35:36,934 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-11-12 00:35:37,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:35:37,083 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-12 00:35:37,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:37,098 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-12 00:35:37,140 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-12 00:35:37,141 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-11-12 00:35:37,141 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:35:37,148 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-11-12 00:35:37,148 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-11-12 00:35:37,148 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-11-12 00:35:37,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:35:37,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-11-12 00:35:37,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:37,520 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-11-12 00:35:37,540 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-11-12 00:35:37,541 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:35:37,543 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-11-12 00:35:37,543 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-11-12 00:35:37,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:35:37,885 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-11-12 00:35:37,899 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:37,903 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2024-11-12 00:35:38,178 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-11-12 00:35:38,179 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-11-12 00:35:38,180 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:35:38,183 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-11-12 00:35:38,183 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-11-12 00:35:38,183 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-11-12 00:35:38,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:35:38,315 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-12 00:35:38,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:38,331 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-12 00:35:38,408 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:35:38,411 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-11-12 00:35:38,411 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-11-12 00:35:38,411 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-11-12 00:35:38,411 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-11-12 00:35:38,411 [ scc.git] DEBUG create mode 100644 connect.py
2024-11-12 00:35:38,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:35:38,694 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-11-12 00:35:38,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:38,710 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-11-12 00:35:38,770 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-11-12 00:35:38,771 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:35:38,774 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-11-12 00:35:38,774 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-11-12 00:35:39,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:35:39,083 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-11-12 00:35:39,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:39,100 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-11-12 00:35:39,123 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-11-12 00:35:39,191 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:35:39,195 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-11-12 00:35:39,195 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-11-12 00:35:39,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:35:39,464 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-12 00:35:39,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:39,483 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-12 00:35:39,648 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-12 00:35:39,650 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:35:39,657 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-11-12 00:35:39,657 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-11-12 00:35:39,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:35:39,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-12 00:35:39,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:39,867 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Add fileset folder creation) ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-12 00:35:39,901 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:35:39,904 [ scc.git] DEBUG .gitignore | 1 +
2024-11-12 00:35:39,904 [ scc.git] DEBUG src/omero/plugins/download.py | 17 ++++++++++++-----
2024-11-12 00:35:39,904 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 5 deletions(-)
2024-11-12 00:35:40,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:35:40,304 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0e500ec05bf9227b66b28a480b40e0936241d953'
2024-11-12 00:35:40,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:40,321 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 431 (omero.HdfStorage.update: add size check on data.rowNumbers) 0e500ec05bf9227b66b28a480b40e0936241d953'
2024-11-12 00:35:40,349 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:35:40,352 [ scc.git] DEBUG src/omero/hdfstorageV2.py | 1 +
2024-11-12 00:35:40,352 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2024-11-12 00:35:40,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:35:40,685 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-12 00:35:40,726 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:35:40,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:40,731 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-12 00:35:40,772 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-12 00:35:40,779 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f60d8235eb0> has no local changes
2024-11-12 00:35:40,779 [ 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#229 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/229/)'
2024-11-12 00:35:40,812 [ scc.git] DEBUG [detached HEAD 1dc59ddf] merge master -Dorg -Ssuccess-only
2024-11-12 00:35:40,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:35:40,813 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-12 00:35:40,813 [ scc.repo] DEBUG ## PRs found:
2024-11-12 00:35:41,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-12 00:35:41,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-12 00:35:42,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-12 00:35:42,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-12 00:35:43,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:43,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:35:44,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-12 00:35:44,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-11-12 00:35:44,463 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-12 00:35:44,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-12 00:35:45,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-12 00:35:45,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-12 00:35:46,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-12 00:35:46,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-12 00:35:47,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-12 00:35:47,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-12 00:35:48,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-12 00:35:48,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:49,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-12 00:35:49,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-11-12 00:35:49,595 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-12 00:35:50,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-12 00:35:50,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-12 00:35:51,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-12 00:35:51,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-12 00:35:51,464 [ scc.repo] DEBUG ## Branches found:
2024-11-12 00:35:51,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-12 00:35:51,464 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:35:51,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:51,470 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-12 00:35:51,474 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-12 00:35:51,474 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-12 00:35:51,478 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-12 00:35:51,483 [ scc.git] DEBUG Already up to date.
2024-11-12 00:35:51,483 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-12 00:35:51,817 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-12 00:35:51,817 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-12 00:35:51,822 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-12 00:35:52,124 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-12 00:35:52,125 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-12 00:35:52,130 [ scc.git] DEBUG ## Unique users: []
2024-11-12 00:35:52,130 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:35:52,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:52,135 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-12 00:35:52,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:52,147 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-12 00:35:52,383 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-12 00:35:52,383 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-12 00:35:52,383 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-12 00:35:52,384 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-12 00:35:52,389 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-12 00:35:52,394 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-12 00:35:52,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:35:52,525 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-12 00:35:52,531 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-12 00:35:52,536 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#229](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/229/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/229/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-12 00:35:52,539 [ scc.config] DEBUG Found github.token
2024-11-12 00:35:52,540 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-12 00:35:52,540 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-12 00:35:52,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:52,550 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-12 00:35:52,613 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:35:52,616 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-12 00:35:52,616 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-12 00:35:52,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:35:52,932 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-12 00:35:52,975 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:35:52,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:35:52,980 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-12 00:35:53,018 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-12 00:35:53,024 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f60d8246640> has no local changes
2024-11-12 00:35:53,024 [ 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#229 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/229/)'
2024-11-12 00:35:53,033 [ scc.git] DEBUG [detached HEAD 3ef03b7] merge master -Dorg -Ssuccess-only
2024-11-12 00:35:53,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:35:53,033 [ scc.repo] DEBUG ## PRs found:
2024-11-12 00:35:53,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-11-12 00:35:54,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/594 HTTP/1.1" 200 None
2024-11-12 00:35:54,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-12 00:35:55,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:55,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:35:56,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-12 00:35:56,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/6bba7f773bb6c4217607439f9adab8814bcd0ac6?per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:56,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-12 00:35:57,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6/status HTTP/1.1" 200 None
2024-11-12 00:35:57,299 [ scc.repo] DEBUG - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-12 00:35:57,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/592 HTTP/1.1" 200 None
2024-11-12 00:35:58,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-12 00:35:58,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:35:59,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:35:59,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-12 00:36:00,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/721002a9ad481311a44d093e26641344492e149c?per_page=1 HTTP/1.1" 200 None
2024-11-12 00:36:00,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-12 00:36:00,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c/status HTTP/1.1" 200 None
2024-11-12 00:36:00,920 [ scc.repo] DEBUG - PR 592 jburel 'Replace pkg_resources'
2024-11-12 00:36:01,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/591 HTTP/1.1" 200 None
2024-11-12 00:36:01,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-12 00:36:02,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:36:02,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:36:03,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-12 00:36:03,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/8a54f0347e7174a744c4c210d0734effd029acbe?per_page=1 HTTP/1.1" 200 None
2024-11-12 00:36:04,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-12 00:36:04,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe/status HTTP/1.1" 200 None
2024-11-12 00:36:04,590 [ scc.repo] DEBUG - PR 591 jburel 'Action update'
2024-11-12 00:36:05,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/590 HTTP/1.1" 200 None
2024-11-12 00:36:05,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-12 00:36:06,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:36:06,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:36:07,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-12 00:36:07,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/6cbcfa80ce4970cc57fddb99d1be440491982763?per_page=1 HTTP/1.1" 200 None
2024-11-12 00:36:08,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-12 00:36:08,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763/status HTTP/1.1" 200 None
2024-11-12 00:36:08,475 [ scc.repo] DEBUG - PR 590 knabar 'Update changelog'
2024-11-12 00:36:08,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/585 HTTP/1.1" 200 None
2024-11-12 00:36:09,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583 HTTP/1.1" 200 None
2024-11-12 00:36:09,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583/comments HTTP/1.1" 200 None
2024-11-12 00:36:10,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-12 00:36:10,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:36:11,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:36:11,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-12 00:36:12,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/dd2879608e047a7d71a648a23e6955ce591950fd?per_page=1 HTTP/1.1" 200 None
2024-11-12 00:36:12,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-12 00:36:13,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd/status HTTP/1.1" 200 None
2024-11-12 00:36:13,161 [ scc.repo] DEBUG - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-12 00:36:13,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581 HTTP/1.1" 200 None
2024-11-12 00:36:14,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581/comments HTTP/1.1" 200 None
2024-11-12 00:36:14,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-11-12 00:36:15,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-11-12 00:36:15,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-11-12 00:36:15,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-11-12 00:36:16,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-12 00:36:16,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:36:17,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:36:17,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-12 00:36:18,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-11-12 00:36:18,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-12 00:36:19,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-11-12 00:36:19,178 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-12 00:36:19,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-11-12 00:36:20,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-11-12 00:36:20,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-12 00:36:21,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:36:21,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:36:22,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-12 00:36:22,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-11-12 00:36:22,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-12 00:36:23,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-11-12 00:36:23,426 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-12 00:36:23,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-11-12 00:36:24,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-11-12 00:36:24,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-11-12 00:36:25,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-12 00:36:25,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-12 00:36:25,742 [ scc.repo] DEBUG ## Branches found:
2024-11-12 00:36:25,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-12 00:36:25,742 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:36:25,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:36:25,747 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-12 00:36:25,777 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-12 00:36:25,777 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-12 00:36:25,783 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-12 00:36:25,787 [ scc.git] DEBUG Already up to date.
2024-11-12 00:36:25,787 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-11-12 00:36:27,220 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-12 00:36:27,220 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-11-12 00:36:27,225 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-11-12 00:36:27,550 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-12 00:36:27,550 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-11-12 00:36:27,554 [ scc.git] DEBUG Calling 'git fetch origin pull/583/head'
2024-11-12 00:36:28,348 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-12 00:36:28,349 [ scc.git] DEBUG * branch refs/pull/583/head -> FETCH_HEAD
2024-11-12 00:36:28,353 [ scc.git] DEBUG Calling 'git fetch origin pull/590/head'
2024-11-12 00:36:28,687 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-12 00:36:28,687 [ scc.git] DEBUG * branch refs/pull/590/head -> FETCH_HEAD
2024-11-12 00:36:28,692 [ scc.git] DEBUG Calling 'git fetch origin pull/591/head'
2024-11-12 00:36:29,186 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-12 00:36:29,187 [ scc.git] DEBUG * branch refs/pull/591/head -> FETCH_HEAD
2024-11-12 00:36:29,192 [ scc.git] DEBUG Calling 'git fetch origin pull/592/head'
2024-11-12 00:36:29,509 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-12 00:36:29,509 [ scc.git] DEBUG * branch refs/pull/592/head -> FETCH_HEAD
2024-11-12 00:36:29,514 [ scc.git] DEBUG Calling 'git fetch origin pull/594/head'
2024-11-12 00:36:30,026 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-12 00:36:30,026 [ scc.git] DEBUG * branch refs/pull/594/head -> FETCH_HEAD
2024-11-12 00:36:30,031 [ scc.git] DEBUG ## Unique users: []
2024-11-12 00:36:30,031 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:36:30,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:36:30,037 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-11-12 00:36:30,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:36:30,050 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-11-12 00:36:30,070 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-11-12 00:36:30,070 [ scc.git] DEBUG Auto-merging setup.py
2024-11-12 00:36:30,071 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:36:30,074 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-11-12 00:36:30,074 [ scc.git] DEBUG setup.py | 1 +
2024-11-12 00:36:30,074 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-11-12 00:36:30,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:36:30,204 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-11-12 00:36:30,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:36:30,217 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-11-12 00:36:30,237 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-11-12 00:36:30,238 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-11-12 00:36:30,239 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:36:30,243 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-11-12 00:36:30,243 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-11-12 00:36:30,243 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-11-12 00:36:30,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:36:30,589 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dd2879608e047a7d71a648a23e6955ce591950fd'
2024-11-12 00:36:30,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:36:30,603 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 583 (Allow users to click a group name to quick-switch to that group) dd2879608e047a7d71a648a23e6955ce591950fd'
2024-11-12 00:36:30,739 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:36:30,743 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_content.html | 8 ++++++--
2024-11-12 00:36:30,743 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_dropdown2.html | 2 --
2024-11-12 00:36:30,743 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-12 00:36:30,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:36:30,990 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6cbcfa80ce4970cc57fddb99d1be440491982763'
2024-11-12 00:36:30,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:36:31,001 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 590 (Update changelog) 6cbcfa80ce4970cc57fddb99d1be440491982763'
2024-11-12 00:36:31,076 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:36:31,079 [ scc.git] DEBUG CHANGELOG.md | 16 ++++++++++++++++
2024-11-12 00:36:31,079 [ scc.git] DEBUG 1 file changed, 16 insertions(+)
2024-11-12 00:36:31,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:36:31,368 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-12 00:36:31,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:36:31,381 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 591 (Action update) 8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-12 00:36:31,440 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:36:31,443 [ scc.git] DEBUG .github/workflows/codeql-analysis.yml | 2 +-
2024-11-12 00:36:31,443 [ scc.git] DEBUG .github/workflows/install.yml | 4 ++--
2024-11-12 00:36:31,443 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-11-12 00:36:31,443 [ scc.git] DEBUG .github/workflows/tox.yml | 4 ++--
2024-11-12 00:36:31,443 [ scc.git] DEBUG .gitignore | 1 +
2024-11-12 00:36:31,443 [ scc.git] DEBUG 5 files changed, 9 insertions(+), 8 deletions(-)
2024-11-12 00:36:31,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:36:31,745 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...721002a9ad481311a44d093e26641344492e149c'
2024-11-12 00:36:31,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:36:31,759 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 592 (Replace pkg_resources) 721002a9ad481311a44d093e26641344492e149c'
2024-11-12 00:36:31,822 [ scc.git] DEBUG Auto-merging setup.py
2024-11-12 00:36:31,823 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:36:31,826 [ scc.git] DEBUG omero/plugins/web.py | 6 +++---
2024-11-12 00:36:31,826 [ scc.git] DEBUG setup.py | 3 ++-
2024-11-12 00:36:31,826 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 4 deletions(-)
2024-11-12 00:36:32,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:36:32,123 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6bba7f773bb6c4217607439f9adab8814bcd0ac6'
2024-11-12 00:36:32,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:36:32,135 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 594 (Add minimum batch size to avoid infinite loop due to zero batch size) 6bba7f773bb6c4217607439f9adab8814bcd0ac6'
2024-11-12 00:36:32,153 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-12 00:36:32,156 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/omero_table.html | 5 +++--
2024-11-12 00:36:32,156 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-11-12 00:36:32,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:36:32,504 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-12 00:36:32,540 [ scc.git] DEBUG Get sha1 of %s
2024-11-12 00:36:32,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-12 00:36:32,544 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-12 00:36:32,583 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-12 00:36:32,593 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f60d81f4b80> has no local changes
2024-11-12 00:36:32,593 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
- PR 590 knabar 'Update changelog'
- PR 591 jburel 'Action update'
- PR 592 jburel 'Replace pkg_resources'
- PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
Generated by OMERO-python-superbuild-push#229 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/229/)'
2024-11-12 00:36:32,619 [ scc.git] DEBUG [detached HEAD 884133858] merge master -Dorg -Ssuccess-only
2024-11-12 00:36:32,619 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:36:32,619 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-12 00:36:32,669 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-11-12 00:36:32,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:36:32,902 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-11-12 00:36:33,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:36:33,294 [ scc.config] DEBUG Found submodule.omero-py.url
2024-11-12 00:36:33,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:36:33,687 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-11-12 00:36:34,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:36:34,072 [ scc.config] DEBUG Found submodule.omero-web.url
2024-11-12 00:36:34,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-12 00:36:34,442 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-12 00:36:34,466 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f60db5dbf10> has local changes
2024-11-12 00:36:34,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`'
- PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
- PR 427 Rdornier 'Add fileset folder creation'
- PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
- PR 590 knabar 'Update changelog'
- PR 591 jburel 'Action update'
- PR 592 jburel 'Replace pkg_resources'
- PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
Generated by OMERO-python-superbuild-push#229 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/229/)'
2024-11-12 00:36:34,475 [ scc.git] DEBUG [detached HEAD 8103d33] merge master -Dorg -Ssuccess-only
2024-11-12 00:36:34,476 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-12 00:36:34,476 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-11-12 00:36:34,476 [ scc.merge] INFO Already up to date.
2024-11-12 00:36:34,476 [ scc.merge] INFO
2024-11-12 00:36:34,476 [ scc.merge] INFO Merged PRs:
2024-11-12 00:36:34,476 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-12 00:36:34,476 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-12 00:36:34,476 [ scc.merge] INFO
2024-11-12 00:36:34,476 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-11-12 00:36:34,476 [ scc.merge] INFO Already up to date.
2024-11-12 00:36:34,476 [ scc.merge] INFO
2024-11-12 00:36:34,476 [ scc.merge] INFO Merged PRs:
2024-11-12 00:36:34,476 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-12 00:36:34,476 [ scc.merge] INFO
2024-11-12 00:36:34,476 [ scc.merge] INFO Repository: ome/omero-marshal
2024-11-12 00:36:34,476 [ scc.merge] INFO Excluded PRs:
2024-11-12 00:36:34,476 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-11-12 00:36:34,477 [ scc.merge] INFO Already up to date.
2024-11-12 00:36:34,477 [ scc.merge] INFO
2024-11-12 00:36:34,477 [ scc.merge] INFO Merged PRs:
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-12 00:36:34,477 [ scc.merge] INFO
2024-11-12 00:36:34,477 [ scc.merge] INFO Repository: ome/omero-py
2024-11-12 00:36:34,477 [ scc.merge] INFO Excluded PRs:
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-11-12 00:36:34,477 [ scc.merge] INFO Already up to date.
2024-11-12 00:36:34,477 [ scc.merge] INFO
2024-11-12 00:36:34,477 [ scc.merge] INFO Merged PRs:
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation'
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-12 00:36:34,477 [ scc.merge] INFO
2024-11-12 00:36:34,477 [ scc.merge] INFO Repository: ome/omero-scripts
2024-11-12 00:36:34,477 [ scc.merge] INFO Excluded PRs:
2024-11-12 00:36:34,477 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-12 00:36:34,478 [ scc.merge] INFO Already up to date.
2024-11-12 00:36:34,478 [ scc.merge] INFO
2024-11-12 00:36:34,478 [ scc.merge] INFO Merged PRs:
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-12 00:36:34,478 [ scc.merge] INFO
2024-11-12 00:36:34,478 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-12 00:36:34,478 [ scc.merge] INFO
2024-11-12 00:36:34,478 [ scc.merge] INFO Repository: ome/omero-web
2024-11-12 00:36:34,478 [ scc.merge] INFO Excluded PRs:
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-11-12 00:36:34,478 [ scc.merge] INFO Already up to date.
2024-11-12 00:36:34,478 [ scc.merge] INFO
2024-11-12 00:36:34,478 [ scc.merge] INFO Merged PRs:
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 590 knabar 'Update changelog'
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 591 jburel 'Action update'
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 592 jburel 'Replace pkg_resources'
2024-11-12 00:36:34,478 [ scc.merge] INFO - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-12 00:36:34,478 [ scc.merge] INFO
2024-11-12 00:36:34,478 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-12 00:36:34,479 [ scc.git] DEBUG Calling 'git remote'
2024-11-12 00:36:34,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-12 00:36:34,482 [ scc.git] DEBUG Calling 'git remote'
2024-11-12 00:36:34,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:36:34,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-12 00:36:34,486 [ scc.git] DEBUG Calling 'git remote'
2024-11-12 00:36:34,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:36:34,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-12 00:36:34,490 [ scc.git] DEBUG Calling 'git remote'
2024-11-12 00:36:34,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:36:34,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-12 00:36:34,495 [ scc.git] DEBUG Calling 'git remote'
2024-11-12 00:36:34,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-12 00:36:34,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-12 00:36:34,499 [ scc.git] DEBUG Calling 'git remote'
2024-11-12 00:36:34,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
Update component versions
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'omero-dropbox'
Entering 'omero-marshal'
Entering 'omero-py'
Entering 'omero-scripts'
Entering 'omero-web'
Entering 'omero-dropbox'
HEAD detached from a4307f4
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from cca4c2f
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 4fd72efa
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from 213bb61ad
nothing to commit, working tree clean
HEAD detached from e849d72
nothing to commit, working tree clean
2024-11-12 00:37:02,135 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/9bac06d9/images/svgs/logo.svg){kind=logo}
