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-17 00:34:46,510 [ scc.config] DEBUG Found github.token
2024-11-17 00:34:46,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-17 00:34:46,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:34:47,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:34:47,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-17 00:34:47,486 [ scc.gh] DEBUG 4341 remaining from 5000 (Reset at 00:11
2024-11-17 00:34:47,486 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-17 00:34:47,491 [ scc.git] DEBUG Check current status
2024-11-17 00:34:47,491 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-17 00:34:47,495 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-17 00:34:47,495 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-17 00:34:47,532 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-17 00:34:47,535 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-17 00:34:47,538 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-17 00:34:47,542 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-17 00:34:47,545 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-17 00:34:47,549 [ scc.config] DEBUG Found remote.origin.url
2024-11-17 00:34:47,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-17 00:34:48,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-17 00:34:48,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-17 00:34:49,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-17 00:34:49,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-17 00:34:49,609 [ scc.git] DEBUG Resetting...
2024-11-17 00:34:49,609 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-17 00:34:49,615 [ scc.git] DEBUG HEAD is now at e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-17 00:34:49,615 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-17 00:34:49,665 [ scc.git] DEBUG Check current status
2024-11-17 00:34:49,665 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-17 00:34:49,669 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-11-17 00:34:49,669 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-17 00:34:49,708 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-17 00:34:49,711 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-17 00:34:49,715 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-11-17 00:34:49,718 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-17 00:34:49,722 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-11-17 00:34:49,723 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-17 00:34:49,723 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-17 00:34:49,723 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-17 00:34:49,723 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-17 00:34:49,723 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-17 00:34:49,723 [ scc.repo] DEBUG ## PRs found:
2024-11-17 00:34:50,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-17 00:34:50,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-17 00:34:50,540 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-17 00:34:50,540 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-17 00:34:51,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-17 00:34:51,016 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-17 00:34:51,017 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-17 00:34:51,017 [ scc.repo] DEBUG ## Branches found:
2024-11-17 00:34:51,017 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:34:51,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:34:51,022 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-17 00:34:51,026 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-17 00:34:51,026 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-17 00:34:51,030 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-17 00:34:51,034 [ scc.git] DEBUG Already up to date.
2024-11-17 00:34:51,035 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-17 00:34:51,350 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-17 00:34:51,350 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-17 00:34:51,355 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-17 00:34:51,634 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-17 00:34:51,634 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-17 00:34:51,640 [ scc.git] DEBUG ## Unique users: []
2024-11-17 00:34:51,640 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:34:51,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:34:51,645 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-17 00:34:51,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:34:51,651 [ 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-17 00:34:51,695 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:34:51,697 [ scc.git] DEBUG omero-py | 2 +-
2024-11-17 00:34:51,697 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-17 00:34:51,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:34:51,841 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-17 00:34:51,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:34:51,849 [ 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-17 00:34:51,859 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:34:51,861 [ scc.git] DEBUG omero-web | 2 +-
2024-11-17 00:34:51,861 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-17 00:34:52,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:34:52,224 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-17 00:34:52,280 [ scc.git] DEBUG Submodule path 'omero-py': checked out '4fd72efaa8cdbec9da98e1d28678af16878a86ba'
2024-11-17 00:34:52,429 [ scc.git] DEBUG Submodule path 'omero-web': checked out '213bb61adc23aed4a750f2a83dc94b7efdb22cee'
2024-11-17 00:34:52,430 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:34:52,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:34:52,435 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-17 00:34:52,800 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdf1e2ce0a0> has no local changes
2024-11-17 00:34:52,801 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/235/)'
2024-11-17 00:34:52,833 [ scc.git] DEBUG [detached HEAD 717cc05] merge master -Dorg -Snone
2024-11-17 00:34:52,833 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-17 00:34:52,833 [ scc.merge] INFO Already up to date.
2024-11-17 00:34:52,833 [ scc.merge] INFO
2024-11-17 00:34:52,833 [ scc.merge] INFO Merged PRs:
2024-11-17 00:34:52,833 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-17 00:34:52,833 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-17 00:34:52,833 [ scc.merge] INFO
2024-11-17 00:34:52,833 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-17 00:34:52,833 [ 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-17 00:34:54,931 [ scc.config] DEBUG Found github.token
2024-11-17 00:34:54,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-17 00:34:55,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:34:55,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:34:55,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-17 00:34:55,943 [ scc.gh] DEBUG 4329 remaining from 5000 (Reset at 00:11
2024-11-17 00:34:55,944 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-17 00:34:55,948 [ scc.git] DEBUG Check current status
2024-11-17 00:34:55,948 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-17 00:34:55,952 [ scc.git] DEBUG 717cc05 merge master -Dorg -Snone
2024-11-17 00:34:55,952 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-17 00:34:55,990 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-17 00:34:55,993 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-17 00:34:55,996 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-17 00:34:56,001 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-17 00:34:56,005 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-17 00:34:56,010 [ scc.config] DEBUG Found remote.origin.url
2024-11-17 00:34:56,010 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-11-17 00:34:56,011 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-11-17 00:34:56,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-17 00:34:56,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-17 00:34:57,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-17 00:34:57,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-17 00:34:58,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-17 00:34:58,154 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-17 00:34:58,199 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-17 00:34:58,199 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-17 00:34:58,203 [ scc.git] DEBUG Check current status
2024-11-17 00:34:58,203 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-17 00:34:58,206 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-11-17 00:34:58,206 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-17 00:34:58,249 [ scc.config] DEBUG Found remote.origin.url
2024-11-17 00:34:58,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-11-17 00:34:59,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-17 00:34:59,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-17 00:34:59,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-17 00:35:00,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-17 00:35:00,342 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-17 00:35:00,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:35:00,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-17 00:35:00,384 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-17 00:35:00,388 [ scc.git] DEBUG Check current status
2024-11-17 00:35:00,388 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-17 00:35:00,392 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-11-17 00:35:00,393 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-17 00:35:00,435 [ scc.config] DEBUG Found remote.origin.url
2024-11-17 00:35:00,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-11-17 00:35:01,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-17 00:35:01,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-17 00:35:02,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-17 00:35:02,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-17 00:35:02,480 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-17 00:35:02,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:35:02,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-17 00:35:02,523 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-17 00:35:02,527 [ scc.git] DEBUG Check current status
2024-11-17 00:35:02,527 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-17 00:35:02,565 [ scc.git] DEBUG 4fd72efa Bump version: 5.19.5 → 5.19.6.dev0
2024-11-17 00:35:02,566 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-17 00:35:02,612 [ scc.config] DEBUG Found remote.origin.url
2024-11-17 00:35:02,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-11-17 00:35:03,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-17 00:35:03,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-17 00:35:04,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-17 00:35:04,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-17 00:35:04,632 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-17 00:35:04,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:35:04,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-17 00:35:04,672 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-17 00:35:04,676 [ scc.git] DEBUG Check current status
2024-11-17 00:35:04,677 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-17 00:35:04,743 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-17 00:35:04,743 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-17 00:35:04,787 [ scc.config] DEBUG Found remote.origin.url
2024-11-17 00:35:04,787 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-11-17 00:35:05,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-11-17 00:35:05,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-17 00:35:06,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-17 00:35:06,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-17 00:35:06,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-17 00:35:06,931 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-17 00:35:06,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:35:06,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-17 00:35:06,972 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-17 00:35:06,977 [ scc.git] DEBUG Check current status
2024-11-17 00:35:06,977 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-17 00:35:07,044 [ scc.git] DEBUG 213bb61ad Merge pull request #580 from sbesson/obj_id_mask_no_match
2024-11-17 00:35:07,045 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-17 00:35:07,090 [ scc.config] DEBUG Found remote.origin.url
2024-11-17 00:35:07,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-11-17 00:35:07,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-17 00:35:08,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-17 00:35:08,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-17 00:35:09,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-17 00:35:09,087 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-17 00:35:09,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:35:09,128 [ scc.git] DEBUG Resetting...
2024-11-17 00:35:09,129 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-17 00:35:09,134 [ scc.git] DEBUG HEAD is now at 717cc05 merge master -Dorg -Snone
2024-11-17 00:35:09,134 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-17 00:35:09,185 [ scc.git] DEBUG Check current status
2024-11-17 00:35:09,186 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-17 00:35:09,190 [ scc.git] DEBUG 717cc05 merge master -Dorg -Snone
2024-11-17 00:35:09,190 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-17 00:35:09,229 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-11-17 00:35:09,231 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-11-17 00:35:09,235 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-17 00:35:09,239 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-17 00:35:09,242 [ scc.git] DEBUG 213bb61adc23aed4a750f2a83dc94b7efdb22cee omero-web (v5.27.2-7-g213bb61ad)
2024-11-17 00:35:09,243 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-17 00:35:09,243 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-17 00:35:09,243 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-17 00:35:09,243 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-17 00:35:09,243 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-17 00:35:09,243 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-11-17 00:35:09,244 [ scc.repo] DEBUG ## PRs found:
2024-11-17 00:35:09,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-11-17 00:35:10,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/294 HTTP/1.1" 200 None
2024-11-17 00:35:10,083 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-17 00:35:10,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-17 00:35:11,107 [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-17 00:35:11,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/587bd8c5de8d393fbed353cefde81f5bad4ea13a HTTP/1.1" 200 None
2024-11-17 00:35:11,991 [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-17 00:35:11,992 [ scc.repo] DEBUG - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-17 00:35:12,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-11-17 00:35:12,475 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-17 00:35:12,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-17 00:35:13,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-17 00:35:13,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-11-17 00:35:14,393 [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-17 00:35:14,393 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-17 00:35:14,393 [ scc.repo] DEBUG ## Branches found:
2024-11-17 00:35:14,394 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:35:14,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:14,398 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-17 00:35:14,402 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-17 00:35:14,403 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-17 00:35:14,407 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-17 00:35:14,411 [ scc.git] DEBUG Already up to date.
2024-11-17 00:35:14,411 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-11-17 00:35:14,721 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-17 00:35:14,721 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-11-17 00:35:14,726 [ scc.git] DEBUG Calling 'git fetch origin pull/294/head'
2024-11-17 00:35:15,030 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-11-17 00:35:15,030 [ scc.git] DEBUG * branch refs/pull/294/head -> FETCH_HEAD
2024-11-17 00:35:15,035 [ scc.git] DEBUG ## Unique users: []
2024-11-17 00:35:15,035 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:35:15,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:15,040 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-11-17 00:35:15,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:15,047 [ 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-17 00:35:15,051 [ scc.git] DEBUG Already up to date.
2024-11-17 00:35:15,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:35:15,184 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...587bd8c5de8d393fbed353cefde81f5bad4ea13a'
2024-11-17 00:35:15,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:15,195 [ 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-17 00:35:15,200 [ scc.git] DEBUG Already up to date.
2024-11-17 00:35:15,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:35:15,577 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-17 00:35:15,618 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:35:15,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:15,624 [ scc.repo] DEBUG ## PRs found:
2024-11-17 00:35:16,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-11-17 00:35:16,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-11-17 00:35:16,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-11-17 00:35:17,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-17 00:35:17,952 [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-17 00:35:18,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-17 00:35:18,866 [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-17 00:35:18,867 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-17 00:35:18,867 [ scc.repo] DEBUG ## Branches found:
2024-11-17 00:35:18,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-17 00:35:18,867 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:35:18,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:18,872 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-17 00:35:18,878 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-17 00:35:18,879 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-17 00:35:18,885 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-17 00:35:18,890 [ scc.git] DEBUG Already up to date.
2024-11-17 00:35:18,890 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-11-17 00:35:19,211 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-11-17 00:35:19,211 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-11-17 00:35:19,215 [ scc.git] DEBUG ## Unique users: []
2024-11-17 00:35:19,215 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:35:19,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:19,221 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-11-17 00:35:19,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:19,230 [ 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-17 00:35:19,479 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-11-17 00:35:19,479 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-11-17 00:35:19,479 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-11-17 00:35:19,479 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-11-17 00:35:19,479 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-11-17 00:35:19,479 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-11-17 00:35:19,479 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-11-17 00:35:19,479 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-11-17 00:35:19,479 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-11-17 00:35:19,480 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:35:19,484 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-11-17 00:35:19,484 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-11-17 00:35:19,484 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-11-17 00:35:19,484 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-11-17 00:35:19,484 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-11-17 00:35:19,484 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-11-17 00:35:19,484 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-11-17 00:35:19,484 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-11-17 00:35:19,484 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-11-17 00:35:19,484 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-11-17 00:35:19,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:35:19,619 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-17 00:35:19,660 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:35:19,661 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:19,665 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-17 00:35:19,704 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-17 00:35:19,710 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcbef7970d0> has no local changes
2024-11-17 00:35:19,710 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/235/)'
2024-11-17 00:35:19,719 [ scc.git] DEBUG [detached HEAD 2ea242e] merge master -Dorg -Ssuccess-only
2024-11-17 00:35:19,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:35:19,720 [ scc.repo] DEBUG ## PRs found:
2024-11-17 00:35:20,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-11-17 00:35:20,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-11-17 00:35:21,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-11-17 00:35:21,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-17 00:35:22,041 [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-17 00:35:22,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-17 00:35:22,974 [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-17 00:35:22,975 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-17 00:35:23,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-11-17 00:35:23,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-11-17 00:35:24,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-11-17 00:35:24,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-11-17 00:35:24,805 [ scc.repo] DEBUG ## Branches found:
2024-11-17 00:35:24,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-17 00:35:24,806 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:35:24,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:24,811 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-17 00:35:24,816 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-17 00:35:24,816 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-17 00:35:24,822 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-17 00:35:24,827 [ scc.git] DEBUG Already up to date.
2024-11-17 00:35:24,827 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-11-17 00:35:25,262 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-11-17 00:35:25,262 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-11-17 00:35:25,267 [ scc.git] DEBUG ## Unique users: []
2024-11-17 00:35:25,268 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:35:25,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:25,273 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-17 00:35:25,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:25,283 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-17 00:35:25,336 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-11-17 00:35:25,337 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:35:25,340 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-11-17 00:35:25,340 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-11-17 00:35:25,341 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-11-17 00:35:25,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:35:25,476 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-17 00:35:25,518 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:35:25,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:35:25,522 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-17 00:35:25,563 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-17 00:35:25,569 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcbef797d90> has no local changes
2024-11-17 00:35:25,569 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/235/)'
2024-11-17 00:35:25,578 [ scc.git] DEBUG [detached HEAD 4add339] merge master -Dorg -Ssuccess-only
2024-11-17 00:35:25,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:35:25,579 [ scc.repo] DEBUG ## PRs found:
2024-11-17 00:35:26,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-11-17 00:35:26,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/431 HTTP/1.1" 200 None
2024-11-17 00:35:27,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-17 00:35:27,763 [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-17 00:35:28,226 [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-17 00:35:28,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-17 00:35:29,138 [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-17 00:35:29,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-17 00:35:30,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/status HTTP/1.1" 200 None
2024-11-17 00:35:30,027 [ scc.repo] DEBUG - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-17 00:35:30,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-11-17 00:35:30,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-11-17 00:35:31,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427/comments HTTP/1.1" 200 None
2024-11-17 00:35:31,438 [ scc.repo] DEBUG # ... Include label: include
2024-11-17 00:35:31,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-17 00:35:32,402 [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-17 00:35:32,877 [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-17 00:35:33,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-17 00:35:33,775 [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-17 00:35:34,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-17 00:35:34,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/status HTTP/1.1" 200 None
2024-11-17 00:35:34,661 [ scc.repo] DEBUG - PR 427 Rdornier 'Add fileset folder creation'
2024-11-17 00:35:35,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-11-17 00:35:35,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-11-17 00:35:36,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-17 00:35:36,569 [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-17 00:35:37,022 [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-17 00:35:37,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-17 00:35:37,948 [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-17 00:35:38,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-17 00:35:38,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-11-17 00:35:38,882 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-11-17 00:35:39,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-11-17 00:35:39,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-11-17 00:35:40,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-11-17 00:35:40,751 [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-17 00:35:41,186 [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-17 00:35:41,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-11-17 00:35:42,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-17 00:35:42,570 [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-17 00:35:43,019 [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-17 00:35:43,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-17 00:35:43,874 [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-17 00:35:44,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-17 00:35:44,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-11-17 00:35:44,824 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-11-17 00:35:45,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-11-17 00:35:45,304 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-11-17 00:35:45,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-11-17 00:35:46,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-11-17 00:35:46,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-17 00:35:47,209 [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-17 00:35:47,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-17 00:35:48,103 [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-17 00:35:48,104 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-17 00:35:48,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-11-17 00:35:49,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-11-17 00:35:49,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-17 00:35:50,236 [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-17 00:35:50,721 [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-17 00:35:51,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-17 00:35:51,624 [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-17 00:35:52,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-17 00:35:52,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-11-17 00:35:52,469 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-11-17 00:35:52,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-11-17 00:35:53,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-11-17 00:35:53,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-11-17 00:35:54,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-11-17 00:35:54,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-17 00:35:55,295 [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-17 00:35:55,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-17 00:35:56,126 [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-17 00:35:56,127 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-17 00:35:56,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-11-17 00:35:57,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-17 00:35:57,598 [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-17 00:35:58,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-17 00:35:58,490 [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-17 00:35:58,491 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-17 00:35:58,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-11-17 00:35:59,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-11-17 00:36:00,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-17 00:36:00,478 [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-17 00:36:01,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-17 00:36:01,418 [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-17 00:36:01,419 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-17 00:36:01,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-11-17 00:36:02,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-11-17 00:36:02,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-17 00:36:03,246 [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-17 00:36:03,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-17 00:36:04,099 [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-17 00:36:04,100 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-11-17 00:36:04,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-11-17 00:36:04,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-11-17 00:36:05,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-11-17 00:36:06,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-11-17 00:36:06,052 [ scc.repo] DEBUG ## Branches found:
2024-11-17 00:36:06,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-17 00:36:06,053 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:36:06,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:06,058 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-17 00:36:06,063 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-17 00:36:06,063 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-17 00:36:06,068 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-17 00:36:06,073 [ scc.git] DEBUG Already up to date.
2024-11-17 00:36:06,074 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-11-17 00:36:07,794 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-17 00:36:07,795 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-11-17 00:36:07,799 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-11-17 00:36:08,113 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-17 00:36:08,113 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-11-17 00:36:08,118 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-11-17 00:36:08,413 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-17 00:36:08,413 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-11-17 00:36:08,418 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-11-17 00:36:08,702 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-17 00:36:08,703 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-11-17 00:36:08,707 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-11-17 00:36:09,083 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-17 00:36:09,084 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-11-17 00:36:09,088 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-11-17 00:36:09,384 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-17 00:36:09,384 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-11-17 00:36:09,390 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-11-17 00:36:09,676 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-17 00:36:09,676 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-11-17 00:36:09,681 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-11-17 00:36:09,960 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-17 00:36:09,960 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-11-17 00:36:09,965 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-11-17 00:36:10,614 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-17 00:36:10,614 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-11-17 00:36:10,619 [ scc.git] DEBUG Calling 'git fetch origin pull/431/head'
2024-11-17 00:36:10,939 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-17 00:36:10,939 [ scc.git] DEBUG * branch refs/pull/431/head -> FETCH_HEAD
2024-11-17 00:36:10,945 [ scc.git] DEBUG ## Unique users: []
2024-11-17 00:36:10,945 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:36:10,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:10,951 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-17 00:36:10,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:10,971 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-17 00:36:11,276 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-11-17 00:36:11,276 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-11-17 00:36:11,277 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:36:11,281 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-11-17 00:36:11,281 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-11-17 00:36:11,281 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-11-17 00:36:11,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:36:11,419 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-17 00:36:11,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:11,438 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-17 00:36:11,624 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-17 00:36:11,625 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-11-17 00:36:11,626 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:36:11,633 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-11-17 00:36:11,633 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-11-17 00:36:11,633 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-11-17 00:36:11,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:36:11,818 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-11-17 00:36:11,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:11,837 [ 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-17 00:36:11,876 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-11-17 00:36:11,901 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:36:11,904 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-11-17 00:36:11,904 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-11-17 00:36:12,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:36:12,223 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-11-17 00:36:12,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:12,243 [ 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-17 00:36:12,414 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-11-17 00:36:12,414 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-11-17 00:36:12,421 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:36:12,425 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-11-17 00:36:12,425 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-11-17 00:36:12,425 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-11-17 00:36:12,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:36:12,619 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-17 00:36:12,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:12,637 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-17 00:36:12,660 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:36:12,663 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-11-17 00:36:12,663 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-11-17 00:36:12,663 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-11-17 00:36:12,663 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-11-17 00:36:12,663 [ scc.git] DEBUG create mode 100644 connect.py
2024-11-17 00:36:13,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:36:13,022 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-11-17 00:36:13,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:13,039 [ 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-17 00:36:13,101 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-11-17 00:36:13,103 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:36:13,107 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-11-17 00:36:13,107 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-11-17 00:36:13,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:36:13,422 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-11-17 00:36:13,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:13,440 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-11-17 00:36:13,610 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-11-17 00:36:13,611 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:36:13,615 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-11-17 00:36:13,615 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-11-17 00:36:13,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:36:13,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-17 00:36:13,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:13,839 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-17 00:36:14,036 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-17 00:36:14,037 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:36:14,044 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-11-17 00:36:14,044 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-11-17 00:36:14,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:36:14,226 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-17 00:36:14,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:14,243 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Add fileset folder creation) ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-17 00:36:14,361 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:36:14,364 [ scc.git] DEBUG .gitignore | 1 +
2024-11-17 00:36:14,365 [ scc.git] DEBUG src/omero/plugins/download.py | 17 ++++++++++++-----
2024-11-17 00:36:14,365 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 5 deletions(-)
2024-11-17 00:36:14,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:36:14,607 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0e500ec05bf9227b66b28a480b40e0936241d953'
2024-11-17 00:36:14,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:14,626 [ 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-17 00:36:14,654 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:36:14,657 [ scc.git] DEBUG src/omero/hdfstorageV2.py | 1 +
2024-11-17 00:36:14,657 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2024-11-17 00:36:14,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:36:14,991 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-17 00:36:15,035 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:36:15,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:15,040 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-17 00:36:15,080 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-17 00:36:15,088 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcbee6eaf40> has no local changes
2024-11-17 00:36:15,088 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/235/)'
2024-11-17 00:36:15,099 [ scc.git] DEBUG [detached HEAD ca0e9ee1] merge master -Dorg -Ssuccess-only
2024-11-17 00:36:15,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:36:15,100 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-17 00:36:15,100 [ scc.repo] DEBUG ## PRs found:
2024-11-17 00:36:15,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-17 00:36:16,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-17 00:36:16,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-17 00:36:16,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-17 00:36:17,446 [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-17 00:36:17,893 [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-17 00:36:18,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-17 00:36:18,823 [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-17 00:36:18,823 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-17 00:36:19,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-17 00:36:19,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-17 00:36:20,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-17 00:36:20,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-17 00:36:21,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-17 00:36:21,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-17 00:36:22,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-17 00:36:22,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-17 00:36:23,137 [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-17 00:36:23,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-17 00:36:24,056 [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-17 00:36:24,057 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-17 00:36:24,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-17 00:36:25,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-17 00:36:25,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-17 00:36:26,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-17 00:36:26,013 [ scc.repo] DEBUG ## Branches found:
2024-11-17 00:36:26,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-17 00:36:26,014 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:36:26,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:26,019 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-17 00:36:26,023 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-17 00:36:26,023 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-17 00:36:26,029 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-17 00:36:26,034 [ scc.git] DEBUG Already up to date.
2024-11-17 00:36:26,035 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-17 00:36:26,741 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-17 00:36:26,741 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-17 00:36:26,747 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-17 00:36:27,324 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-17 00:36:27,325 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-17 00:36:27,329 [ scc.git] DEBUG ## Unique users: []
2024-11-17 00:36:27,330 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:36:27,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:27,335 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-17 00:36:27,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:27,347 [ 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-17 00:36:27,526 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-17 00:36:27,526 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-17 00:36:27,526 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-17 00:36:27,527 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-17 00:36:27,533 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-17 00:36:27,539 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-17 00:36:27,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:36:27,674 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-17 00:36:27,682 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-17 00:36:27,688 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#235](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/235/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/235/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-17 00:36:27,693 [ scc.config] DEBUG Found github.token
2024-11-17 00:36:27,693 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-17 00:36:27,693 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-17 00:36:27,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:27,706 [ 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-17 00:36:27,766 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:36:27,769 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-17 00:36:27,769 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-17 00:36:28,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:36:28,059 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-17 00:36:28,100 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:36:28,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:36:28,106 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-17 00:36:28,150 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-17 00:36:28,157 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcbef797700> has no local changes
2024-11-17 00:36:28,157 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/235/)'
2024-11-17 00:36:28,166 [ scc.git] DEBUG [detached HEAD c0acd61] merge master -Dorg -Ssuccess-only
2024-11-17 00:36:28,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:36:28,167 [ scc.repo] DEBUG ## PRs found:
2024-11-17 00:36:28,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-11-17 00:36:29,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596 HTTP/1.1" 200 None
2024-11-17 00:36:29,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596/comments HTTP/1.1" 200 None
2024-11-17 00:36:30,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-11-17 00:36:30,528 [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-17 00:36:30,963 [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-17 00:36:31,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-11-17 00:36:31,845 [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-17 00:36:32,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-11-17 00:36:32,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/status HTTP/1.1" 200 None
2024-11-17 00:36:32,777 [ scc.repo] DEBUG - PR 596 sukunis 'Linkify can parse anchor tag'
2024-11-17 00:36:33,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595 HTTP/1.1" 200 None
2024-11-17 00:36:33,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595/comments HTTP/1.1" 200 None
2024-11-17 00:36:34,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-11-17 00:36:34,702 [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-17 00:36:35,149 [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-17 00:36:35,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-11-17 00:36:36,000 [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-17 00:36:36,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-11-17 00:36:36,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/status HTTP/1.1" 200 None
2024-11-17 00:36:36,903 [ scc.repo] DEBUG - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2024-11-17 00:36:37,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/594 HTTP/1.1" 200 None
2024-11-17 00:36:37,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-17 00:36:38,368 [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-17 00:36:38,857 [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-17 00:36:39,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-17 00:36:39,806 [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-17 00:36:40,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6 HTTP/1.1" 200 None
2024-11-17 00:36:40,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba7f773bb6c4217607439f9adab8814bcd0ac6/status HTTP/1.1" 200 None
2024-11-17 00:36:40,741 [ scc.repo] DEBUG - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-17 00:36:41,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/592 HTTP/1.1" 200 None
2024-11-17 00:36:41,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-17 00:36:42,130 [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-17 00:36:42,601 [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-17 00:36:43,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-17 00:36:43,501 [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-17 00:36:43,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c HTTP/1.1" 200 None
2024-11-17 00:36:44,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/721002a9ad481311a44d093e26641344492e149c/status HTTP/1.1" 200 None
2024-11-17 00:36:44,366 [ scc.repo] DEBUG - PR 592 jburel 'Replace pkg_resources'
2024-11-17 00:36:44,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/591 HTTP/1.1" 200 None
2024-11-17 00:36:45,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-17 00:36:45,801 [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-17 00:36:46,294 [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-17 00:36:46,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-17 00:36:47,200 [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-17 00:36:47,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe HTTP/1.1" 200 None
2024-11-17 00:36:48,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8a54f0347e7174a744c4c210d0734effd029acbe/status HTTP/1.1" 200 None
2024-11-17 00:36:48,042 [ scc.repo] DEBUG - PR 591 jburel 'Action update'
2024-11-17 00:36:48,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/590 HTTP/1.1" 200 None
2024-11-17 00:36:49,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-17 00:36:49,505 [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-17 00:36:49,952 [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-17 00:36:50,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-17 00:36:50,867 [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-17 00:36:51,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763 HTTP/1.1" 200 None
2024-11-17 00:36:51,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6cbcfa80ce4970cc57fddb99d1be440491982763/status HTTP/1.1" 200 None
2024-11-17 00:36:51,775 [ scc.repo] DEBUG - PR 590 knabar 'Update changelog'
2024-11-17 00:36:52,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/585 HTTP/1.1" 200 None
2024-11-17 00:36:52,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583 HTTP/1.1" 200 None
2024-11-17 00:36:53,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/583/comments HTTP/1.1" 200 None
2024-11-17 00:36:53,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-17 00:36:54,234 [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-17 00:36:54,700 [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-17 00:36:55,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-17 00:36:55,600 [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-17 00:36:56,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd HTTP/1.1" 200 None
2024-11-17 00:36:56,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/dd2879608e047a7d71a648a23e6955ce591950fd/status HTTP/1.1" 200 None
2024-11-17 00:36:56,440 [ scc.repo] DEBUG - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-17 00:36:56,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581 HTTP/1.1" 200 None
2024-11-17 00:36:57,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581/comments HTTP/1.1" 200 None
2024-11-17 00:36:57,403 [ scc.repo] DEBUG # ... Include label: include
2024-11-17 00:36:57,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/eb4876927522288e0b5fc33a301e500a6f9ee849 HTTP/1.1" 200 None
2024-11-17 00:36:58,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/eb4876927522288e0b5fc33a301e500a6f9ee849/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-17 00:36:58,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/eb4876927522288e0b5fc33a301e500a6f9ee849/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-17 00:36:59,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/eb4876927522288e0b5fc33a301e500a6f9ee849 HTTP/1.1" 200 None
2024-11-17 00:36:59,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/eb4876927522288e0b5fc33a301e500a6f9ee849?per_page=1 HTTP/1.1" 200 None
2024-11-17 00:37:00,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/eb4876927522288e0b5fc33a301e500a6f9ee849 HTTP/1.1" 200 None
2024-11-17 00:37:00,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/eb4876927522288e0b5fc33a301e500a6f9ee849/status HTTP/1.1" 200 None
2024-11-17 00:37:00,637 [ scc.repo] DEBUG - PR 581 Tom-TBT 'Dynamic generation of the LUTs png '
2024-11-17 00:37:01,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-11-17 00:37:01,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-11-17 00:37:02,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-11-17 00:37:02,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-11-17 00:37:02,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-17 00:37:03,452 [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-17 00:37:03,959 [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-17 00:37:04,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-17 00:37:04,861 [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-17 00:37:05,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-17 00:37:05,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-11-17 00:37:05,743 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-17 00:37:06,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-11-17 00:37:06,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-11-17 00:37:07,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-17 00:37:07,657 [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-17 00:37:08,095 [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-17 00:37:08,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-17 00:37:09,031 [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-17 00:37:09,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-17 00:37:09,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-11-17 00:37:09,922 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-17 00:37:10,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-11-17 00:37:11,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-11-17 00:37:11,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-11-17 00:37:11,998 [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-17 00:37:12,476 [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-17 00:37:12,478 [ scc.repo] DEBUG ## Branches found:
2024-11-17 00:37:12,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-17 00:37:12,479 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:37:12,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:12,484 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-17 00:37:12,488 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-17 00:37:12,488 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-17 00:37:12,492 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-17 00:37:12,497 [ scc.git] DEBUG Already up to date.
2024-11-17 00:37:12,497 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-11-17 00:37:14,157 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-17 00:37:14,157 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-11-17 00:37:14,162 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-11-17 00:37:14,495 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-17 00:37:14,495 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-11-17 00:37:14,500 [ scc.git] DEBUG Calling 'git fetch origin pull/581/head'
2024-11-17 00:37:14,994 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-17 00:37:14,994 [ scc.git] DEBUG * branch refs/pull/581/head -> FETCH_HEAD
2024-11-17 00:37:14,998 [ scc.git] DEBUG Calling 'git fetch origin pull/583/head'
2024-11-17 00:37:16,015 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-17 00:37:16,015 [ scc.git] DEBUG * branch refs/pull/583/head -> FETCH_HEAD
2024-11-17 00:37:16,020 [ scc.git] DEBUG Calling 'git fetch origin pull/590/head'
2024-11-17 00:37:16,369 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-17 00:37:16,369 [ scc.git] DEBUG * branch refs/pull/590/head -> FETCH_HEAD
2024-11-17 00:37:16,375 [ scc.git] DEBUG Calling 'git fetch origin pull/591/head'
2024-11-17 00:37:17,072 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-17 00:37:17,072 [ scc.git] DEBUG * branch refs/pull/591/head -> FETCH_HEAD
2024-11-17 00:37:17,077 [ scc.git] DEBUG Calling 'git fetch origin pull/592/head'
2024-11-17 00:37:17,474 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-17 00:37:17,474 [ scc.git] DEBUG * branch refs/pull/592/head -> FETCH_HEAD
2024-11-17 00:37:17,480 [ scc.git] DEBUG Calling 'git fetch origin pull/594/head'
2024-11-17 00:37:18,147 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-17 00:37:18,147 [ scc.git] DEBUG * branch refs/pull/594/head -> FETCH_HEAD
2024-11-17 00:37:18,155 [ scc.git] DEBUG Calling 'git fetch origin pull/595/head'
2024-11-17 00:37:18,558 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-17 00:37:18,558 [ scc.git] DEBUG * branch refs/pull/595/head -> FETCH_HEAD
2024-11-17 00:37:18,564 [ scc.git] DEBUG Calling 'git fetch origin pull/596/head'
2024-11-17 00:37:18,865 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-17 00:37:18,866 [ scc.git] DEBUG * branch refs/pull/596/head -> FETCH_HEAD
2024-11-17 00:37:18,871 [ scc.git] DEBUG ## Unique users: []
2024-11-17 00:37:18,871 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:37:18,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:18,876 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-11-17 00:37:18,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:18,889 [ 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-17 00:37:18,987 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-11-17 00:37:18,988 [ scc.git] DEBUG Auto-merging setup.py
2024-11-17 00:37:18,988 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:37:18,993 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-11-17 00:37:18,993 [ scc.git] DEBUG setup.py | 1 +
2024-11-17 00:37:18,993 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-11-17 00:37:19,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:19,124 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-11-17 00:37:19,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:19,138 [ 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-17 00:37:19,327 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-11-17 00:37:19,327 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-11-17 00:37:19,328 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:37:19,332 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-11-17 00:37:19,332 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-11-17 00:37:19,333 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-11-17 00:37:19,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:19,516 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...eb4876927522288e0b5fc33a301e500a6f9ee849'
2024-11-17 00:37:19,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:19,529 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 581 (Dynamic generation of the LUTs png ) eb4876927522288e0b5fc33a301e500a6f9ee849'
2024-11-17 00:37:19,561 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py
2024-11-17 00:37:19,562 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:37:19,569 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 9 +-
2024-11-17 00:37:19,570 [ scc.git] DEBUG .../static/webgateway/css/ome.viewport.css | 27 +++---
2024-11-17 00:37:19,570 [ scc.git] DEBUG .../static/webgateway/js/ome.colorbtn.js | 4 +-
2024-11-17 00:37:19,570 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 2 +-
2024-11-17 00:37:19,570 [ scc.git] DEBUG .../templates/webgateway/viewport/omero_image.html | 18 ++--
2024-11-17 00:37:19,570 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 6 ++
2024-11-17 00:37:19,570 [ scc.git] DEBUG omeroweb/webgateway/views.py | 104 +++++++++++++++++++--
2024-11-17 00:37:19,570 [ scc.git] DEBUG 7 files changed, 132 insertions(+), 38 deletions(-)
2024-11-17 00:37:19,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:19,898 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dd2879608e047a7d71a648a23e6955ce591950fd'
2024-11-17 00:37:19,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:19,912 [ 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-17 00:37:19,946 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:37:19,949 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_content.html | 8 ++++++--
2024-11-17 00:37:19,950 [ scc.git] DEBUG .../templates/webclient/base/includes/group_user_dropdown2.html | 2 --
2024-11-17 00:37:19,950 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-17 00:37:20,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:20,280 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6cbcfa80ce4970cc57fddb99d1be440491982763'
2024-11-17 00:37:20,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:20,294 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 590 (Update changelog) 6cbcfa80ce4970cc57fddb99d1be440491982763'
2024-11-17 00:37:20,313 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:37:20,316 [ scc.git] DEBUG CHANGELOG.md | 16 ++++++++++++++++
2024-11-17 00:37:20,316 [ scc.git] DEBUG 1 file changed, 16 insertions(+)
2024-11-17 00:37:20,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:20,679 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-17 00:37:20,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:20,692 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 591 (Action update) 8a54f0347e7174a744c4c210d0734effd029acbe'
2024-11-17 00:37:20,914 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:37:20,918 [ scc.git] DEBUG .github/workflows/codeql-analysis.yml | 2 +-
2024-11-17 00:37:20,918 [ scc.git] DEBUG .github/workflows/install.yml | 4 ++--
2024-11-17 00:37:20,918 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-11-17 00:37:20,918 [ scc.git] DEBUG .github/workflows/tox.yml | 4 ++--
2024-11-17 00:37:20,918 [ scc.git] DEBUG .gitignore | 1 +
2024-11-17 00:37:20,919 [ scc.git] DEBUG 5 files changed, 9 insertions(+), 8 deletions(-)
2024-11-17 00:37:21,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:21,062 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...721002a9ad481311a44d093e26641344492e149c'
2024-11-17 00:37:21,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:21,080 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 592 (Replace pkg_resources) 721002a9ad481311a44d093e26641344492e149c'
2024-11-17 00:37:21,098 [ scc.git] DEBUG Auto-merging setup.py
2024-11-17 00:37:21,157 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:37:21,161 [ scc.git] DEBUG omero/plugins/web.py | 6 +++---
2024-11-17 00:37:21,161 [ scc.git] DEBUG setup.py | 3 ++-
2024-11-17 00:37:21,161 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 4 deletions(-)
2024-11-17 00:37:21,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:21,472 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6bba7f773bb6c4217607439f9adab8814bcd0ac6'
2024-11-17 00:37:21,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:21,488 [ 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-17 00:37:21,537 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:37:21,541 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/omero_table.html | 5 +++--
2024-11-17 00:37:21,541 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-11-17 00:37:21,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:21,857 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...30278b64bb39134a3f1101b600d4a82256e6eaeb'
2024-11-17 00:37:21,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:21,871 [ 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-17 00:37:21,907 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:37:21,911 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.webclient.actions.js | 2 +-
2024-11-17 00:37:21,911 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-17 00:37:22,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:22,241 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3aae48f586d7b412538a45b34ddc471a26a286e8'
2024-11-17 00:37:22,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:22,255 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 596 (Linkify can parse anchor tag) 3aae48f586d7b412538a45b34ddc471a26a286e8'
2024-11-17 00:37:22,346 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-17 00:37:22,349 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 26 ++++++++++++++++++++--
2024-11-17 00:37:22,349 [ scc.git] DEBUG 1 file changed, 24 insertions(+), 2 deletions(-)
2024-11-17 00:37:22,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:22,631 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-17 00:37:22,669 [ scc.git] DEBUG Get sha1 of %s
2024-11-17 00:37:22,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-17 00:37:22,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-17 00:37:22,711 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-17 00:37:22,720 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcbee699b20> has no local changes
2024-11-17 00:37:22,720 [ 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 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 581 Tom-TBT 'Dynamic generation of the LUTs png '
- 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/235/)'
2024-11-17 00:37:22,735 [ scc.git] DEBUG [detached HEAD 40eb276c8] merge master -Dorg -Ssuccess-only
2024-11-17 00:37:22,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:37:22,735 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-17 00:37:22,783 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-11-17 00:37:23,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:23,038 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-11-17 00:37:23,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:23,431 [ scc.config] DEBUG Found submodule.omero-py.url
2024-11-17 00:37:23,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:23,827 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-11-17 00:37:24,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:24,220 [ scc.config] DEBUG Found submodule.omero-web.url
2024-11-17 00:37:24,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-17 00:37:24,637 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-17 00:37:24,665 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcbef9ce0a0> has local changes
2024-11-17 00:37:24,665 [ 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 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 581 Tom-TBT 'Dynamic generation of the LUTs png '
- 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/235/)'
2024-11-17 00:37:24,677 [ scc.git] DEBUG [detached HEAD e63caf2] merge master -Dorg -Ssuccess-only
2024-11-17 00:37:24,677 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-17 00:37:24,677 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-11-17 00:37:24,677 [ scc.merge] INFO Already up to date.
2024-11-17 00:37:24,678 [ scc.merge] INFO
2024-11-17 00:37:24,678 [ scc.merge] INFO Merged PRs:
2024-11-17 00:37:24,678 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-11-17 00:37:24,678 [ scc.merge] INFO - PR 294 dependabot[bot] 'Bump omero-web from `da5b7d1` to `213bb61`'
2024-11-17 00:37:24,678 [ scc.merge] INFO
2024-11-17 00:37:24,678 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-11-17 00:37:24,678 [ scc.merge] INFO Already up to date.
2024-11-17 00:37:24,678 [ scc.merge] INFO
2024-11-17 00:37:24,678 [ scc.merge] INFO Merged PRs:
2024-11-17 00:37:24,678 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-17 00:37:24,678 [ scc.merge] INFO
2024-11-17 00:37:24,679 [ scc.merge] INFO Repository: ome/omero-marshal
2024-11-17 00:37:24,679 [ scc.merge] INFO Excluded PRs:
2024-11-17 00:37:24,679 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-11-17 00:37:24,679 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-11-17 00:37:24,679 [ scc.merge] INFO Already up to date.
2024-11-17 00:37:24,679 [ scc.merge] INFO
2024-11-17 00:37:24,679 [ scc.merge] INFO Merged PRs:
2024-11-17 00:37:24,679 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-17 00:37:24,679 [ scc.merge] INFO
2024-11-17 00:37:24,679 [ scc.merge] INFO Repository: ome/omero-py
2024-11-17 00:37:24,679 [ scc.merge] INFO Excluded PRs:
2024-11-17 00:37:24,679 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-11-17 00:37:24,679 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-11-17 00:37:24,679 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-11-17 00:37:24,680 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-11-17 00:37:24,680 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-11-17 00:37:24,680 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-11-17 00:37:24,680 [ scc.merge] INFO Already up to date.
2024-11-17 00:37:24,680 [ scc.merge] INFO
2024-11-17 00:37:24,680 [ scc.merge] INFO Merged PRs:
2024-11-17 00:37:24,680 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-11-17 00:37:24,680 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-17 00:37:24,680 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-17 00:37:24,680 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-17 00:37:24,680 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-11-17 00:37:24,680 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-17 00:37:24,680 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-11-17 00:37:24,681 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-11-17 00:37:24,681 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation'
2024-11-17 00:37:24,681 [ scc.merge] INFO - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-17 00:37:24,681 [ scc.merge] INFO
2024-11-17 00:37:24,681 [ scc.merge] INFO Repository: ome/omero-scripts
2024-11-17 00:37:24,681 [ scc.merge] INFO Excluded PRs:
2024-11-17 00:37:24,681 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-17 00:37:24,681 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-17 00:37:24,681 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-17 00:37:24,681 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-17 00:37:24,681 [ scc.merge] INFO Already up to date.
2024-11-17 00:37:24,681 [ scc.merge] INFO
2024-11-17 00:37:24,681 [ scc.merge] INFO Merged PRs:
2024-11-17 00:37:24,682 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-17 00:37:24,682 [ scc.merge] INFO
2024-11-17 00:37:24,682 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-17 00:37:24,682 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-17 00:37:24,682 [ scc.merge] INFO
2024-11-17 00:37:24,682 [ scc.merge] INFO Repository: ome/omero-web
2024-11-17 00:37:24,682 [ scc.merge] INFO Excluded PRs:
2024-11-17 00:37:24,682 [ scc.merge] INFO - PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-17 00:37:24,682 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-11-17 00:37:24,682 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-11-17 00:37:24,682 [ scc.merge] INFO Already up to date.
2024-11-17 00:37:24,682 [ scc.merge] INFO
2024-11-17 00:37:24,682 [ scc.merge] INFO Merged PRs:
2024-11-17 00:37:24,682 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-17 00:37:24,682 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-17 00:37:24,682 [ scc.merge] INFO - PR 581 Tom-TBT 'Dynamic generation of the LUTs png '
2024-11-17 00:37:24,682 [ scc.merge] INFO - PR 583 DavidStirling 'Allow users to click a group name to quick-switch to that group'
2024-11-17 00:37:24,683 [ scc.merge] INFO - PR 590 knabar 'Update changelog'
2024-11-17 00:37:24,683 [ scc.merge] INFO - PR 591 jburel 'Action update'
2024-11-17 00:37:24,683 [ scc.merge] INFO - PR 592 jburel 'Replace pkg_resources'
2024-11-17 00:37:24,683 [ scc.merge] INFO - PR 594 knabar 'Add minimum batch size to avoid infinite loop due to zero batch size'
2024-11-17 00:37:24,683 [ scc.merge] INFO - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2024-11-17 00:37:24,683 [ scc.merge] INFO - PR 596 sukunis 'Linkify can parse anchor tag'
2024-11-17 00:37:24,683 [ scc.merge] INFO
2024-11-17 00:37:24,683 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-17 00:37:24,683 [ scc.git] DEBUG Calling 'git remote'
2024-11-17 00:37:24,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-17 00:37:24,688 [ scc.git] DEBUG Calling 'git remote'
2024-11-17 00:37:24,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:37:24,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-17 00:37:24,694 [ scc.git] DEBUG Calling 'git remote'
2024-11-17 00:37:24,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:37:24,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-17 00:37:24,699 [ scc.git] DEBUG Calling 'git remote'
2024-11-17 00:37:24,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:37:24,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-17 00:37:24,703 [ scc.git] DEBUG Calling 'git remote'
2024-11-17 00:37:24,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-17 00:37:24,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-17 00:37:24,712 [ scc.git] DEBUG Calling 'git remote'
2024-11-17 00:37:24,723 [ 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-17 00:37:53,004 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
