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-13 00:33:47,745 [ scc.config] DEBUG Found github.token
2024-11-13 00:33:47,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-13 00:33:47,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:33:48,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:33:48,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-13 00:33:48,695 [ scc.gh] DEBUG 4323 remaining from 5000 (Reset at 00:11
2024-11-13 00:33:48,696 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-13 00:33:48,699 [ scc.git] DEBUG Check current status
2024-11-13 00:33:48,700 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 00:33:48,703 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-13 00:33:48,703 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-13 00:33:48,738 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-13 00:33:48,741 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-13 00:33:48,744 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-13 00:33:48,748 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-13 00:33:48,751 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-13 00:33:48,754 [ scc.config] DEBUG Found remote.origin.url
2024-11-13 00:33:49,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-13 00:33:49,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-13 00:33:50,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-13 00:33:50,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-13 00:33:50,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-13 00:33:50,835 [ scc.git] DEBUG Resetting...
2024-11-13 00:33:50,835 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-13 00:33:50,841 [ scc.git] DEBUG HEAD is now at e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-13 00:33:50,841 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-13 00:33:50,892 [ scc.git] DEBUG Check current status
2024-11-13 00:33:50,892 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 00:33:50,896 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-13 00:33:50,897 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-13 00:33:50,932 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-13 00:33:50,934 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-13 00:33:50,938 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-13 00:33:50,941 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-13 00:33:50,944 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-13 00:33:50,945 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-13 00:33:50,945 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-13 00:33:50,945 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-13 00:33:50,945 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-13 00:33:50,946 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-13 00:33:50,946 [ scc.repo] DEBUG ## PRs found:
2024-11-13 00:33:51,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-13 00:33:51,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-13 00:33:51,788 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-13 00:33:51,788 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-13 00:33:52,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-13 00:33:52,230 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-13 00:33:52,230 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-13 00:33:52,230 [ scc.repo] DEBUG ## Branches found:
2024-11-13 00:33:52,230 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:33:52,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:33:52,235 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-13 00:33:52,238 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-13 00:33:52,238 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-13 00:33:52,242 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-13 00:33:52,245 [ scc.git] DEBUG Already up to date.
2024-11-13 00:33:52,245 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-13 00:33:52,577 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-13 00:33:52,577 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-13 00:33:52,582 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-13 00:33:52,879 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-13 00:33:52,879 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-13 00:33:52,884 [ scc.git] DEBUG ## Unique users: []
2024-11-13 00:33:52,884 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:33:52,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:33:52,887 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-13 00:33:52,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:33:52,894 [ 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-13 00:33:52,903 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:33:52,904 [ scc.git] DEBUG omero-py | 2 +-
2024-11-13 00:33:52,905 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-13 00:33:53,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:33:53,046 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-13 00:33:53,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:33:53,065 [ 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-13 00:33:53,268 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:33:53,270 [ scc.git] DEBUG omero-web | 2 +-
2024-11-13 00:33:53,270 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-13 00:33:53,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:33:53,435 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-13 00:33:53,549 [ scc.git] DEBUG Submodule path 'omero-py': checked out '4fd72efaa8cdbec9da98e1d28678af16878a86ba'
2024-11-13 00:33:53,924 [ scc.git] DEBUG Submodule path 'omero-web': checked out '213bb61adc23aed4a750f2a83dc94b7efdb22cee'
2024-11-13 00:33:53,924 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:33:53,924 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:33:53,928 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-13 00:33:54,273 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa20ffe6f10> has no local changes
2024-11-13 00:33:54,274 [ 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#230 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/230/)'
2024-11-13 00:33:54,297 [ scc.git] DEBUG [detached HEAD 9990a60] merge master -Dorg -Snone
2024-11-13 00:33:54,297 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-13 00:33:54,297 [ scc.merge] INFO Already up to date.
2024-11-13 00:33:54,297 [ scc.merge] INFO
2024-11-13 00:33:54,297 [ scc.merge] INFO Merged PRs:
2024-11-13 00:33:54,297 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-13 00:33:54,297 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-13 00:33:54,297 [ scc.merge] INFO
2024-11-13 00:33:54,297 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-13 00:33:54,297 [ 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-13 00:33:56,478 [ scc.config] DEBUG Found github.token
2024-11-13 00:33:56,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-13 00:33:56,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:33:57,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:33:57,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-13 00:33:57,435 [ scc.gh] DEBUG 4311 remaining from 5000 (Reset at 00:11
2024-11-13 00:33:57,436 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-13 00:33:57,440 [ scc.git] DEBUG Check current status
2024-11-13 00:33:57,440 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 00:33:57,444 [ scc.git] DEBUG 9990a60 merge master -Dorg -Snone
2024-11-13 00:33:57,444 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-13 00:33:57,482 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-13 00:33:57,484 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-13 00:33:57,488 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-13 00:33:57,492 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-13 00:33:57,509 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-13 00:33:57,513 [ scc.config] DEBUG Found remote.origin.url
2024-11-13 00:33:57,514 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-11-13 00:33:57,515 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-11-13 00:33:57,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-13 00:33:58,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-13 00:33:58,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-13 00:33:59,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-13 00:33:59,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-13 00:33:59,559 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 00:33:59,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-13 00:33:59,607 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-13 00:33:59,613 [ scc.git] DEBUG Check current status
2024-11-13 00:33:59,613 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 00:33:59,617 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-11-13 00:33:59,618 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-13 00:33:59,674 [ scc.config] DEBUG Found remote.origin.url
2024-11-13 00:34:00,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-11-13 00:34:00,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-13 00:34:00,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-13 00:34:01,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-13 00:34:01,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-13 00:34:01,698 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 00:34:01,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:34:01,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-13 00:34:01,738 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-13 00:34:01,743 [ scc.git] DEBUG Check current status
2024-11-13 00:34:01,743 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 00:34:01,748 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-11-13 00:34:01,748 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-13 00:34:01,793 [ scc.config] DEBUG Found remote.origin.url
2024-11-13 00:34:02,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-11-13 00:34:02,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-13 00:34:03,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-13 00:34:03,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-13 00:34:03,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-13 00:34:03,876 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 00:34:03,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:34:03,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-13 00:34:03,917 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-13 00:34:03,922 [ scc.git] DEBUG Check current status
2024-11-13 00:34:03,922 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 00:34:03,926 [ scc.git] DEBUG 4fd72efa Bump version: 5.19.5 → 5.19.6.dev0
2024-11-13 00:34:03,926 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-13 00:34:03,964 [ scc.config] DEBUG Found remote.origin.url
2024-11-13 00:34:04,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-11-13 00:34:04,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-13 00:34:05,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-13 00:34:05,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-13 00:34:05,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-13 00:34:05,985 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 00:34:06,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:34:06,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-13 00:34:06,025 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-13 00:34:06,029 [ scc.git] DEBUG Check current status
2024-11-13 00:34:06,029 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 00:34:06,033 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-13 00:34:06,034 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-13 00:34:06,077 [ scc.config] DEBUG Found remote.origin.url
2024-11-13 00:34:06,077 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-11-13 00:34:06,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-11-13 00:34:06,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-13 00:34:07,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-13 00:34:07,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-13 00:34:08,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-13 00:34:08,111 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 00:34:08,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:34:08,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-13 00:34:08,147 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-13 00:34:08,151 [ scc.git] DEBUG Check current status
2024-11-13 00:34:08,151 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 00:34:08,154 [ scc.git] DEBUG 213bb61ad Merge pull request #580 from sbesson/obj_id_mask_no_match
2024-11-13 00:34:08,155 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-13 00:34:08,194 [ scc.config] DEBUG Found remote.origin.url
2024-11-13 00:34:08,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-11-13 00:34:09,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-13 00:34:09,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-13 00:34:09,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-13 00:34:10,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-13 00:34:10,250 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 00:34:10,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:34:10,291 [ scc.git] DEBUG Resetting...
2024-11-13 00:34:10,291 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-13 00:34:10,297 [ scc.git] DEBUG HEAD is now at 9990a60 merge master -Dorg -Snone
2024-11-13 00:34:10,298 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-13 00:34:10,351 [ scc.git] DEBUG Check current status
2024-11-13 00:34:10,352 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 00:34:10,357 [ scc.git] DEBUG 9990a60 merge master -Dorg -Snone
2024-11-13 00:34:10,357 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-13 00:34:10,400 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-13 00:34:10,403 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-13 00:34:10,407 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-13 00:34:10,411 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-13 00:34:10,415 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-13 00:34:10,416 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-13 00:34:10,416 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-13 00:34:10,416 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-13 00:34:10,416 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-13 00:34:10,416 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-13 00:34:10,417 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-11-13 00:34:10,417 [ scc.repo] DEBUG ## PRs found:
2024-11-13 00:34:10,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-13 00:34:11,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-13 00:34:11,197 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-13 00:34:11,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-13 00:34:12,181 [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-13 00:34:12,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-13 00:34:13,010 [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-13 00:34:13,011 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-13 00:34:13,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-13 00:34:13,453 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-13 00:34:13,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-13 00:34:14,450 [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-13 00:34:14,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-13 00:34:15,371 [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-13 00:34:15,372 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-13 00:34:15,372 [ scc.repo] DEBUG ## Branches found:
2024-11-13 00:34:15,372 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:34:15,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:15,377 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-13 00:34:15,381 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-13 00:34:15,381 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-13 00:34:15,385 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-13 00:34:15,389 [ scc.git] DEBUG Already up to date.
2024-11-13 00:34:15,389 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-13 00:34:15,705 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-13 00:34:15,705 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-13 00:34:15,711 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-13 00:34:16,003 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-13 00:34:16,004 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-13 00:34:16,009 [ scc.git] DEBUG ## Unique users: []
2024-11-13 00:34:16,009 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:34:16,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:16,013 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-13 00:34:16,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:16,021 [ 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-13 00:34:16,025 [ scc.git] DEBUG Already up to date.
2024-11-13 00:34:16,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:34:16,161 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-13 00:34:16,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:16,169 [ 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-13 00:34:16,173 [ scc.git] DEBUG Already up to date.
2024-11-13 00:34:16,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:34:16,548 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-13 00:34:16,587 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:34:16,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:16,591 [ scc.repo] DEBUG ## PRs found:
2024-11-13 00:34:17,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-11-13 00:34:17,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-11-13 00:34:18,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-11-13 00:34:18,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-13 00:34:18,971 [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-13 00:34:19,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-13 00:34:19,815 [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-13 00:34:19,815 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-13 00:34:19,815 [ scc.repo] DEBUG ## Branches found:
2024-11-13 00:34:19,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-13 00:34:19,816 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:34:19,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:19,821 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-13 00:34:19,825 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-13 00:34:19,825 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-13 00:34:19,830 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-13 00:34:19,835 [ scc.git] DEBUG Already up to date.
2024-11-13 00:34:19,835 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-11-13 00:34:20,152 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-11-13 00:34:20,152 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-11-13 00:34:20,157 [ scc.git] DEBUG ## Unique users: []
2024-11-13 00:34:20,157 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:34:20,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:20,162 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-11-13 00:34:20,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:20,171 [ 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-13 00:34:20,252 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-11-13 00:34:20,252 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-11-13 00:34:20,252 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-11-13 00:34:20,252 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-11-13 00:34:20,252 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-11-13 00:34:20,252 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-11-13 00:34:20,252 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-11-13 00:34:20,252 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-11-13 00:34:20,252 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-11-13 00:34:20,252 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:34:20,256 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-11-13 00:34:20,256 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-11-13 00:34:20,256 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-11-13 00:34:20,256 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-11-13 00:34:20,256 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-11-13 00:34:20,256 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-11-13 00:34:20,256 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-11-13 00:34:20,256 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-11-13 00:34:20,256 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-11-13 00:34:20,256 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-11-13 00:34:20,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:34:20,386 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-13 00:34:20,421 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:34:20,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:20,425 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 00:34:20,458 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-13 00:34:20,463 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe27377df40> has no local changes
2024-11-13 00:34:20,463 [ 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#230 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/230/)'
2024-11-13 00:34:20,471 [ scc.git] DEBUG [detached HEAD 93dd17a] merge master -Dorg -Ssuccess-only
2024-11-13 00:34:20,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:34:20,471 [ scc.repo] DEBUG ## PRs found:
2024-11-13 00:34:20,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-11-13 00:34:21,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-11-13 00:34:21,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-11-13 00:34:22,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-13 00:34:22,909 [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-13 00:34:23,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-13 00:34:23,792 [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-13 00:34:23,792 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-13 00:34:24,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-11-13 00:34:24,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-11-13 00:34:25,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-11-13 00:34:25,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-11-13 00:34:25,610 [ scc.repo] DEBUG ## Branches found:
2024-11-13 00:34:25,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-13 00:34:25,610 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:34:25,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:25,615 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-13 00:34:25,619 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-13 00:34:25,619 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-13 00:34:25,624 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-13 00:34:25,628 [ scc.git] DEBUG Already up to date.
2024-11-13 00:34:25,628 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-11-13 00:34:25,975 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-11-13 00:34:25,976 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-11-13 00:34:25,980 [ scc.git] DEBUG ## Unique users: []
2024-11-13 00:34:25,980 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:34:25,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:25,985 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-13 00:34:25,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:25,994 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-13 00:34:26,003 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-11-13 00:34:26,004 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:34:26,006 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-11-13 00:34:26,006 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-11-13 00:34:26,007 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-11-13 00:34:26,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:34:26,138 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-13 00:34:26,174 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:34:26,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:34:26,178 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 00:34:26,213 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-13 00:34:26,218 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe273cafcd0> has no local changes
2024-11-13 00:34:26,218 [ 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#230 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/230/)'
2024-11-13 00:34:26,226 [ scc.git] DEBUG [detached HEAD 4a8635e] merge master -Dorg -Ssuccess-only
2024-11-13 00:34:26,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:34:26,226 [ scc.repo] DEBUG ## PRs found:
2024-11-13 00:34:26,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-11-13 00:34:27,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/431 HTTP/1.1" 200 None
2024-11-13 00:34:27,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-13 00:34:28,269 [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-13 00:34:28,692 [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-13 00:34:29,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-13 00:34:29,677 [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-13 00:34:30,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-13 00:34:30,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/status HTTP/1.1" 200 None
2024-11-13 00:34:30,591 [ scc.repo] DEBUG - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-13 00:34:31,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-11-13 00:34:31,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-11-13 00:34:31,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427/comments HTTP/1.1" 200 None
2024-11-13 00:34:31,977 [ scc.repo] DEBUG # ... Include label: include
2024-11-13 00:34:32,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-13 00:34:32,999 [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-13 00:34:33,443 [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-13 00:34:33,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-13 00:34:34,280 [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-13 00:34:34,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-13 00:34:35,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/status HTTP/1.1" 200 None
2024-11-13 00:34:35,121 [ scc.repo] DEBUG - PR 427 Rdornier 'Add fileset folder creation'
2024-11-13 00:34:35,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-11-13 00:34:36,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-11-13 00:34:36,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-13 00:34:37,079 [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-13 00:34:37,591 [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-13 00:34:38,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-13 00:34:38,479 [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-13 00:34:38,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-13 00:34:39,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-11-13 00:34:39,320 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-11-13 00:34:39,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-11-13 00:34:40,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-11-13 00:34:40,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-11-13 00:34:41,202 [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-13 00:34:41,637 [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-13 00:34:42,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-11-13 00:34:42,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-13 00:34:43,151 [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-13 00:34:43,610 [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-13 00:34:44,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-13 00:34:44,512 [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-13 00:34:44,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-13 00:34:45,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-11-13 00:34:45,365 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-11-13 00:34:45,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-11-13 00:34:45,826 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-11-13 00:34:46,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-11-13 00:34:46,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-11-13 00:34:47,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-13 00:34:47,784 [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-13 00:34:48,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-13 00:34:48,609 [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-13 00:34:48,610 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-13 00:34:49,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-11-13 00:34:49,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-11-13 00:34:50,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-13 00:34:50,574 [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-13 00:34:51,040 [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-13 00:34:51,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-13 00:34:52,002 [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-13 00:34:52,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-13 00:34:52,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-11-13 00:34:52,893 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-11-13 00:34:53,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-11-13 00:34:53,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-11-13 00:34:54,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-11-13 00:34:54,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-11-13 00:34:55,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-13 00:34:55,740 [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-13 00:34:56,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-13 00:34:56,634 [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-13 00:34:56,635 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-13 00:34:57,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-11-13 00:34:57,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-13 00:34:58,042 [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-13 00:34:58,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-13 00:34:58,863 [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-13 00:34:58,864 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-13 00:34:59,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-11-13 00:34:59,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-11-13 00:35:00,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-13 00:35:00,827 [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-13 00:35:01,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-13 00:35:01,760 [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-13 00:35:01,761 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-13 00:35:02,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-11-13 00:35:02,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-11-13 00:35:03,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-13 00:35:03,763 [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-13 00:35:04,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-13 00:35:04,702 [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-13 00:35:04,703 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-11-13 00:35:05,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-11-13 00:35:05,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-11-13 00:35:06,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-11-13 00:35:06,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-11-13 00:35:06,544 [ scc.repo] DEBUG ## Branches found:
2024-11-13 00:35:06,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-13 00:35:06,544 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:35:06,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:06,549 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-13 00:35:06,554 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-13 00:35:06,554 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-13 00:35:06,559 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-13 00:35:06,565 [ scc.git] DEBUG Already up to date.
2024-11-13 00:35:06,565 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-11-13 00:35:07,742 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-13 00:35:07,742 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-11-13 00:35:07,747 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-11-13 00:35:08,063 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-13 00:35:08,063 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-11-13 00:35:08,068 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-11-13 00:35:08,357 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-13 00:35:08,357 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-11-13 00:35:08,362 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-11-13 00:35:08,654 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-13 00:35:08,654 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-11-13 00:35:08,659 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-11-13 00:35:09,030 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-13 00:35:09,030 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-11-13 00:35:09,034 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-11-13 00:35:09,325 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-13 00:35:09,325 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-11-13 00:35:09,330 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-11-13 00:35:09,613 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-13 00:35:09,613 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-11-13 00:35:09,618 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-11-13 00:35:10,065 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-13 00:35:10,065 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-11-13 00:35:10,069 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-11-13 00:35:10,834 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-13 00:35:10,835 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-11-13 00:35:10,839 [ scc.git] DEBUG Calling 'git fetch origin pull/431/head'
2024-11-13 00:35:11,319 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-13 00:35:11,319 [ scc.git] DEBUG * branch refs/pull/431/head -> FETCH_HEAD
2024-11-13 00:35:11,324 [ scc.git] DEBUG ## Unique users: []
2024-11-13 00:35:11,324 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:35:11,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:11,328 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-13 00:35:11,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:11,343 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-13 00:35:11,484 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-11-13 00:35:11,484 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-11-13 00:35:11,485 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:35:11,489 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-11-13 00:35:11,489 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-11-13 00:35:11,489 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-11-13 00:35:11,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:35:11,647 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-13 00:35:11,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:11,664 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-13 00:35:11,934 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-13 00:35:11,934 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-11-13 00:35:11,935 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:35:11,942 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-11-13 00:35:11,942 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-11-13 00:35:11,942 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-11-13 00:35:12,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:35:12,079 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-11-13 00:35:12,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:12,094 [ 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-13 00:35:12,126 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-11-13 00:35:12,127 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:35:12,130 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-11-13 00:35:12,130 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-11-13 00:35:12,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:35:12,462 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-11-13 00:35:12,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:12,480 [ 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-13 00:35:12,709 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-11-13 00:35:12,709 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-11-13 00:35:12,710 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:35:12,714 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-11-13 00:35:12,714 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-11-13 00:35:12,714 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-11-13 00:35:12,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:35:12,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-13 00:35:12,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:12,867 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-13 00:35:12,888 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:35:12,891 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-11-13 00:35:12,891 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-11-13 00:35:12,891 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-11-13 00:35:12,891 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-11-13 00:35:12,891 [ scc.git] DEBUG create mode 100644 connect.py
2024-11-13 00:35:13,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:35:13,240 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-11-13 00:35:13,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:13,256 [ 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-13 00:35:13,284 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-11-13 00:35:13,286 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:35:13,289 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-11-13 00:35:13,289 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-11-13 00:35:13,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:35:13,644 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-11-13 00:35:13,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:13,661 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-11-13 00:35:13,742 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-11-13 00:35:13,744 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:35:13,748 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-11-13 00:35:13,748 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-11-13 00:35:14,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:35:14,025 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-13 00:35:14,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:14,042 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-13 00:35:14,276 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-13 00:35:14,277 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:35:14,284 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-11-13 00:35:14,284 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-11-13 00:35:14,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:35:14,416 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-13 00:35:14,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:14,437 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Add fileset folder creation) ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-13 00:35:14,475 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:35:14,478 [ scc.git] DEBUG .gitignore | 1 +
2024-11-13 00:35:14,478 [ scc.git] DEBUG src/omero/plugins/download.py | 17 ++++++++++++-----
2024-11-13 00:35:14,478 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 5 deletions(-)
2024-11-13 00:35:14,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:35:14,798 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0e500ec05bf9227b66b28a480b40e0936241d953'
2024-11-13 00:35:14,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:14,815 [ 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-13 00:35:14,835 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:35:14,838 [ scc.git] DEBUG src/omero/hdfstorageV2.py | 1 +
2024-11-13 00:35:14,838 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2024-11-13 00:35:15,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:35:15,189 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-13 00:35:15,230 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:35:15,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:15,235 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 00:35:15,276 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-13 00:35:15,286 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe272743eb0> has no local changes
2024-11-13 00:35:15,286 [ 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#230 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/230/)'
2024-11-13 00:35:15,295 [ scc.git] DEBUG [detached HEAD b9bd4807] merge master -Dorg -Ssuccess-only
2024-11-13 00:35:15,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:35:15,295 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-13 00:35:15,295 [ scc.repo] DEBUG ## PRs found:
2024-11-13 00:35:15,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-13 00:35:16,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-13 00:35:16,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-13 00:35:17,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-13 00:35:17,708 [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-13 00:35:18,184 [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-13 00:35:18,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-13 00:35:19,079 [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-13 00:35:19,080 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-13 00:35:19,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-13 00:35:20,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-13 00:35:20,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-13 00:35:21,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-13 00:35:21,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-13 00:35:21,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-13 00:35:22,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-13 00:35:22,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-13 00:35:23,355 [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-13 00:35:23,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-13 00:35:24,253 [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-13 00:35:24,254 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-13 00:35:24,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-13 00:35:25,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-13 00:35:25,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-13 00:35:26,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-13 00:35:26,157 [ scc.repo] DEBUG ## Branches found:
2024-11-13 00:35:26,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-13 00:35:26,157 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:35:26,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:26,163 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-13 00:35:26,167 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-13 00:35:26,167 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-13 00:35:26,172 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-13 00:35:26,177 [ scc.git] DEBUG Already up to date.
2024-11-13 00:35:26,177 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-13 00:35:26,688 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-13 00:35:26,689 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-13 00:35:26,695 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-13 00:35:27,242 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-13 00:35:27,242 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-13 00:35:27,246 [ scc.git] DEBUG ## Unique users: []
2024-11-13 00:35:27,246 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:35:27,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:27,251 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-13 00:35:27,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:27,261 [ 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-13 00:35:27,378 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-13 00:35:27,378 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-13 00:35:27,378 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-13 00:35:27,378 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-13 00:35:27,383 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-13 00:35:27,388 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-13 00:35:27,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:35:27,519 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-13 00:35:27,525 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-13 00:35:27,531 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#230](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/230/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/230/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-13 00:35:27,535 [ scc.config] DEBUG Found github.token
2024-11-13 00:35:27,535 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-13 00:35:27,535 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-13 00:35:27,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:27,543 [ 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-13 00:35:27,552 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:35:27,554 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-13 00:35:27,554 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-13 00:35:27,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:35:27,901 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-13 00:35:27,941 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:35:27,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:35:27,946 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 00:35:27,985 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-13 00:35:27,990 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe2726e4640> has no local changes
2024-11-13 00:35:27,991 [ 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#230 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/230/)'
2024-11-13 00:35:27,999 [ scc.git] DEBUG [detached HEAD d71360c] merge master -Dorg -Ssuccess-only
2024-11-13 00:35:27,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:35:27,999 [ scc.repo] DEBUG ## PRs found:
2024-11-13 00:35:28,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-11-13 00:35:29,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596 HTTP/1.1" 200 None
2024-11-13 00:35:29,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-11-13 00:35:29,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-13 00:35:30,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-13 00:35:30,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-11-13 00:35:31,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/3aae48f586d7b412538a45b34ddc471a26a286e8?per_page=1 HTTP/1.1" 200 None
2024-11-13 00:35:31,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-11-13 00:35:32,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/status HTTP/1.1" 200 None
2024-11-13 00:35:32,109 [ scc.repo] DEBUG - PR 596 sukunis 'Linkify can parse anchor tag'
2024-11-13 00:35:32,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595 HTTP/1.1" 200 None
2024-11-13 00:35:33,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-11-13 00:35:33,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-13 00:35:34,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-13 00:35:34,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-11-13 00:35:35,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/30278b64bb39134a3f1101b600d4a82256e6eaeb?per_page=1 HTTP/1.1" 200 None
2024-11-13 00:35:35,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-11-13 00:35:35,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/status HTTP/1.1" 200 None
2024-11-13 00:35:35,968 [ scc.repo] DEBUG - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2024-11-13 00:35:36,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/594 HTTP/1.1" 200 None
2024-11-13 00:35:36,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-13 00:35:37,447 [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-13 00:35:37,877 [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-13 00:35:38,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-13 00:35:38,790 [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-13 00:35:39,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-13 00:35:39,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6/status HTTP/1.1" 200 None
2024-11-13 00:35:39,639 [ scc.repo] DEBUG - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-13 00:35:40,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/592 HTTP/1.1" 200 None
2024-11-13 00:35:40,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-13 00:35:41,169 [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-13 00:35:41,827 [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-13 00:35:42,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-13 00:35:42,665 [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-13 00:35:43,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-13 00:35:43,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c/status HTTP/1.1" 200 None
2024-11-13 00:35:43,512 [ scc.repo] DEBUG - PR 592 jburel 'Replace pkg_resources'
2024-11-13 00:35:43,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/591 HTTP/1.1" 200 None
2024-11-13 00:35:44,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-13 00:35:44,951 [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-13 00:35:45,413 [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-13 00:35:45,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-13 00:35:46,310 [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-13 00:35:46,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-13 00:35:47,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe/status HTTP/1.1" 200 None
2024-11-13 00:35:47,178 [ scc.repo] DEBUG - PR 591 jburel 'Action update'
2024-11-13 00:35:47,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/590 HTTP/1.1" 200 None
2024-11-13 00:35:48,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-13 00:35:48,620 [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-13 00:35:49,137 [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-13 00:35:49,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-13 00:35:49,950 [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-13 00:35:50,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-13 00:35:50,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763/status HTTP/1.1" 200 None
2024-11-13 00:35:50,831 [ scc.repo] DEBUG - PR 590 knabar 'Update changelog'
2024-11-13 00:35:51,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/585 HTTP/1.1" 200 None
2024-11-13 00:35:51,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583 HTTP/1.1" 200 None
2024-11-13 00:35:52,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583/comments HTTP/1.1" 200 None
2024-11-13 00:35:52,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-13 00:35:53,262 [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-13 00:35:53,709 [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-13 00:35:54,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-13 00:35:54,658 [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-13 00:35:55,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-13 00:35:55,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd/status HTTP/1.1" 200 None
2024-11-13 00:35:55,511 [ scc.repo] DEBUG - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-13 00:35:55,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581 HTTP/1.1" 200 None
2024-11-13 00:35:56,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581/comments HTTP/1.1" 200 None
2024-11-13 00:35:56,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-11-13 00:35:57,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-11-13 00:35:57,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-11-13 00:35:58,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-11-13 00:35:58,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-13 00:35:59,268 [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-13 00:35:59,749 [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-13 00:36:00,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-13 00:36:00,664 [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-13 00:36:01,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-13 00:36:01,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-11-13 00:36:01,509 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-13 00:36:01,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-11-13 00:36:02,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-11-13 00:36:02,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-13 00:36:03,406 [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-13 00:36:03,891 [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-13 00:36:04,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-13 00:36:04,737 [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-13 00:36:05,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-13 00:36:05,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-11-13 00:36:05,685 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-13 00:36:06,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-11-13 00:36:06,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-11-13 00:36:07,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-11-13 00:36:07,585 [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-13 00:36:08,026 [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-13 00:36:08,028 [ scc.repo] DEBUG ## Branches found:
2024-11-13 00:36:08,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-13 00:36:08,028 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:36:08,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:36:08,033 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-13 00:36:08,037 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-13 00:36:08,038 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-13 00:36:08,042 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-13 00:36:08,046 [ scc.git] DEBUG Already up to date.
2024-11-13 00:36:08,047 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-11-13 00:36:09,746 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-13 00:36:09,746 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-11-13 00:36:09,751 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-11-13 00:36:10,064 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-13 00:36:10,064 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-11-13 00:36:10,071 [ scc.git] DEBUG Calling 'git fetch origin pull/583/head'
2024-11-13 00:36:10,572 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-13 00:36:10,573 [ scc.git] DEBUG * branch refs/pull/583/head -> FETCH_HEAD
2024-11-13 00:36:10,578 [ scc.git] DEBUG Calling 'git fetch origin pull/590/head'
2024-11-13 00:36:10,891 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-13 00:36:10,891 [ scc.git] DEBUG * branch refs/pull/590/head -> FETCH_HEAD
2024-11-13 00:36:10,896 [ scc.git] DEBUG Calling 'git fetch origin pull/591/head'
2024-11-13 00:36:11,398 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-13 00:36:11,398 [ scc.git] DEBUG * branch refs/pull/591/head -> FETCH_HEAD
2024-11-13 00:36:11,405 [ scc.git] DEBUG Calling 'git fetch origin pull/592/head'
2024-11-13 00:36:11,748 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-13 00:36:11,748 [ scc.git] DEBUG * branch refs/pull/592/head -> FETCH_HEAD
2024-11-13 00:36:11,754 [ scc.git] DEBUG Calling 'git fetch origin pull/594/head'
2024-11-13 00:36:12,257 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-13 00:36:12,257 [ scc.git] DEBUG * branch refs/pull/594/head -> FETCH_HEAD
2024-11-13 00:36:12,262 [ scc.git] DEBUG Calling 'git fetch origin pull/595/head'
2024-11-13 00:36:12,667 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-13 00:36:12,667 [ scc.git] DEBUG * branch refs/pull/595/head -> FETCH_HEAD
2024-11-13 00:36:12,670 [ scc.git] DEBUG Calling 'git fetch origin pull/596/head'
2024-11-13 00:36:13,106 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-13 00:36:13,106 [ scc.git] DEBUG * branch refs/pull/596/head -> FETCH_HEAD
2024-11-13 00:36:13,109 [ scc.git] DEBUG ## Unique users: []
2024-11-13 00:36:13,109 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:36:13,109 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:36:13,113 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-11-13 00:36:13,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:36:13,126 [ 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-13 00:36:13,273 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-11-13 00:36:13,273 [ scc.git] DEBUG Auto-merging setup.py
2024-11-13 00:36:13,275 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:36:13,279 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-11-13 00:36:13,280 [ scc.git] DEBUG setup.py | 1 +
2024-11-13 00:36:13,280 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-11-13 00:36:13,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:13,415 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-11-13 00:36:13,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:36:13,427 [ 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-13 00:36:13,518 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-11-13 00:36:13,518 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-11-13 00:36:13,519 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:36:13,523 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-11-13 00:36:13,523 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-11-13 00:36:13,523 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-11-13 00:36:13,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:13,807 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dd2879608e047a7d71a648a23e6955ce591950fd'
2024-11-13 00:36:13,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:36:13,818 [ 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-13 00:36:13,847 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:36:13,850 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_content.html | 8 ++++++--
2024-11-13 00:36:13,850 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_dropdown2.html | 2 --
2024-11-13 00:36:13,850 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-13 00:36:14,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:14,198 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6cbcfa80ce4970cc57fddb99d1be440491982763'
2024-11-13 00:36:14,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:36:14,210 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 590 (Update changelog) 6cbcfa80ce4970cc57fddb99d1be440491982763'
2024-11-13 00:36:14,230 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:36:14,233 [ scc.git] DEBUG CHANGELOG.md | 16 ++++++++++++++++
2024-11-13 00:36:14,233 [ scc.git] DEBUG 1 file changed, 16 insertions(+)
2024-11-13 00:36:14,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:14,585 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-13 00:36:14,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:36:14,599 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 591 (Action update) 8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-13 00:36:14,618 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:36:14,621 [ scc.git] DEBUG .github/workflows/codeql-analysis.yml | 2 +-
2024-11-13 00:36:14,621 [ scc.git] DEBUG .github/workflows/install.yml | 4 ++--
2024-11-13 00:36:14,621 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-11-13 00:36:14,621 [ scc.git] DEBUG .github/workflows/tox.yml | 4 ++--
2024-11-13 00:36:14,621 [ scc.git] DEBUG .gitignore | 1 +
2024-11-13 00:36:14,621 [ scc.git] DEBUG 5 files changed, 9 insertions(+), 8 deletions(-)
2024-11-13 00:36:14,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:14,975 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...721002a9ad481311a44d093e26641344492e149c'
2024-11-13 00:36:14,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:36:14,988 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 592 (Replace pkg_resources) 721002a9ad481311a44d093e26641344492e149c'
2024-11-13 00:36:15,005 [ scc.git] DEBUG Auto-merging setup.py
2024-11-13 00:36:15,006 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:36:15,010 [ scc.git] DEBUG omero/plugins/web.py | 6 +++---
2024-11-13 00:36:15,010 [ scc.git] DEBUG setup.py | 3 ++-
2024-11-13 00:36:15,010 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 4 deletions(-)
2024-11-13 00:36:15,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:15,360 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6bba7f773bb6c4217607439f9adab8814bcd0ac6'
2024-11-13 00:36:15,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:36:15,372 [ 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-13 00:36:15,390 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:36:15,393 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/omero_table.html | 5 +++--
2024-11-13 00:36:15,393 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-11-13 00:36:15,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:15,748 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...30278b64bb39134a3f1101b600d4a82256e6eaeb'
2024-11-13 00:36:15,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:36:15,760 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 595 (linkify supports urls that include {}[] characters) 30278b64bb39134a3f1101b600d4a82256e6eaeb'
2024-11-13 00:36:15,778 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:36:15,781 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.webclient.actions.js | 2 +-
2024-11-13 00:36:15,781 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-13 00:36:16,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:16,128 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3aae48f586d7b412538a45b34ddc471a26a286e8'
2024-11-13 00:36:16,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:36:16,141 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 596 (Linkify can parse anchor tag) 3aae48f586d7b412538a45b34ddc471a26a286e8'
2024-11-13 00:36:16,160 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 00:36:16,163 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 26 ++++++++++++++++++++--
2024-11-13 00:36:16,163 [ scc.git] DEBUG 1 file changed, 24 insertions(+), 2 deletions(-)
2024-11-13 00:36:16,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:16,522 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-13 00:36:16,562 [ scc.git] DEBUG Get sha1 of %s
2024-11-13 00:36:16,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 00:36:16,566 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 00:36:16,605 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-13 00:36:16,616 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe2726f3b80> has no local changes
2024-11-13 00:36:16,617 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
- PR 590 knabar 'Update changelog'
- PR 591 jburel 'Action update'
- PR 592 jburel 'Replace pkg_resources'
- PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
- PR 595 sukunis 'linkify supports urls that include {}[] characters'
- PR 596 sukunis 'Linkify can parse anchor tag'
Generated by OMERO-python-superbuild-push#230 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/230/)'
2024-11-13 00:36:16,629 [ scc.git] DEBUG [detached HEAD 19ce93e5f] merge master -Dorg -Ssuccess-only
2024-11-13 00:36:16,629 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:36:16,630 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 00:36:16,680 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-11-13 00:36:16,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:16,917 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-11-13 00:36:17,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:17,300 [ scc.config] DEBUG Found submodule.omero-py.url
2024-11-13 00:36:17,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:17,688 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-11-13 00:36:18,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:18,088 [ scc.config] DEBUG Found submodule.omero-web.url
2024-11-13 00:36:18,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 00:36:18,472 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-13 00:36:18,501 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe275af2f10> has local changes
2024-11-13 00:36:18,502 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
- PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
- PR 427 Rdornier 'Add fileset folder creation'
- PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
- PR 590 knabar 'Update changelog'
- PR 591 jburel 'Action update'
- PR 592 jburel 'Replace pkg_resources'
- PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
- PR 595 sukunis 'linkify supports urls that include {}[] characters'
- PR 596 sukunis 'Linkify can parse anchor tag'
Generated by OMERO-python-superbuild-push#230 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/230/)'
2024-11-13 00:36:18,511 [ scc.git] DEBUG [detached HEAD b969a1e] merge master -Dorg -Ssuccess-only
2024-11-13 00:36:18,512 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-13 00:36:18,512 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-11-13 00:36:18,512 [ scc.merge] INFO Already up to date.
2024-11-13 00:36:18,512 [ scc.merge] INFO
2024-11-13 00:36:18,512 [ scc.merge] INFO Merged PRs:
2024-11-13 00:36:18,512 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-13 00:36:18,512 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-13 00:36:18,512 [ scc.merge] INFO
2024-11-13 00:36:18,512 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-11-13 00:36:18,512 [ scc.merge] INFO Already up to date.
2024-11-13 00:36:18,512 [ scc.merge] INFO
2024-11-13 00:36:18,512 [ scc.merge] INFO Merged PRs:
2024-11-13 00:36:18,512 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-13 00:36:18,512 [ scc.merge] INFO
2024-11-13 00:36:18,512 [ scc.merge] INFO Repository: ome/omero-marshal
2024-11-13 00:36:18,512 [ scc.merge] INFO Excluded PRs:
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-11-13 00:36:18,513 [ scc.merge] INFO Already up to date.
2024-11-13 00:36:18,513 [ scc.merge] INFO
2024-11-13 00:36:18,513 [ scc.merge] INFO Merged PRs:
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-13 00:36:18,513 [ scc.merge] INFO
2024-11-13 00:36:18,513 [ scc.merge] INFO Repository: ome/omero-py
2024-11-13 00:36:18,513 [ scc.merge] INFO Excluded PRs:
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-11-13 00:36:18,513 [ scc.merge] INFO Already up to date.
2024-11-13 00:36:18,513 [ scc.merge] INFO
2024-11-13 00:36:18,513 [ scc.merge] INFO Merged PRs:
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation'
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-13 00:36:18,513 [ scc.merge] INFO
2024-11-13 00:36:18,513 [ scc.merge] INFO Repository: ome/omero-scripts
2024-11-13 00:36:18,513 [ scc.merge] INFO Excluded PRs:
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-13 00:36:18,513 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-13 00:36:18,513 [ scc.merge] INFO Already up to date.
2024-11-13 00:36:18,514 [ scc.merge] INFO
2024-11-13 00:36:18,514 [ scc.merge] INFO Merged PRs:
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-13 00:36:18,514 [ scc.merge] INFO
2024-11-13 00:36:18,514 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-13 00:36:18,514 [ scc.merge] INFO
2024-11-13 00:36:18,514 [ scc.merge] INFO Repository: ome/omero-web
2024-11-13 00:36:18,514 [ scc.merge] INFO Excluded PRs:
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-11-13 00:36:18,514 [ scc.merge] INFO Already up to date.
2024-11-13 00:36:18,514 [ scc.merge] INFO
2024-11-13 00:36:18,514 [ scc.merge] INFO Merged PRs:
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 590 knabar 'Update changelog'
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 591 jburel 'Action update'
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 592 jburel 'Replace pkg_resources'
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2024-11-13 00:36:18,514 [ scc.merge] INFO - PR 596 sukunis 'Linkify can parse anchor tag'
2024-11-13 00:36:18,514 [ scc.merge] INFO
2024-11-13 00:36:18,514 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-13 00:36:18,514 [ scc.git] DEBUG Calling 'git remote'
2024-11-13 00:36:18,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-13 00:36:18,519 [ scc.git] DEBUG Calling 'git remote'
2024-11-13 00:36:18,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:36:18,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-13 00:36:18,523 [ scc.git] DEBUG Calling 'git remote'
2024-11-13 00:36:18,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:36:18,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-13 00:36:18,527 [ scc.git] DEBUG Calling 'git remote'
2024-11-13 00:36:18,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:36:18,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-13 00:36:18,530 [ scc.git] DEBUG Calling 'git remote'
2024-11-13 00:36:18,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-13 00:36:18,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-13 00:36:18,534 [ scc.git] DEBUG Calling 'git remote'
2024-11-13 00:36:18,537 [ 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-13 00:36:45,937 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
