Started by upstream project "Trigger" build number 161
originally caused by:
Started by timer
[Pipeline] Start of Pipeline
[Pipeline] node
Running on testintegration in /home/omero/workspace/OMERO-python-superbuild-push
[Pipeline] {
[Pipeline] library
Loading library recursiveMerge@master
Attempting to resolve master from remote references...
> git --version # timeout=10
> git --version # 'git version 2.39.2'
> git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10
Found match: refs/heads/master revision f061dff15033c5cd55249a383f52c15ca4a0e5cf
The recommended git tool is: NONE
No credentials specified
> git rev-parse --resolve-git-dir /var/jenkins_home/jobs/OMERO-python-superbuild-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10
Fetching changes from the remote Git repository
> git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10
Fetching without tags
Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git
> git --version # timeout=10
> git --version # 'git version 2.39.2'
> git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10
Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master)
> git config core.sparsecheckout # timeout=10
> git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10
Commit message: "Merge pull request #17 from jburel/python3"
> git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10
[Pipeline] checkout
The recommended git tool is: NONE
No credentials specified
Fetching changes from the remote Git repository
Checking out Revision 18cc8a4949001c5ff23dababa2232f564d7c74e6 (refs/remotes/origin/master)
> git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-python-superbuild-push/.git # timeout=10
> git config remote.origin.url https://github.com/ome/omero-python-superbuild.git # timeout=10
Fetching upstream changes from https://github.com/ome/omero-python-superbuild.git
> git --version # timeout=10
> git --version # 'git version 2.39.3'
> git fetch --tags --force --progress -- https://github.com/ome/omero-python-superbuild.git +refs/heads/*:refs/remotes/origin/* # timeout=10
> git rev-parse refs/remotes/origin/master^{commit} # timeout=10
> git config core.sparsecheckout # timeout=10
> git checkout -f 18cc8a4949001c5ff23dababa2232f564d7c74e6 # timeout=10
Commit message: "Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe"
> git rev-list --no-walk 18cc8a4949001c5ff23dababa2232f564d7c74e6 # timeout=10
Cleaning workspace
> git rev-parse --verify HEAD # timeout=10
Resetting working tree
> git reset --hard # timeout=10
> git clean -fdx # timeout=10
> git submodule foreach --recursive git reset --hard # timeout=10
> git submodule foreach --recursive git clean -fdx # timeout=10
> git remote # timeout=10
> git submodule init # timeout=10
> git submodule sync # timeout=10
> git config --get remote.origin.url # timeout=10
> git submodule init # timeout=10
> git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10
> git config --get submodule.omero-py.url # timeout=10
> git config -f .gitmodules --get submodule.omero-py.path # timeout=10
> git config --get submodule.omero-web.url # timeout=10
> git config -f .gitmodules --get submodule.omero-web.path # timeout=10
> git config --get submodule.omero-marshal.url # timeout=10
> git config -f .gitmodules --get submodule.omero-marshal.path # timeout=10
> git config --get submodule.omero-dropbox.url # timeout=10
> git config -f .gitmodules --get submodule.omero-dropbox.path # timeout=10
> git config --get submodule.omero-scripts.url # timeout=10
> git config -f .gitmodules --get submodule.omero-scripts.path # timeout=10
> git submodule update --init --recursive omero-py # timeout=10
[Pipeline] pwd
[Pipeline] copyArtifacts
Copied 1 artifact from "OMERO-build-push" build number 140
[Pipeline] sh
> git submodule update --init --recursive omero-web # timeout=10
> git submodule update --init --recursive omero-marshal # timeout=10
> git submodule update --init --recursive omero-dropbox # timeout=10
> git submodule update --init --recursive omero-scripts # timeout=10
+ pushd build
~/workspace/OMERO-python-superbuild-push/build ~/workspace/OMERO-python-superbuild-push
+ curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz
+ tar -zxf -
+ popd
~/workspace/OMERO-python-superbuild-push
+ python3 -m venv build/venv
+ . 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
+ python3 -m pip install -U pip
Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3)
Collecting pip
Using cached pip-24.2-py3-none-any.whl (1.8 MB)
Installing collected packages: pip
Attempting uninstall: pip
Found existing installation: pip 21.2.3
Uninstalling pip-21.2.3:
Successfully uninstalled pip-21.2.3
Successfully installed pip-24.2
+ python3 -m pip install scc
Collecting scc
Using cached scc-0.20.0-py3-none-any.whl.metadata (3.6 kB)
Collecting PyGithub>=1.54 (from scc)
Using cached PyGithub-2.3.0-py3-none-any.whl.metadata (3.8 kB)
Collecting PyYAML>=5.1 (from scc)
Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.1 kB)
Collecting future (from scc)
Using cached future-1.0.0-py3-none-any.whl.metadata (4.0 kB)
Collecting ruamel.yaml (from scc)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl.metadata (23 kB)
Collecting ruamel.yaml.jinja2 (from scc)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl.metadata (2.9 kB)
Collecting six (from scc)
Using cached six-1.16.0-py2.py3-none-any.whl.metadata (1.8 kB)
Collecting urllib3<2 (from scc)
Using cached urllib3-1.26.19-py2.py3-none-any.whl.metadata (49 kB)
Collecting yaclifw<0.3,>=0.2.0 (from scc)
Using cached yaclifw-0.2.0-py3-none-any.whl
Collecting pynacl>=1.4.0 (from PyGithub>=1.54->scc)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl.metadata (8.6 kB)
Collecting requests>=2.14.0 (from PyGithub>=1.54->scc)
Using cached requests-2.32.3-py3-none-any.whl.metadata (4.6 kB)
Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached PyJWT-2.9.0-py3-none-any.whl.metadata (3.0 kB)
Collecting typing-extensions>=4.0.0 (from PyGithub>=1.54->scc)
Using cached typing_extensions-4.12.2-py3-none-any.whl.metadata (3.0 kB)
Collecting Deprecated (from PyGithub>=1.54->scc)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl.metadata (5.4 kB)
Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl.metadata (2.2 kB)
Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached cryptography-43.0.0-cp39-abi3-manylinux_2_28_x86_64.whl.metadata (5.4 kB)
Collecting cffi>=1.4.1 (from pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (1.5 kB)
Collecting charset-normalizer<4,>=2 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (33 kB)
Collecting idna<4,>=2.5 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached idna-3.7-py3-none-any.whl.metadata (9.9 kB)
Collecting certifi>=2017.4.17 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached certifi-2024.7.4-py3-none-any.whl.metadata (2.2 kB)
Collecting wrapt<2,>=1.10 (from Deprecated->PyGithub>=1.54->scc)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (6.6 kB)
Collecting pycparser (from cffi>=1.4.1->pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached pycparser-2.22-py3-none-any.whl.metadata (943 bytes)
Using cached scc-0.20.0-py3-none-any.whl (48 kB)
Using cached PyGithub-2.3.0-py3-none-any.whl (354 kB)
Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (738 kB)
Using cached urllib3-1.26.19-py2.py3-none-any.whl (143 kB)
Using cached future-1.0.0-py3-none-any.whl (491 kB)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl (117 kB)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB)
Using cached six-1.16.0-py2.py3-none-any.whl (11 kB)
Using cached PyJWT-2.9.0-py3-none-any.whl (22 kB)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl (856 kB)
Using cached requests-2.32.3-py3-none-any.whl (64 kB)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl (562 kB)
Using cached typing_extensions-4.12.2-py3-none-any.whl (37 kB)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl (9.6 kB)
Using cached certifi-2024.7.4-py3-none-any.whl (162 kB)
Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (443 kB)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (142 kB)
Using cached cryptography-43.0.0-cp39-abi3-manylinux_2_28_x86_64.whl (4.0 MB)
Using cached idna-3.7-py3-none-any.whl (66 kB)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (80 kB)
Using cached pycparser-2.22-py3-none-any.whl (117 kB)
Installing collected packages: wrapt, urllib3, typing-extensions, six, ruamel.yaml.clib, PyYAML, pyjwt, pycparser, idna, future, charset-normalizer, certifi, yaclifw, ruamel.yaml, requests, Deprecated, cffi, ruamel.yaml.jinja2, pynacl, cryptography, PyGithub, scc
Successfully installed Deprecated-1.2.14 PyGithub-2.3.0 PyYAML-6.0.1 certifi-2024.7.4 cffi-1.16.0 charset-normalizer-3.3.2 cryptography-43.0.0 future-1.0.0 idna-3.7 pycparser-2.22 pyjwt-2.9.0 pynacl-1.5.0 requests-2.32.3 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.8 ruamel.yaml.jinja2-0.2.7 scc-0.20.0 six-1.16.0 typing-extensions-4.12.2 urllib3-1.26.19 wrapt-1.16.0 yaclifw-0.2.0
[Pipeline] sh
+ 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-03 00:34:08,862 [ scc.config] DEBUG Found github.token
2024-08-03 00:34:08,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-08-03 00:34:09,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:34:09,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:34:09,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-08-03 00:34:09,809 [ scc.gh] DEBUG 4998 remaining from 5000 (Reset at 01:08
2024-08-03 00:34:09,810 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-03 00:34:09,815 [ scc.git] DEBUG Check current status
2024-08-03 00:34:09,815 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-03 00:34:09,819 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-08-03 00:34:09,819 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-03 00:34:09,860 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-08-03 00:34:09,863 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-08-03 00:34:09,867 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-08-03 00:34:09,873 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-08-03 00:34:09,878 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-08-03 00:34:09,883 [ scc.config] DEBUG Found remote.origin.url
2024-08-03 00:34:10,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-08-03 00:34:10,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-03 00:34:11,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-03 00:34:11,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-03 00:34:11,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-03 00:34:11,926 [ scc.git] DEBUG Resetting...
2024-08-03 00:34:11,926 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-08-03 00:34:11,932 [ scc.git] DEBUG HEAD is now at 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-08-03 00:34:11,933 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-08-03 00:34:11,987 [ scc.git] DEBUG Check current status
2024-08-03 00:34:11,988 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-03 00:34:11,993 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-08-03 00:34:11,993 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-03 00:34:12,036 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-08-03 00:34:12,039 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-08-03 00:34:12,043 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-08-03 00:34:12,048 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-08-03 00:34:12,053 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-08-03 00:34:12,054 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-08-03 00:34:12,054 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-08-03 00:34:12,054 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-08-03 00:34:12,054 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-08-03 00:34:12,054 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-08-03 00:34:12,055 [ scc.repo] DEBUG ## PRs found:
2024-08-03 00:34:12,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-08-03 00:34:12,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/290 HTTP/1.1" 200 None
2024-08-03 00:34:12,862 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-03 00:34:12,863 [ scc.repo] DEBUG - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-08-03 00:34:12,863 [ scc.repo] DEBUG ## Branches found:
2024-08-03 00:34:12,863 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:34:12,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:12,868 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-03 00:34:12,872 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-03 00:34:12,873 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-03 00:34:12,877 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-03 00:34:12,881 [ scc.git] DEBUG Already up to date.
2024-08-03 00:34:12,881 [ scc.git] DEBUG Calling 'git fetch origin pull/290/head'
2024-08-03 00:34:13,268 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-08-03 00:34:13,268 [ scc.git] DEBUG * branch refs/pull/290/head -> FETCH_HEAD
2024-08-03 00:34:13,275 [ scc.git] DEBUG ## Unique users: []
2024-08-03 00:34:13,275 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:34:13,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:13,280 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-08-03 00:34:13,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:13,305 [ 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-03 00:34:13,314 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:34:13,316 [ scc.git] DEBUG omero-web | 2 +-
2024-08-03 00:34:13,316 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-03 00:34:13,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:34:13,473 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-03 00:34:13,558 [ scc.git] DEBUG Submodule path 'omero-web': checked out '7cd445ce3cc018efb4327eac5fc74701cffdc578'
2024-08-03 00:34:13,559 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:34:13,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:13,564 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-03 00:34:13,738 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7faab380ac10> has no local changes
2024-08-03 00:34:13,738 [ 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#133 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/133/)'
2024-08-03 00:34:13,768 [ scc.git] DEBUG [detached HEAD c1e1dd8] merge master -Dorg -Snone
2024-08-03 00:34:13,768 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-08-03 00:34:13,768 [ scc.merge] INFO Already up to date.
2024-08-03 00:34:13,768 [ scc.merge] INFO
2024-08-03 00:34:13,768 [ scc.merge] INFO Merged PRs:
2024-08-03 00:34:13,768 [ scc.merge] INFO - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-08-03 00:34:13,768 [ scc.merge] INFO
2024-08-03 00:34:13,768 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-03 00:34:13,769 [ 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-03 00:34:15,960 [ scc.config] DEBUG Found github.token
2024-08-03 00:34:15,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-08-03 00:34:16,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:34:16,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:34:16,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-08-03 00:34:16,909 [ scc.gh] DEBUG 4988 remaining from 5000 (Reset at 01:08
2024-08-03 00:34:16,910 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-03 00:34:16,914 [ scc.git] DEBUG Check current status
2024-08-03 00:34:16,914 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-03 00:34:16,918 [ scc.git] DEBUG c1e1dd8 merge master -Dorg -Snone
2024-08-03 00:34:16,918 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-03 00:34:16,962 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-08-03 00:34:16,965 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-08-03 00:34:16,969 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-08-03 00:34:16,973 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-08-03 00:34:16,977 [ scc.git] DEBUG 7cd445ce3cc018efb4327eac5fc74701cffdc578 omero-web (v5.27.0-1-g7cd445ce3)
2024-08-03 00:34:16,982 [ scc.config] DEBUG Found remote.origin.url
2024-08-03 00:34:16,983 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-08-03 00:34:16,985 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-08-03 00:34:17,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-08-03 00:34:17,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-03 00:34:18,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-03 00:34:18,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-03 00:34:19,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-03 00:34:19,021 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-03 00:34:19,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-08-03 00:34:19,071 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-03 00:34:19,075 [ scc.git] DEBUG Check current status
2024-08-03 00:34:19,075 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-03 00:34:19,079 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-08-03 00:34:19,079 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-03 00:34:19,125 [ scc.config] DEBUG Found remote.origin.url
2024-08-03 00:34:19,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-08-03 00:34:19,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-03 00:34:20,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-03 00:34:20,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-03 00:34:21,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-03 00:34:21,100 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-03 00:34:21,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:34:21,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-08-03 00:34:21,142 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-03 00:34:21,146 [ scc.git] DEBUG Check current status
2024-08-03 00:34:21,146 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-03 00:34:21,150 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-08-03 00:34:21,151 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-03 00:34:21,198 [ scc.config] DEBUG Found remote.origin.url
2024-08-03 00:34:21,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-08-03 00:34:21,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-03 00:34:22,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-03 00:34:22,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-03 00:34:23,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-03 00:34:23,214 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-03 00:34:23,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:34:23,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-08-03 00:34:23,256 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-03 00:34:23,260 [ scc.git] DEBUG Check current status
2024-08-03 00:34:23,261 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-03 00:34:23,279 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-08-03 00:34:23,279 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-03 00:34:23,328 [ scc.config] DEBUG Found remote.origin.url
2024-08-03 00:34:23,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-08-03 00:34:24,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-03 00:34:24,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-03 00:34:24,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-03 00:34:25,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-03 00:34:25,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-03 00:34:25,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:34:25,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-08-03 00:34:25,330 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-03 00:34:25,335 [ scc.git] DEBUG Check current status
2024-08-03 00:34:25,335 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-03 00:34:25,357 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-03 00:34:25,357 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-03 00:34:25,404 [ scc.config] DEBUG Found remote.origin.url
2024-08-03 00:34:25,405 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-08-03 00:34:25,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-08-03 00:34:26,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-03 00:34:26,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-03 00:34:26,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-03 00:34:27,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-03 00:34:27,385 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-03 00:34:27,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:34:27,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-08-03 00:34:27,426 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-03 00:34:27,431 [ scc.git] DEBUG Check current status
2024-08-03 00:34:27,432 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-03 00:34:27,437 [ scc.git] DEBUG 7cd445ce3 Bump version: 5.27.0 → 5.27.1.dev0
2024-08-03 00:34:27,437 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-03 00:34:27,483 [ scc.config] DEBUG Found remote.origin.url
2024-08-03 00:34:27,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-08-03 00:34:28,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-03 00:34:28,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-03 00:34:29,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-03 00:34:29,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-03 00:34:29,490 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-03 00:34:29,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:34:29,529 [ scc.git] DEBUG Resetting...
2024-08-03 00:34:29,529 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-08-03 00:34:29,535 [ scc.git] DEBUG HEAD is now at c1e1dd8 merge master -Dorg -Snone
2024-08-03 00:34:29,535 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-08-03 00:34:29,590 [ scc.git] DEBUG Check current status
2024-08-03 00:34:29,591 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-03 00:34:29,595 [ scc.git] DEBUG c1e1dd8 merge master -Dorg -Snone
2024-08-03 00:34:29,596 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-03 00:34:29,636 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-08-03 00:34:29,639 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-08-03 00:34:29,642 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-08-03 00:34:29,646 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-08-03 00:34:29,649 [ scc.git] DEBUG 7cd445ce3cc018efb4327eac5fc74701cffdc578 omero-web (v5.27.0-1-g7cd445ce3)
2024-08-03 00:34:29,650 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-08-03 00:34:29,650 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-08-03 00:34:29,651 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-08-03 00:34:29,651 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-08-03 00:34:29,651 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-08-03 00:34:29,651 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-08-03 00:34:29,651 [ scc.repo] DEBUG ## PRs found:
2024-08-03 00:34:29,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-08-03 00:34:30,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/290 HTTP/1.1" 200 None
2024-08-03 00:34:30,393 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-03 00:34:30,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e HTTP/1.1" 200 None
2024-08-03 00:34:31,322 [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-03 00:34:31,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e HTTP/1.1" 200 None
2024-08-03 00:34:32,134 [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-03 00:34:32,134 [ scc.repo] DEBUG - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-08-03 00:34:32,134 [ scc.repo] DEBUG ## Branches found:
2024-08-03 00:34:32,134 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:34:32,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:32,139 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-03 00:34:32,144 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-03 00:34:32,144 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-03 00:34:32,149 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-03 00:34:32,154 [ scc.git] DEBUG Already up to date.
2024-08-03 00:34:32,155 [ scc.git] DEBUG Calling 'git fetch origin pull/290/head'
2024-08-03 00:34:32,501 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-08-03 00:34:32,502 [ scc.git] DEBUG * branch refs/pull/290/head -> FETCH_HEAD
2024-08-03 00:34:32,510 [ scc.git] DEBUG ## Unique users: []
2024-08-03 00:34:32,510 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:34:32,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:32,515 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-08-03 00:34:32,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:32,524 [ 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-03 00:34:32,528 [ scc.git] DEBUG Already up to date.
2024-08-03 00:34:32,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:34:32,666 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-03 00:34:32,710 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:34:32,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:32,715 [ scc.repo] DEBUG ## PRs found:
2024-08-03 00:34:33,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-08-03 00:34:33,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-08-03 00:34:34,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-08-03 00:34:34,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-08-03 00:34:34,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-03 00:34:35,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-08-03 00:34:35,820 [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-03 00:34:35,821 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-08-03 00:34:35,821 [ scc.repo] DEBUG ## Branches found:
2024-08-03 00:34:35,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-08-03 00:34:35,821 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:34:35,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:35,826 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-03 00:34:35,832 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-03 00:34:35,832 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-03 00:34:35,839 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-03 00:34:35,845 [ scc.git] DEBUG Already up to date.
2024-08-03 00:34:35,845 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-08-03 00:34:36,209 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-08-03 00:34:36,209 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-08-03 00:34:36,213 [ scc.git] DEBUG ## Unique users: []
2024-08-03 00:34:36,214 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:34:36,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:36,219 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-08-03 00:34:36,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:36,229 [ 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-03 00:34:36,372 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-08-03 00:34:36,372 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-08-03 00:34:36,372 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-08-03 00:34:36,372 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-08-03 00:34:36,372 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-08-03 00:34:36,372 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-08-03 00:34:36,373 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-08-03 00:34:36,373 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-08-03 00:34:36,373 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-08-03 00:34:36,373 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:34:36,377 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-08-03 00:34:36,377 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-08-03 00:34:36,379 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-08-03 00:34:36,379 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-08-03 00:34:36,379 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-08-03 00:34:36,379 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-08-03 00:34:36,380 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-08-03 00:34:36,380 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-08-03 00:34:36,380 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-08-03 00:34:36,380 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-08-03 00:34:36,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:34:36,506 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-03 00:34:36,547 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:34:36,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:36,552 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-03 00:34:36,594 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-03 00:34:36,601 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73e429ce80> has no local changes
2024-08-03 00:34:36,601 [ 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#133 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/133/)'
2024-08-03 00:34:36,610 [ scc.git] DEBUG [detached HEAD 05fcccd] merge master -Dorg -Ssuccess-only
2024-08-03 00:34:36,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:34:36,611 [ scc.repo] DEBUG ## PRs found:
2024-08-03 00:34:37,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-08-03 00:34:37,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-08-03 00:34:37,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-08-03 00:34:38,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-08-03 00:34:38,856 [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-03 00:34:39,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-08-03 00:34:39,667 [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-03 00:34:39,668 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-08-03 00:34:40,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-08-03 00:34:40,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-08-03 00:34:40,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-08-03 00:34:41,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-08-03 00:34:41,430 [ scc.repo] DEBUG ## Branches found:
2024-08-03 00:34:41,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-08-03 00:34:41,430 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:34:41,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:41,435 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-03 00:34:41,440 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-03 00:34:41,440 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-03 00:34:41,445 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-03 00:34:41,452 [ scc.git] DEBUG Already up to date.
2024-08-03 00:34:41,452 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-08-03 00:34:41,827 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-08-03 00:34:41,828 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-08-03 00:34:41,832 [ scc.git] DEBUG ## Unique users: []
2024-08-03 00:34:41,833 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:34:41,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:41,837 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-08-03 00:34:41,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:41,848 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-08-03 00:34:41,871 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-08-03 00:34:41,871 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:34:41,875 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-08-03 00:34:41,875 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-08-03 00:34:41,875 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-08-03 00:34:42,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:34:42,009 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-03 00:34:42,051 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:34:42,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:34:42,056 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-03 00:34:42,098 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-03 00:34:42,106 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73e4229d90> has no local changes
2024-08-03 00:34:42,106 [ 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#133 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/133/)'
2024-08-03 00:34:42,117 [ scc.git] DEBUG [detached HEAD 123911d] merge master -Dorg -Ssuccess-only
2024-08-03 00:34:42,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:34:42,117 [ scc.repo] DEBUG ## PRs found:
2024-08-03 00:34:42,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-08-03 00:34:43,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424 HTTP/1.1" 200 None
2024-08-03 00:34:43,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424/comments HTTP/1.1" 200 None
2024-08-03 00:34:44,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/58912084185ac68051c33766ffc787a2ac6e6b52 HTTP/1.1" 200 None
2024-08-03 00:34:44,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/58912084185ac68051c33766ffc787a2ac6e6b52/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-03 00:34:45,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/58912084185ac68051c33766ffc787a2ac6e6b52/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-03 00:34:45,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/58912084185ac68051c33766ffc787a2ac6e6b52 HTTP/1.1" 200 None
2024-08-03 00:34:45,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/58912084185ac68051c33766ffc787a2ac6e6b52?per_page=1 HTTP/1.1" 200 None
2024-08-03 00:34:46,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/58912084185ac68051c33766ffc787a2ac6e6b52 HTTP/1.1" 200 None
2024-08-03 00:34:46,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/58912084185ac68051c33766ffc787a2ac6e6b52/status HTTP/1.1" 200 None
2024-08-03 00:34:46,893 [ scc.repo] DEBUG - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-08-03 00:34:47,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-08-03 00:34:47,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-08-03 00:34:48,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-08-03 00:34:48,786 [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-03 00:34:49,226 [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-03 00:34:49,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-08-03 00:34:50,126 [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-03 00:34:50,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-08-03 00:34:50,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-08-03 00:34:50,937 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-08-03 00:34:51,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-08-03 00:34:51,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-08-03 00:34:52,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-08-03 00:34:52,885 [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-03 00:34:53,307 [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-03 00:34:53,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-08-03 00:34:54,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-08-03 00:34:54,729 [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-03 00:34:55,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-03 00:34:55,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-08-03 00:34:56,114 [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-03 00:34:56,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-08-03 00:34:56,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-08-03 00:34:56,987 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-08-03 00:34:57,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-08-03 00:34:57,421 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-08-03 00:34:57,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-08-03 00:34:58,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-08-03 00:34:58,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-08-03 00:34:59,199 [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-03 00:34:59,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-08-03 00:35:00,106 [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-03 00:35:00,106 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-08-03 00:35:00,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-08-03 00:35:01,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-08-03 00:35:01,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-08-03 00:35:02,036 [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-03 00:35:02,459 [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-03 00:35:02,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-08-03 00:35:03,358 [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-03 00:35:03,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-08-03 00:35:04,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-08-03 00:35:04,238 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-08-03 00:35:04,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-08-03 00:35:05,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-08-03 00:35:05,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-08-03 00:35:06,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-08-03 00:35:06,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-08-03 00:35:07,030 [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-03 00:35:07,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-08-03 00:35:07,926 [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-03 00:35:07,927 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-08-03 00:35:08,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-08-03 00:35:08,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-08-03 00:35:09,309 [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-03 00:35:09,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-08-03 00:35:10,179 [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-03 00:35:10,179 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-08-03 00:35:10,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-08-03 00:35:11,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-08-03 00:35:11,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-08-03 00:35:12,128 [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-03 00:35:12,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-08-03 00:35:13,151 [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-03 00:35:13,152 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-08-03 00:35:13,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-08-03 00:35:14,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-08-03 00:35:14,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-08-03 00:35:14,944 [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-03 00:35:15,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-08-03 00:35:15,752 [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-03 00:35:15,753 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-08-03 00:35:16,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-08-03 00:35:16,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-08-03 00:35:17,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-08-03 00:35:17,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-08-03 00:35:17,536 [ scc.repo] DEBUG ## Branches found:
2024-08-03 00:35:17,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-08-03 00:35:17,536 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:35:17,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:17,542 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-03 00:35:17,548 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-03 00:35:17,548 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-03 00:35:17,553 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-03 00:35:17,560 [ scc.git] DEBUG Already up to date.
2024-08-03 00:35:17,560 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-08-03 00:35:18,219 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-03 00:35:18,219 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-08-03 00:35:18,225 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-08-03 00:35:18,543 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-03 00:35:18,544 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-08-03 00:35:18,549 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-08-03 00:35:18,851 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-03 00:35:18,852 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-08-03 00:35:18,857 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-08-03 00:35:19,158 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-03 00:35:19,159 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-08-03 00:35:19,166 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-08-03 00:35:19,510 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-03 00:35:19,510 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-08-03 00:35:19,515 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-08-03 00:35:19,873 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-03 00:35:19,873 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-08-03 00:35:19,879 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-08-03 00:35:20,178 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-03 00:35:20,179 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-08-03 00:35:20,185 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-08-03 00:35:20,518 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-03 00:35:20,518 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-08-03 00:35:20,524 [ scc.git] DEBUG Calling 'git fetch origin pull/424/head'
2024-08-03 00:35:20,873 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-03 00:35:20,873 [ scc.git] DEBUG * branch refs/pull/424/head -> FETCH_HEAD
2024-08-03 00:35:20,878 [ scc.git] DEBUG ## Unique users: []
2024-08-03 00:35:20,878 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:35:20,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:20,884 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-08-03 00:35:20,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:20,904 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-08-03 00:35:20,946 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-08-03 00:35:20,946 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-08-03 00:35:20,947 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:35:20,951 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-08-03 00:35:20,952 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-08-03 00:35:20,952 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-08-03 00:35:21,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:21,083 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-08-03 00:35:21,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:21,100 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-08-03 00:35:21,175 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-08-03 00:35:21,175 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-08-03 00:35:21,176 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:35:21,185 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-08-03 00:35:21,186 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-08-03 00:35:21,186 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-08-03 00:35:21,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:21,461 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-08-03 00:35:21,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:21,480 [ 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-03 00:35:21,510 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-08-03 00:35:21,511 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:35:21,515 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-08-03 00:35:21,515 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-08-03 00:35:21,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:21,852 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-08-03 00:35:21,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:21,872 [ 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-03 00:35:21,928 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-08-03 00:35:21,929 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-08-03 00:35:21,929 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:35:21,933 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-08-03 00:35:21,933 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-08-03 00:35:21,933 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-08-03 00:35:22,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:22,234 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-08-03 00:35:22,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:22,253 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-08-03 00:35:22,285 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:35:22,288 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-08-03 00:35:22,288 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-08-03 00:35:22,288 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-08-03 00:35:22,288 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-08-03 00:35:22,288 [ scc.git] DEBUG create mode 100644 connect.py
2024-08-03 00:35:22,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:22,618 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-08-03 00:35:22,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:22,659 [ 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-03 00:35:22,727 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-08-03 00:35:22,728 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:35:22,731 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-08-03 00:35:22,731 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-03 00:35:23,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:23,005 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-08-03 00:35:23,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:23,022 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-08-03 00:35:23,046 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-08-03 00:35:23,047 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:35:23,051 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-08-03 00:35:23,051 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-08-03 00:35:23,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:23,383 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-08-03 00:35:23,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:23,400 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-08-03 00:35:23,465 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-08-03 00:35:23,466 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:35:23,476 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-08-03 00:35:23,476 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-08-03 00:35:23,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:23,785 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...58912084185ac68051c33766ffc787a2ac6e6b52'
2024-08-03 00:35:23,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:23,802 [ 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) 58912084185ac68051c33766ffc787a2ac6e6b52'
2024-08-03 00:35:23,854 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:35:23,857 [ scc.git] DEBUG src/omero/util/__init__.py | 2 +-
2024-08-03 00:35:23,857 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-03 00:35:24,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:24,171 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-03 00:35:24,212 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:35:24,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:24,217 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-03 00:35:24,258 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-03 00:35:24,268 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73e31c6f40> has no local changes
2024-08-03 00:35:24,268 [ 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#133 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/133/)'
2024-08-03 00:35:24,278 [ scc.git] DEBUG [detached HEAD 65647197] merge master -Dorg -Ssuccess-only
2024-08-03 00:35:24,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:35:24,278 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-03 00:35:24,278 [ scc.repo] DEBUG ## PRs found:
2024-08-03 00:35:24,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-03 00:35:25,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-03 00:35:25,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-03 00:35:26,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-03 00:35:26,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-03 00:35:27,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-03 00:35:27,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-03 00:35:28,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-03 00:35:28,597 [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-03 00:35:29,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-03 00:35:29,425 [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-03 00:35:29,429 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-03 00:35:29,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-03 00:35:30,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-03 00:35:30,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-03 00:35:31,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-03 00:35:31,252 [ scc.repo] DEBUG ## Branches found:
2024-08-03 00:35:31,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-08-03 00:35:31,252 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:35:31,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:31,258 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-03 00:35:31,263 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-03 00:35:31,263 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-03 00:35:31,268 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-03 00:35:31,275 [ scc.git] DEBUG Already up to date.
2024-08-03 00:35:31,275 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-03 00:35:31,710 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-08-03 00:35:31,710 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-03 00:35:31,715 [ scc.git] DEBUG ## Unique users: []
2024-08-03 00:35:31,715 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:35:31,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:31,721 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-03 00:35:31,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:31,734 [ 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-03 00:35:31,786 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-03 00:35:31,786 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-03 00:35:31,786 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-03 00:35:31,787 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-03 00:35:31,793 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-03 00:35:31,799 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-03 00:35:31,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:31,931 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-03 00:35:31,939 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-03 00:35:31,945 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#133](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/133/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/133/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-03 00:35:31,951 [ scc.config] DEBUG Found github.token
2024-08-03 00:35:31,951 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-03 00:35:31,951 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-03 00:35:31,998 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:35:31,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:32,004 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-03 00:35:32,053 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-03 00:35:32,060 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73e3184640> has no local changes
2024-08-03 00:35:32,061 [ 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#133 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/133/)'
2024-08-03 00:35:32,071 [ scc.git] DEBUG [detached HEAD 02f0b28] merge master -Dorg -Ssuccess-only
2024-08-03 00:35:32,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:35:32,072 [ scc.repo] DEBUG ## PRs found:
2024-08-03 00:35:32,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-08-03 00:35:32,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-08-03 00:35:33,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-08-03 00:35:33,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-08-03 00:35:34,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-08-03 00:35:34,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-08-03 00:35:35,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-08-03 00:35:35,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-08-03 00:35:36,271 [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-03 00:35:36,728 [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-03 00:35:37,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-08-03 00:35:37,552 [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-03 00:35:37,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-08-03 00:35:38,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-08-03 00:35:38,372 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-08-03 00:35:38,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-08-03 00:35:39,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-08-03 00:35:39,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-08-03 00:35:40,204 [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-03 00:35:40,626 [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-03 00:35:41,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-08-03 00:35:41,563 [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-03 00:35:41,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-08-03 00:35:42,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-08-03 00:35:42,410 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-08-03 00:35:42,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-08-03 00:35:43,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-08-03 00:35:43,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-08-03 00:35:44,351 [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-03 00:35:44,824 [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-03 00:35:44,826 [ scc.repo] DEBUG ## Branches found:
2024-08-03 00:35:44,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-08-03 00:35:44,827 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:35:44,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:44,832 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-03 00:35:44,836 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-03 00:35:44,837 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-03 00:35:44,843 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-03 00:35:44,849 [ scc.git] DEBUG Already up to date.
2024-08-03 00:35:44,849 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-08-03 00:35:45,233 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-08-03 00:35:45,234 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-08-03 00:35:45,238 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-08-03 00:35:45,588 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-08-03 00:35:45,589 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-08-03 00:35:45,593 [ scc.git] DEBUG ## Unique users: []
2024-08-03 00:35:45,593 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:35:45,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:45,599 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-08-03 00:35:45,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:45,611 [ 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-03 00:35:45,666 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-08-03 00:35:45,667 [ scc.git] DEBUG Auto-merging setup.py
2024-08-03 00:35:45,668 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:35:45,671 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-08-03 00:35:45,672 [ scc.git] DEBUG setup.py | 1 +
2024-08-03 00:35:45,672 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-08-03 00:35:45,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:45,804 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-08-03 00:35:45,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:45,816 [ 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-03 00:35:45,862 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-08-03 00:35:45,862 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-08-03 00:35:45,864 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-03 00:35:45,868 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-08-03 00:35:45,869 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-08-03 00:35:45,869 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-08-03 00:35:46,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:46,182 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-03 00:35:46,227 [ scc.git] DEBUG Get sha1 of %s
2024-08-03 00:35:46,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-03 00:35:46,232 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-03 00:35:46,277 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-03 00:35:46,288 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73e3199550> has no local changes
2024-08-03 00:35:46,288 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- 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'
Generated by OMERO-python-superbuild-push#133 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/133/)'
2024-08-03 00:35:46,300 [ scc.git] DEBUG [detached HEAD 4d4caece3] merge master -Dorg -Ssuccess-only
2024-08-03 00:35:46,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:35:46,301 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-03 00:35:46,355 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-08-03 00:35:46,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:46,584 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-08-03 00:35:46,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:46,965 [ scc.config] DEBUG Found submodule.omero-py.url
2024-08-03 00:35:47,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:47,339 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-08-03 00:35:47,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:47,720 [ scc.config] DEBUG Found submodule.omero-web.url
2024-08-03 00:35:48,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-03 00:35:48,110 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-03 00:35:48,139 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73e4f66c10> has local changes
2024-08-03 00:35:48,139 [ 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 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'
Generated by OMERO-python-superbuild-push#133 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/133/)'
2024-08-03 00:35:48,158 [ scc.git] DEBUG [detached HEAD 7fb48ae] merge master -Dorg -Ssuccess-only
2024-08-03 00:35:48,159 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-08-03 00:35:48,159 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-08-03 00:35:48,159 [ scc.merge] INFO Already up to date.
2024-08-03 00:35:48,159 [ scc.merge] INFO
2024-08-03 00:35:48,159 [ scc.merge] INFO Merged PRs:
2024-08-03 00:35:48,159 [ scc.merge] INFO - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-08-03 00:35:48,159 [ scc.merge] INFO
2024-08-03 00:35:48,159 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-08-03 00:35:48,159 [ scc.merge] INFO Already up to date.
2024-08-03 00:35:48,159 [ scc.merge] INFO
2024-08-03 00:35:48,159 [ scc.merge] INFO Merged PRs:
2024-08-03 00:35:48,159 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-08-03 00:35:48,159 [ scc.merge] INFO
2024-08-03 00:35:48,159 [ scc.merge] INFO Repository: ome/omero-marshal
2024-08-03 00:35:48,159 [ scc.merge] INFO Excluded PRs:
2024-08-03 00:35:48,159 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-08-03 00:35:48,159 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-08-03 00:35:48,159 [ scc.merge] INFO Already up to date.
2024-08-03 00:35:48,160 [ scc.merge] INFO
2024-08-03 00:35:48,160 [ scc.merge] INFO Merged PRs:
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-08-03 00:35:48,160 [ scc.merge] INFO
2024-08-03 00:35:48,160 [ scc.merge] INFO Repository: ome/omero-py
2024-08-03 00:35:48,160 [ scc.merge] INFO Excluded PRs:
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-08-03 00:35:48,160 [ scc.merge] INFO Already up to date.
2024-08-03 00:35:48,160 [ scc.merge] INFO
2024-08-03 00:35:48,160 [ scc.merge] INFO Merged PRs:
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-08-03 00:35:48,160 [ scc.merge] INFO
2024-08-03 00:35:48,160 [ scc.merge] INFO Repository: ome/omero-scripts
2024-08-03 00:35:48,160 [ scc.merge] INFO Excluded PRs:
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-03 00:35:48,160 [ scc.merge] INFO Already up to date.
2024-08-03 00:35:48,160 [ scc.merge] INFO
2024-08-03 00:35:48,160 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-03 00:35:48,160 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-03 00:35:48,161 [ scc.merge] INFO
2024-08-03 00:35:48,161 [ scc.merge] INFO Repository: ome/omero-web
2024-08-03 00:35:48,161 [ scc.merge] INFO Excluded PRs:
2024-08-03 00:35:48,161 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-08-03 00:35:48,161 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-08-03 00:35:48,161 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-08-03 00:35:48,161 [ scc.merge] INFO Already up to date.
2024-08-03 00:35:48,161 [ scc.merge] INFO
2024-08-03 00:35:48,161 [ scc.merge] INFO Merged PRs:
2024-08-03 00:35:48,161 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-08-03 00:35:48,161 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-08-03 00:35:48,161 [ scc.merge] INFO
2024-08-03 00:35:48,161 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-03 00:35:48,161 [ scc.git] DEBUG Calling 'git remote'
2024-08-03 00:35:48,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-08-03 00:35:48,166 [ scc.git] DEBUG Calling 'git remote'
2024-08-03 00:35:48,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:35:48,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-08-03 00:35:48,170 [ scc.git] DEBUG Calling 'git remote'
2024-08-03 00:35:48,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:35:48,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-08-03 00:35:48,175 [ scc.git] DEBUG Calling 'git remote'
2024-08-03 00:35:48,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:35:48,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-08-03 00:35:48,179 [ scc.git] DEBUG Calling 'git remote'
2024-08-03 00:35:48,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-03 00:35:48,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-08-03 00:35:48,183 [ scc.git] DEBUG Calling 'git remote'
2024-08-03 00:35:48,187 [ 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-03 00:36:16,820 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS