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-08-25 00:32:51,062 [ scc.config] DEBUG Found github.token
2024-08-25 00:32:51,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-08-25 00:32:51,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:32:51,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:32:52,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-08-25 00:32:52,011 [ scc.gh] DEBUG 4292 remaining from 5000 (Reset at 01:08
2024-08-25 00:32:52,011 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-25 00:32:52,016 [ scc.git] DEBUG Check current status
2024-08-25 00:32:52,016 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-25 00:32:52,020 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-08-25 00:32:52,020 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-25 00:32:52,066 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-08-25 00:32:52,069 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-08-25 00:32:52,073 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-08-25 00:32:52,077 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-08-25 00:32:52,083 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-08-25 00:32:52,088 [ scc.config] DEBUG Found remote.origin.url
2024-08-25 00:32:52,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-08-25 00:32:52,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-25 00:32:53,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-25 00:32:53,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-25 00:32:54,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-25 00:32:54,107 [ scc.git] DEBUG Resetting...
2024-08-25 00:32:54,108 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-08-25 00:32:54,115 [ scc.git] DEBUG HEAD is now at 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-08-25 00:32:54,115 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-08-25 00:32:54,196 [ scc.git] DEBUG Check current status
2024-08-25 00:32:54,196 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-25 00:32:54,200 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-08-25 00:32:54,200 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-25 00:32:54,247 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-08-25 00:32:54,250 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-08-25 00:32:54,255 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-08-25 00:32:54,260 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-08-25 00:32:54,265 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-08-25 00:32:54,266 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-08-25 00:32:54,266 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-08-25 00:32:54,266 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-08-25 00:32:54,266 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-08-25 00:32:54,266 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-08-25 00:32:54,266 [ scc.repo] DEBUG ## PRs found:
2024-08-25 00:32:54,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-08-25 00:32:55,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/290 HTTP/1.1" 200 None
2024-08-25 00:32:55,030 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-25 00:32:55,030 [ scc.repo] DEBUG - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-08-25 00:32:55,030 [ scc.repo] DEBUG ## Branches found:
2024-08-25 00:32:55,030 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:32:55,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:32:55,035 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-25 00:32:55,040 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-25 00:32:55,040 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-25 00:32:55,045 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-25 00:32:55,050 [ scc.git] DEBUG Already up to date.
2024-08-25 00:32:55,050 [ scc.git] DEBUG Calling 'git fetch origin pull/290/head'
2024-08-25 00:32:55,390 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-08-25 00:32:55,390 [ scc.git] DEBUG * branch refs/pull/290/head -> FETCH_HEAD
2024-08-25 00:32:55,398 [ scc.git] DEBUG ## Unique users: []
2024-08-25 00:32:55,398 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:32:55,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:32:55,403 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-08-25 00:32:55,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:32:55,412 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 290 (Bump omero-web from `ba8c7e2` to `7cd445c`) 43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-08-25 00:32:55,424 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:32:55,426 [ scc.git] DEBUG omero-web | 2 +-
2024-08-25 00:32:55,426 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-25 00:32:55,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:32:55,561 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-25 00:32:55,647 [ scc.git] DEBUG Submodule path 'omero-web': checked out '7cd445ce3cc018efb4327eac5fc74701cffdc578'
2024-08-25 00:32:55,648 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:32:55,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:32:55,652 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-25 00:32:55,701 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7faf13aeac10> has no local changes
2024-08-25 00:32:55,701 [ 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 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
Generated by OMERO-python-superbuild-push#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/154/)'
2024-08-25 00:32:55,732 [ scc.git] DEBUG [detached HEAD 1532d89] merge master -Dorg -Snone
2024-08-25 00:32:55,732 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-08-25 00:32:55,733 [ scc.merge] INFO Already up to date.
2024-08-25 00:32:55,733 [ scc.merge] INFO
2024-08-25 00:32:55,733 [ scc.merge] INFO Merged PRs:
2024-08-25 00:32:55,733 [ scc.merge] INFO - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-08-25 00:32:55,733 [ scc.merge] INFO
2024-08-25 00:32:55,733 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-25 00:32:55,733 [ 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-08-25 00:32:57,836 [ scc.config] DEBUG Found github.token
2024-08-25 00:32:57,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-08-25 00:32:58,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:32:58,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:32:58,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-08-25 00:32:58,786 [ scc.gh] DEBUG 4282 remaining from 5000 (Reset at 01:08
2024-08-25 00:32:58,787 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-25 00:32:58,792 [ scc.git] DEBUG Check current status
2024-08-25 00:32:58,792 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-25 00:32:58,797 [ scc.git] DEBUG 1532d89 merge master -Dorg -Snone
2024-08-25 00:32:58,797 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-25 00:32:58,841 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-08-25 00:32:58,844 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-08-25 00:32:58,847 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-08-25 00:32:58,851 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-08-25 00:32:58,855 [ scc.git] DEBUG 7cd445ce3cc018efb4327eac5fc74701cffdc578 omero-web (v5.27.0-1-g7cd445ce3)
2024-08-25 00:32:58,860 [ scc.config] DEBUG Found remote.origin.url
2024-08-25 00:32:58,861 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-08-25 00:32:58,863 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-08-25 00:32:59,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-08-25 00:32:59,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-25 00:33:00,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-25 00:33:00,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-25 00:33:00,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-25 00:33:00,939 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-25 00:33:00,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-08-25 00:33:00,996 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-25 00:33:01,000 [ scc.git] DEBUG Check current status
2024-08-25 00:33:01,001 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-25 00:33:01,005 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-08-25 00:33:01,005 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-25 00:33:01,053 [ scc.config] DEBUG Found remote.origin.url
2024-08-25 00:33:01,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-08-25 00:33:01,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-25 00:33:02,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-25 00:33:02,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-25 00:33:03,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-25 00:33:03,103 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-25 00:33:03,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:33:03,149 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-08-25 00:33:03,149 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-25 00:33:03,154 [ scc.git] DEBUG Check current status
2024-08-25 00:33:03,154 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-25 00:33:03,159 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-08-25 00:33:03,160 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-25 00:33:03,206 [ scc.config] DEBUG Found remote.origin.url
2024-08-25 00:33:03,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-08-25 00:33:04,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-25 00:33:04,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-25 00:33:04,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-25 00:33:05,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-25 00:33:05,224 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-25 00:33:05,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:33:05,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-08-25 00:33:05,268 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-25 00:33:05,273 [ scc.git] DEBUG Check current status
2024-08-25 00:33:05,273 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-25 00:33:05,278 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-08-25 00:33:05,278 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-25 00:33:05,332 [ scc.config] DEBUG Found remote.origin.url
2024-08-25 00:33:05,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-08-25 00:33:06,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-25 00:33:06,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-25 00:33:06,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-25 00:33:07,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-25 00:33:07,349 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-25 00:33:07,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:33:07,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-08-25 00:33:07,397 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-25 00:33:07,402 [ scc.git] DEBUG Check current status
2024-08-25 00:33:07,402 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-25 00:33:07,406 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-25 00:33:07,406 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-25 00:33:07,454 [ scc.config] DEBUG Found remote.origin.url
2024-08-25 00:33:07,454 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-08-25 00:33:07,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-08-25 00:33:08,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-25 00:33:08,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-25 00:33:09,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-25 00:33:09,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-25 00:33:09,451 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-25 00:33:09,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:33:09,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-08-25 00:33:09,496 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-25 00:33:09,501 [ scc.git] DEBUG Check current status
2024-08-25 00:33:09,501 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-25 00:33:09,525 [ scc.git] DEBUG 7cd445ce3 Bump version: 5.27.0 → 5.27.1.dev0
2024-08-25 00:33:09,525 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-25 00:33:09,575 [ scc.config] DEBUG Found remote.origin.url
2024-08-25 00:33:09,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-08-25 00:33:10,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-25 00:33:10,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-25 00:33:11,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-25 00:33:11,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-25 00:33:11,529 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-25 00:33:11,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:33:11,571 [ scc.git] DEBUG Resetting...
2024-08-25 00:33:11,571 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-08-25 00:33:11,578 [ scc.git] DEBUG HEAD is now at 1532d89 merge master -Dorg -Snone
2024-08-25 00:33:11,578 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-08-25 00:33:11,638 [ scc.git] DEBUG Check current status
2024-08-25 00:33:11,639 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-25 00:33:11,644 [ scc.git] DEBUG 1532d89 merge master -Dorg -Snone
2024-08-25 00:33:11,644 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-25 00:33:11,691 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-08-25 00:33:11,694 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-08-25 00:33:11,697 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-08-25 00:33:11,701 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-08-25 00:33:11,705 [ scc.git] DEBUG 7cd445ce3cc018efb4327eac5fc74701cffdc578 omero-web (v5.27.0-1-g7cd445ce3)
2024-08-25 00:33:11,706 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-08-25 00:33:11,706 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-08-25 00:33:11,706 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-08-25 00:33:11,706 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-08-25 00:33:11,706 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-08-25 00:33:11,706 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-08-25 00:33:11,706 [ scc.repo] DEBUG ## PRs found:
2024-08-25 00:33:11,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-08-25 00:33:12,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/290 HTTP/1.1" 200 None
2024-08-25 00:33:12,451 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-25 00:33:13,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e HTTP/1.1" 200 None
2024-08-25 00:33:13,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-25 00:33:14,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e HTTP/1.1" 200 None
2024-08-25 00:33:14,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/43005729b7a6c8fd86894b00183ee7806d5fec7e?per_page=1 HTTP/1.1" 200 2
2024-08-25 00:33:14,426 [ scc.repo] DEBUG - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-08-25 00:33:14,426 [ scc.repo] DEBUG ## Branches found:
2024-08-25 00:33:14,426 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:33:14,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:14,431 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-25 00:33:14,435 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-25 00:33:14,435 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-25 00:33:14,440 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-25 00:33:14,446 [ scc.git] DEBUG Already up to date.
2024-08-25 00:33:14,446 [ scc.git] DEBUG Calling 'git fetch origin pull/290/head'
2024-08-25 00:33:14,796 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-08-25 00:33:14,796 [ scc.git] DEBUG * branch refs/pull/290/head -> FETCH_HEAD
2024-08-25 00:33:14,803 [ scc.git] DEBUG ## Unique users: []
2024-08-25 00:33:14,803 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:33:14,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:14,809 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-08-25 00:33:14,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:14,818 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 290 (Bump omero-web from `ba8c7e2` to `7cd445c`) 43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-08-25 00:33:14,822 [ scc.git] DEBUG Already up to date.
2024-08-25 00:33:14,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:33:14,947 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-25 00:33:14,991 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:33:14,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:14,997 [ scc.repo] DEBUG ## PRs found:
2024-08-25 00:33:15,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-08-25 00:33:15,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-08-25 00:33:16,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-08-25 00:33:16,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-08-25 00:33:17,310 [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-08-25 00:33:17,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-08-25 00:33:18,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-08-25 00:33:18,143 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-08-25 00:33:18,143 [ scc.repo] DEBUG ## Branches found:
2024-08-25 00:33:18,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-08-25 00:33:18,144 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:33:18,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:18,149 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-25 00:33:18,154 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-25 00:33:18,154 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-25 00:33:18,160 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-25 00:33:18,166 [ scc.git] DEBUG Already up to date.
2024-08-25 00:33:18,166 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-08-25 00:33:18,481 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-08-25 00:33:18,481 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-08-25 00:33:18,486 [ scc.git] DEBUG ## Unique users: []
2024-08-25 00:33:18,486 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:33:18,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:18,491 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-08-25 00:33:18,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:18,502 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-08-25 00:33:18,516 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-08-25 00:33:18,516 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-08-25 00:33:18,516 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-08-25 00:33:18,516 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-08-25 00:33:18,516 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-08-25 00:33:18,516 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-08-25 00:33:18,516 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-08-25 00:33:18,516 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-08-25 00:33:18,516 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-08-25 00:33:18,517 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:33:18,521 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-08-25 00:33:18,521 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-08-25 00:33:18,521 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-08-25 00:33:18,521 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-08-25 00:33:18,521 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-08-25 00:33:18,521 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-08-25 00:33:18,522 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-08-25 00:33:18,522 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-08-25 00:33:18,522 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-08-25 00:33:18,524 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-08-25 00:33:18,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:33:18,651 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-25 00:33:18,695 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:33:18,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:18,700 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-25 00:33:18,744 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-25 00:33:18,750 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb204800ee0> has no local changes
2024-08-25 00:33:18,750 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/154/)'
2024-08-25 00:33:18,760 [ scc.git] DEBUG [detached HEAD c43a676] merge master -Dorg -Ssuccess-only
2024-08-25 00:33:18,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:33:18,760 [ scc.repo] DEBUG ## PRs found:
2024-08-25 00:33:19,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-08-25 00:33:19,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-08-25 00:33:20,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-08-25 00:33:20,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-08-25 00:33:20,994 [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-08-25 00:33:21,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-08-25 00:33:21,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-08-25 00:33:21,900 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-08-25 00:33:22,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-08-25 00:33:22,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-08-25 00:33:23,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-08-25 00:33:23,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-08-25 00:33:23,656 [ scc.repo] DEBUG ## Branches found:
2024-08-25 00:33:23,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-08-25 00:33:23,656 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:33:23,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:23,662 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-25 00:33:23,666 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-25 00:33:23,667 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-25 00:33:23,671 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-25 00:33:23,677 [ scc.git] DEBUG Already up to date.
2024-08-25 00:33:23,677 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-08-25 00:33:24,080 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-08-25 00:33:24,080 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-08-25 00:33:24,085 [ scc.git] DEBUG ## Unique users: []
2024-08-25 00:33:24,085 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:33:24,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:24,090 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-08-25 00:33:24,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:24,102 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-08-25 00:33:24,113 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-08-25 00:33:24,114 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:33:24,117 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-08-25 00:33:24,117 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-08-25 00:33:24,117 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-08-25 00:33:24,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:33:24,252 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-25 00:33:24,293 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:33:24,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:24,301 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-25 00:33:24,339 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-25 00:33:24,345 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb20485e6d0> has no local changes
2024-08-25 00:33:24,346 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/154/)'
2024-08-25 00:33:24,354 [ scc.git] DEBUG [detached HEAD 35e3169] merge master -Dorg -Ssuccess-only
2024-08-25 00:33:24,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:33:24,354 [ scc.repo] DEBUG ## PRs found:
2024-08-25 00:33:24,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-08-25 00:33:25,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424 HTTP/1.1" 200 None
2024-08-25 00:33:25,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424/comments HTTP/1.1" 200 None
2024-08-25 00:33:26,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-08-25 00:33:26,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-25 00:33:27,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-25 00:33:27,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-08-25 00:33:28,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec?per_page=1 HTTP/1.1" 200 None
2024-08-25 00:33:28,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-08-25 00:33:29,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/status HTTP/1.1" 200 None
2024-08-25 00:33:29,010 [ scc.repo] DEBUG - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-08-25 00:33:29,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-08-25 00:33:29,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-08-25 00:33:30,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-08-25 00:33:31,017 [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-08-25 00:33:31,459 [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-08-25 00:33:31,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-08-25 00:33:32,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-08-25 00:33:32,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-08-25 00:33:33,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-08-25 00:33:33,190 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-08-25 00:33:33,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-08-25 00:33:34,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-08-25 00:33:34,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-08-25 00:33:35,026 [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-08-25 00:33:35,468 [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-08-25 00:33:35,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-08-25 00:33:36,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-08-25 00:33:36,843 [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-08-25 00:33:37,263 [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-08-25 00:33:37,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-08-25 00:33:38,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-08-25 00:33:38,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-08-25 00:33:39,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-08-25 00:33:39,118 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-08-25 00:33:39,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-08-25 00:33:39,548 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-08-25 00:33:39,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-08-25 00:33:40,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-08-25 00:33:40,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-08-25 00:33:41,345 [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-08-25 00:33:41,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-08-25 00:33:42,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-08-25 00:33:42,226 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-08-25 00:33:42,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-08-25 00:33:43,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-08-25 00:33:43,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-08-25 00:33:44,078 [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-08-25 00:33:44,537 [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-08-25 00:33:45,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-08-25 00:33:45,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-08-25 00:33:46,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-08-25 00:33:46,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-08-25 00:33:46,444 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-08-25 00:33:46,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-08-25 00:33:47,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-08-25 00:33:47,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-08-25 00:33:48,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-08-25 00:33:48,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-08-25 00:33:49,187 [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-08-25 00:33:49,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-08-25 00:33:50,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-08-25 00:33:50,111 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-08-25 00:33:50,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-08-25 00:33:51,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-08-25 00:33:51,528 [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-08-25 00:33:52,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-08-25 00:33:52,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-08-25 00:33:52,439 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-08-25 00:33:52,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-08-25 00:33:53,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-08-25 00:33:53,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-08-25 00:33:54,350 [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-08-25 00:33:54,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-08-25 00:33:55,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-08-25 00:33:55,260 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-08-25 00:33:55,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-08-25 00:33:56,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-08-25 00:33:56,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-08-25 00:33:57,067 [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-08-25 00:33:57,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-08-25 00:33:57,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-08-25 00:33:57,978 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-08-25 00:33:58,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-08-25 00:33:58,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-08-25 00:33:59,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-08-25 00:33:59,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-08-25 00:33:59,732 [ scc.repo] DEBUG ## Branches found:
2024-08-25 00:33:59,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-08-25 00:33:59,732 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:33:59,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:33:59,738 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-25 00:33:59,743 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-25 00:33:59,743 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-25 00:33:59,750 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-25 00:33:59,756 [ scc.git] DEBUG Already up to date.
2024-08-25 00:33:59,756 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-08-25 00:34:00,527 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-25 00:34:00,527 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-08-25 00:34:00,534 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-08-25 00:34:00,899 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-25 00:34:00,900 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-08-25 00:34:00,905 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-08-25 00:34:01,247 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-25 00:34:01,247 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-08-25 00:34:01,253 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-08-25 00:34:01,542 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-25 00:34:01,542 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-08-25 00:34:01,548 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-08-25 00:34:01,888 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-25 00:34:01,888 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-08-25 00:34:01,894 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-08-25 00:34:02,181 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-25 00:34:02,182 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-08-25 00:34:02,188 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-08-25 00:34:02,472 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-25 00:34:02,472 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-08-25 00:34:02,478 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-08-25 00:34:02,984 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-25 00:34:02,985 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-08-25 00:34:02,990 [ scc.git] DEBUG Calling 'git fetch origin pull/424/head'
2024-08-25 00:34:03,349 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-25 00:34:03,350 [ scc.git] DEBUG * branch refs/pull/424/head -> FETCH_HEAD
2024-08-25 00:34:03,355 [ scc.git] DEBUG ## Unique users: []
2024-08-25 00:34:03,355 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:34:03,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:03,360 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-08-25 00:34:03,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:03,376 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-08-25 00:34:03,436 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-08-25 00:34:03,436 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-08-25 00:34:03,437 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:03,441 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-08-25 00:34:03,441 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-08-25 00:34:03,441 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-08-25 00:34:03,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:03,577 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-08-25 00:34:03,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:03,593 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-08-25 00:34:03,710 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-08-25 00:34:03,710 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-08-25 00:34:03,711 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:03,721 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-08-25 00:34:03,722 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-08-25 00:34:03,722 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-08-25 00:34:03,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:03,951 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-08-25 00:34:03,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:03,967 [ 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-08-25 00:34:03,989 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-08-25 00:34:03,991 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:03,994 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-08-25 00:34:03,994 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-08-25 00:34:04,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:04,334 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-08-25 00:34:04,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:04,350 [ 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-08-25 00:34:04,386 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-08-25 00:34:04,386 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-08-25 00:34:04,387 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:04,390 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-08-25 00:34:04,390 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-08-25 00:34:04,390 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-08-25 00:34:04,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:04,750 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-08-25 00:34:04,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:04,768 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-08-25 00:34:04,789 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:04,793 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-08-25 00:34:04,793 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-08-25 00:34:04,793 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-08-25 00:34:04,793 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-08-25 00:34:04,793 [ scc.git] DEBUG create mode 100644 connect.py
2024-08-25 00:34:05,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:05,137 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-08-25 00:34:05,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:05,155 [ 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-08-25 00:34:05,228 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-08-25 00:34:05,229 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:05,232 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-08-25 00:34:05,232 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-25 00:34:05,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:05,519 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-08-25 00:34:05,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:05,538 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-08-25 00:34:05,630 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-08-25 00:34:05,631 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:05,636 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-08-25 00:34:05,636 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-08-25 00:34:05,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:05,899 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-08-25 00:34:05,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:05,916 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-08-25 00:34:06,017 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-08-25 00:34:06,018 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:06,025 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-08-25 00:34:06,026 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-08-25 00:34:06,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:06,279 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec'
2024-08-25 00:34:06,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:06,300 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 424 (Prevent hang on exit while omero.client keepalive is active) 0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec'
2024-08-25 00:34:06,333 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:06,337 [ scc.git] DEBUG src/omero/util/__init__.py | 8 +-------
2024-08-25 00:34:06,337 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 7 deletions(-)
2024-08-25 00:34:06,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:06,662 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-25 00:34:06,711 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:34:06,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:06,717 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-25 00:34:06,763 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-25 00:34:06,773 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb203792f40> has no local changes
2024-08-25 00:34:06,774 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- 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 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
Generated by OMERO-python-superbuild-push#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/154/)'
2024-08-25 00:34:06,790 [ scc.git] DEBUG [detached HEAD 86a5cfa6] merge master -Dorg -Ssuccess-only
2024-08-25 00:34:06,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:34:06,790 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-25 00:34:06,791 [ scc.repo] DEBUG ## PRs found:
2024-08-25 00:34:07,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-25 00:34:07,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-25 00:34:08,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-25 00:34:08,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-25 00:34:09,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-25 00:34:09,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-25 00:34:10,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-25 00:34:10,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-25 00:34:10,996 [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-08-25 00:34:11,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-25 00:34:11,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-25 00:34:11,860 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-25 00:34:12,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-25 00:34:12,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-25 00:34:13,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-25 00:34:13,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-25 00:34:13,720 [ scc.repo] DEBUG ## Branches found:
2024-08-25 00:34:13,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-08-25 00:34:13,720 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:34:13,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:13,726 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-25 00:34:13,730 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-25 00:34:13,730 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-25 00:34:13,734 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-25 00:34:13,740 [ scc.git] DEBUG Already up to date.
2024-08-25 00:34:13,741 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-25 00:34:14,174 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-08-25 00:34:14,175 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-25 00:34:14,180 [ scc.git] DEBUG ## Unique users: []
2024-08-25 00:34:14,180 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:34:14,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:14,185 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-25 00:34:14,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:14,195 [ 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-08-25 00:34:14,230 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-25 00:34:14,230 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-25 00:34:14,230 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-25 00:34:14,230 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-25 00:34:14,238 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-25 00:34:14,244 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-25 00:34:14,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:14,372 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-25 00:34:14,379 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-25 00:34:14,386 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#154](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/154/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/154/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-25 00:34:14,392 [ scc.config] DEBUG Found github.token
2024-08-25 00:34:14,392 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-25 00:34:14,392 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-25 00:34:14,439 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:34:14,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:14,445 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-25 00:34:14,486 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-25 00:34:14,492 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb203768640> has no local changes
2024-08-25 00:34:14,493 [ 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.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-python-superbuild-push#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/154/)'
2024-08-25 00:34:14,503 [ scc.git] DEBUG [detached HEAD 51c5d8d] merge master -Dorg -Ssuccess-only
2024-08-25 00:34:14,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:34:14,504 [ scc.repo] DEBUG ## PRs found:
2024-08-25 00:34:14,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-08-25 00:34:15,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/575 HTTP/1.1" 200 None
2024-08-25 00:34:15,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/575/comments HTTP/1.1" 200 None
2024-08-25 00:34:16,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7405491a259e77e752bdd43ef0ee19f9db876fcd HTTP/1.1" 200 None
2024-08-25 00:34:16,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7405491a259e77e752bdd43ef0ee19f9db876fcd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-25 00:34:17,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7405491a259e77e752bdd43ef0ee19f9db876fcd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-25 00:34:17,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7405491a259e77e752bdd43ef0ee19f9db876fcd HTTP/1.1" 200 None
2024-08-25 00:34:18,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/7405491a259e77e752bdd43ef0ee19f9db876fcd?per_page=1 HTTP/1.1" 200 None
2024-08-25 00:34:18,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7405491a259e77e752bdd43ef0ee19f9db876fcd HTTP/1.1" 200 None
2024-08-25 00:34:18,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7405491a259e77e752bdd43ef0ee19f9db876fcd/status HTTP/1.1" 200 None
2024-08-25 00:34:18,926 [ scc.repo] DEBUG - PR 575 will-moore 'Fix breaking change: _marshal_images() handles missing archived flag'
2024-08-25 00:34:19,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574 HTTP/1.1" 200 None
2024-08-25 00:34:19,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-08-25 00:34:20,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-25 00:34:20,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-25 00:34:21,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-08-25 00:34:21,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c?per_page=1 HTTP/1.1" 200 None
2024-08-25 00:34:22,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-08-25 00:34:22,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/status HTTP/1.1" 200 None
2024-08-25 00:34:22,565 [ scc.repo] DEBUG - PR 574 will-moore 'Fix word wrap for names'
2024-08-25 00:34:23,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/571 HTTP/1.1" 200 None
2024-08-25 00:34:23,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-08-25 00:34:23,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-08-25 00:34:24,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-08-25 00:34:24,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-08-25 00:34:25,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-08-25 00:34:25,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-08-25 00:34:26,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-08-25 00:34:26,693 [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-08-25 00:34:27,161 [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-08-25 00:34:27,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-08-25 00:34:27,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-08-25 00:34:28,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-08-25 00:34:28,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-08-25 00:34:28,834 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-08-25 00:34:29,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-08-25 00:34:29,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-08-25 00:34:30,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-08-25 00:34:30,669 [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-08-25 00:34:31,150 [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-08-25 00:34:31,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-08-25 00:34:31,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-08-25 00:34:32,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-08-25 00:34:32,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-08-25 00:34:32,782 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-08-25 00:34:33,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-08-25 00:34:33,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-08-25 00:34:34,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-08-25 00:34:34,670 [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-08-25 00:34:35,127 [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-08-25 00:34:35,130 [ scc.repo] DEBUG ## Branches found:
2024-08-25 00:34:35,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-08-25 00:34:35,130 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:34:35,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:35,137 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-25 00:34:35,143 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-25 00:34:35,144 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-25 00:34:35,151 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-25 00:34:35,158 [ scc.git] DEBUG Already up to date.
2024-08-25 00:34:35,158 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-08-25 00:34:35,606 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-08-25 00:34:35,606 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-08-25 00:34:35,612 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-08-25 00:34:35,955 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-08-25 00:34:35,955 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-08-25 00:34:35,961 [ scc.git] DEBUG Calling 'git fetch origin pull/574/head'
2024-08-25 00:34:36,267 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-08-25 00:34:36,267 [ scc.git] DEBUG * branch refs/pull/574/head -> FETCH_HEAD
2024-08-25 00:34:36,273 [ scc.git] DEBUG Calling 'git fetch origin pull/575/head'
2024-08-25 00:34:36,678 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-08-25 00:34:36,678 [ scc.git] DEBUG * branch refs/pull/575/head -> FETCH_HEAD
2024-08-25 00:34:36,684 [ scc.git] DEBUG ## Unique users: []
2024-08-25 00:34:36,684 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:34:36,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:36,691 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-08-25 00:34:36,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:36,703 [ 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-08-25 00:34:36,774 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-08-25 00:34:36,774 [ scc.git] DEBUG Auto-merging setup.py
2024-08-25 00:34:36,775 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:36,779 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-08-25 00:34:36,779 [ scc.git] DEBUG setup.py | 1 +
2024-08-25 00:34:36,779 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-08-25 00:34:36,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:36,921 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-08-25 00:34:36,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:36,934 [ 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-08-25 00:34:37,036 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-08-25 00:34:37,036 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-08-25 00:34:37,038 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:37,043 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-08-25 00:34:37,043 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-08-25 00:34:37,043 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-08-25 00:34:37,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:37,306 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-08-25 00:34:37,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:37,320 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 574 (Fix word wrap for names) ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-08-25 00:34:37,396 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:37,401 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/layout.css | 2 ++
2024-08-25 00:34:37,401 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/includes/name.html | 4 ++--
2024-08-25 00:34:37,401 [ scc.git] DEBUG 2 files changed, 4 insertions(+), 2 deletions(-)
2024-08-25 00:34:37,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:37,731 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7405491a259e77e752bdd43ef0ee19f9db876fcd'
2024-08-25 00:34:37,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:37,746 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 575 (Fix breaking change: _marshal_images() handles missing archived flag) 7405491a259e77e752bdd43ef0ee19f9db876fcd'
2024-08-25 00:34:37,786 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-25 00:34:37,791 [ scc.git] DEBUG omeroweb/webclient/tree.py | 14 ++++++++++++--
2024-08-25 00:34:37,791 [ scc.git] DEBUG 1 file changed, 12 insertions(+), 2 deletions(-)
2024-08-25 00:34:38,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:38,119 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-25 00:34:38,165 [ scc.git] DEBUG Get sha1 of %s
2024-08-25 00:34:38,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-25 00:34:38,171 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-25 00:34:38,217 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-25 00:34:38,230 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2006f6550> has no local changes
2024-08-25 00:34:38,231 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 571 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 574 will-moore 'Fix word wrap for names'
- PR 575 will-moore 'Fix breaking change: _marshal_images() handles missing archived flag'
Generated by OMERO-python-superbuild-push#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/154/)'
2024-08-25 00:34:38,243 [ scc.git] DEBUG [detached HEAD f534ee526] merge master -Dorg -Ssuccess-only
2024-08-25 00:34:38,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:34:38,244 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-25 00:34:38,303 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-08-25 00:34:38,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:38,516 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-08-25 00:34:38,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:38,948 [ scc.config] DEBUG Found submodule.omero-py.url
2024-08-25 00:34:39,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:39,339 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-08-25 00:34:39,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:39,722 [ scc.config] DEBUG Found submodule.omero-web.url
2024-08-25 00:34:40,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-25 00:34:40,107 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-25 00:34:40,139 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb20554bc10> has local changes
2024-08-25 00:34:40,140 [ 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 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
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 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 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
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.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 571 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 574 will-moore 'Fix word wrap for names'
- PR 575 will-moore 'Fix breaking change: _marshal_images() handles missing archived flag'
Generated by OMERO-python-superbuild-push#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/154/)'
2024-08-25 00:34:40,151 [ scc.git] DEBUG [detached HEAD 5345e90] merge master -Dorg -Ssuccess-only
2024-08-25 00:34:40,151 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-08-25 00:34:40,152 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-08-25 00:34:40,152 [ scc.merge] INFO Already up to date.
2024-08-25 00:34:40,152 [ scc.merge] INFO
2024-08-25 00:34:40,152 [ scc.merge] INFO Merged PRs:
2024-08-25 00:34:40,152 [ scc.merge] INFO - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-08-25 00:34:40,152 [ scc.merge] INFO
2024-08-25 00:34:40,152 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-08-25 00:34:40,152 [ scc.merge] INFO Already up to date.
2024-08-25 00:34:40,152 [ scc.merge] INFO
2024-08-25 00:34:40,152 [ scc.merge] INFO Merged PRs:
2024-08-25 00:34:40,152 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-08-25 00:34:40,152 [ scc.merge] INFO
2024-08-25 00:34:40,152 [ scc.merge] INFO Repository: ome/omero-marshal
2024-08-25 00:34:40,152 [ scc.merge] INFO Excluded PRs:
2024-08-25 00:34:40,152 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-08-25 00:34:40,152 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-08-25 00:34:40,152 [ scc.merge] INFO Already up to date.
2024-08-25 00:34:40,152 [ scc.merge] INFO
2024-08-25 00:34:40,152 [ scc.merge] INFO Merged PRs:
2024-08-25 00:34:40,152 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-08-25 00:34:40,152 [ scc.merge] INFO
2024-08-25 00:34:40,152 [ scc.merge] INFO Repository: ome/omero-py
2024-08-25 00:34:40,152 [ scc.merge] INFO Excluded PRs:
2024-08-25 00:34:40,152 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-08-25 00:34:40,152 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-08-25 00:34:40,152 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-08-25 00:34:40,152 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-08-25 00:34:40,152 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-08-25 00:34:40,153 [ scc.merge] INFO Already up to date.
2024-08-25 00:34:40,153 [ scc.merge] INFO
2024-08-25 00:34:40,153 [ scc.merge] INFO Merged PRs:
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-08-25 00:34:40,153 [ scc.merge] INFO
2024-08-25 00:34:40,153 [ scc.merge] INFO Repository: ome/omero-scripts
2024-08-25 00:34:40,153 [ scc.merge] INFO Excluded PRs:
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-25 00:34:40,153 [ scc.merge] INFO Already up to date.
2024-08-25 00:34:40,153 [ scc.merge] INFO
2024-08-25 00:34:40,153 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-25 00:34:40,153 [ scc.merge] INFO
2024-08-25 00:34:40,153 [ scc.merge] INFO Repository: ome/omero-web
2024-08-25 00:34:40,153 [ scc.merge] INFO Excluded PRs:
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 571 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-08-25 00:34:40,153 [ scc.merge] INFO Already up to date.
2024-08-25 00:34:40,153 [ scc.merge] INFO
2024-08-25 00:34:40,153 [ scc.merge] INFO Merged PRs:
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 574 will-moore 'Fix word wrap for names'
2024-08-25 00:34:40,153 [ scc.merge] INFO - PR 575 will-moore 'Fix breaking change: _marshal_images() handles missing archived flag'
2024-08-25 00:34:40,153 [ scc.merge] INFO
2024-08-25 00:34:40,154 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-25 00:34:40,154 [ scc.git] DEBUG Calling 'git remote'
2024-08-25 00:34:40,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-08-25 00:34:40,159 [ scc.git] DEBUG Calling 'git remote'
2024-08-25 00:34:40,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:34:40,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-08-25 00:34:40,164 [ scc.git] DEBUG Calling 'git remote'
2024-08-25 00:34:40,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:34:40,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-08-25 00:34:40,170 [ scc.git] DEBUG Calling 'git remote'
2024-08-25 00:34:40,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:34:40,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-08-25 00:34:40,175 [ scc.git] DEBUG Calling 'git remote'
2024-08-25 00:34:40,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-25 00:34:40,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-08-25 00:34:40,181 [ scc.git] DEBUG Calling 'git remote'
2024-08-25 00:34:40,198 [ 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 749a68ac
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 7cd445ce3
nothing to commit, working tree clean
HEAD detached from 18cc8a4
nothing to commit, working tree clean
2024-08-25 00:35:07,327 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/34dd2024/images/svgs/logo.svg){kind=logo}
