Started by upstream project "Trigger" build number 158 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 > 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 Checking out Revision 18cc8a4949001c5ff23dababa2232f564d7c74e6 (refs/remotes/origin/master) > 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 > 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 [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-build-push" build number 137 [Pipeline] sh + 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.8.0-py3-none-any.whl.metadata (4.2 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.8.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.8.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-07-31 00:32:13,998 [ scc.config] DEBUG Found github.token 2024-07-31 00:32:14,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-07-31 00:32:14,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:32:14,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:32:14,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-07-31 00:32:14,969 [ scc.gh] DEBUG 4352 remaining from 5000 (Reset at 00:07 2024-07-31 00:32:14,970 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-31 00:32:14,973 [ scc.git] DEBUG Check current status 2024-07-31 00:32:14,974 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-31 00:32:14,977 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe 2024-07-31 00:32:14,977 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-31 00:32:15,014 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-07-31 00:32:15,017 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-07-31 00:32:15,020 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac) 2024-07-31 00:32:15,024 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe) 2024-07-31 00:32:15,384 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c) 2024-07-31 00:32:15,389 [ scc.config] DEBUG Found remote.origin.url 2024-07-31 00:32:15,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None 2024-07-31 00:32:16,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-31 00:32:16,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-31 00:32:16,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-31 00:32:17,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-31 00:32:17,302 [ scc.git] DEBUG Resetting... 2024-07-31 00:32:17,302 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-07-31 00:32:17,309 [ scc.git] DEBUG HEAD is now at 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe 2024-07-31 00:32:17,309 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-07-31 00:32:17,367 [ scc.git] DEBUG Check current status 2024-07-31 00:32:17,367 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-31 00:32:17,372 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe 2024-07-31 00:32:17,373 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-31 00:32:17,429 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-07-31 00:32:17,433 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-07-31 00:32:17,438 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac) 2024-07-31 00:32:17,442 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe) 2024-07-31 00:32:17,448 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c) 2024-07-31 00:32:17,449 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-07-31 00:32:17,449 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-07-31 00:32:17,450 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-07-31 00:32:17,450 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-07-31 00:32:17,450 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-07-31 00:32:17,450 [ scc.repo] DEBUG ## PRs found: 2024-07-31 00:32:17,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None 2024-07-31 00:32:18,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/290 HTTP/1.1" 200 None 2024-07-31 00:32:18,289 [ scc.repo] DEBUG # ... Include label: dependencies 2024-07-31 00:32:18,290 [ scc.repo] DEBUG - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`' 2024-07-31 00:32:18,290 [ scc.repo] DEBUG ## Branches found: 2024-07-31 00:32:18,290 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:32:18,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:18,294 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-31 00:32:18,298 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-31 00:32:18,298 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-31 00:32:18,302 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-31 00:32:18,305 [ scc.git] DEBUG Already up to date. 2024-07-31 00:32:18,306 [ scc.git] DEBUG Calling 'git fetch origin pull/290/head' 2024-07-31 00:32:18,604 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild 2024-07-31 00:32:18,604 [ scc.git] DEBUG * branch refs/pull/290/head -> FETCH_HEAD 2024-07-31 00:32:18,611 [ scc.git] DEBUG ## Unique users: [] 2024-07-31 00:32:18,611 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:32:18,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:18,615 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...43005729b7a6c8fd86894b00183ee7806d5fec7e' 2024-07-31 00:32:18,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:18,624 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 290 (Bump omero-web from `ba8c7e2` to `7cd445c`) 43005729b7a6c8fd86894b00183ee7806d5fec7e' 2024-07-31 00:32:18,635 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:32:18,637 [ scc.git] DEBUG omero-web | 2 +- 2024-07-31 00:32:18,638 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-07-31 00:32:18,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:32:18,818 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-31 00:32:18,886 [ scc.git] DEBUG Submodule path 'omero-web': checked out '7cd445ce3cc018efb4327eac5fc74701cffdc578' 2024-07-31 00:32:18,887 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:32:18,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:18,891 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-31 00:32:19,009 [ scc.git] DEBUG has no local changes 2024-07-31 00:32:19,009 [ 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#130 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/130/)' 2024-07-31 00:32:19,035 [ scc.git] DEBUG [detached HEAD d2ab08d] merge master -Dorg -Snone 2024-07-31 00:32:19,036 [ scc.merge] INFO Repository: ome/omero-python-superbuild 2024-07-31 00:32:19,036 [ scc.merge] INFO Already up to date. 2024-07-31 00:32:19,036 [ scc.merge] INFO 2024-07-31 00:32:19,036 [ scc.merge] INFO Merged PRs: 2024-07-31 00:32:19,036 [ scc.merge] INFO - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`' 2024-07-31 00:32:19,036 [ scc.merge] INFO 2024-07-31 00:32:19,036 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-07-31 00:32:19,036 [ 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-07-31 00:32:21,297 [ scc.config] DEBUG Found github.token 2024-07-31 00:32:21,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-07-31 00:32:21,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:32:21,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:32:22,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-07-31 00:32:22,278 [ scc.gh] DEBUG 4342 remaining from 5000 (Reset at 00:07 2024-07-31 00:32:22,279 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-31 00:32:22,285 [ scc.git] DEBUG Check current status 2024-07-31 00:32:22,285 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-31 00:32:22,290 [ scc.git] DEBUG d2ab08d merge master -Dorg -Snone 2024-07-31 00:32:22,290 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-31 00:32:22,339 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-07-31 00:32:22,342 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-07-31 00:32:22,346 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac) 2024-07-31 00:32:22,351 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe) 2024-07-31 00:32:22,354 [ scc.git] DEBUG 7cd445ce3cc018efb4327eac5fc74701cffdc578 omero-web (v5.27.0-1-g7cd445ce3) 2024-07-31 00:32:22,359 [ scc.config] DEBUG Found remote.origin.url 2024-07-31 00:32:22,359 [ scc.git] DEBUG Reading repository configuration from repositories.yml 2024-07-31 00:32:22,361 [ scc.git] DEBUG Repository configuration: base-branch: master submodules: omero-scripts: base-branch: develop 2024-07-31 00:32:22,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None 2024-07-31 00:32:23,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-31 00:32:23,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-31 00:32:24,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-31 00:32:24,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-31 00:32:24,422 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-31 00:32:24,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-07-31 00:32:24,470 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-31 00:32:24,474 [ scc.git] DEBUG Check current status 2024-07-31 00:32:24,474 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-31 00:32:24,478 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0 2024-07-31 00:32:24,478 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-31 00:32:24,528 [ scc.config] DEBUG Found remote.origin.url 2024-07-31 00:32:24,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None 2024-07-31 00:32:25,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-31 00:32:25,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-31 00:32:26,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-31 00:32:26,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-31 00:32:26,532 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-31 00:32:26,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:32:26,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-07-31 00:32:26,583 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-31 00:32:26,587 [ scc.git] DEBUG Check current status 2024-07-31 00:32:26,587 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-31 00:32:26,591 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312 2024-07-31 00:32:26,592 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-31 00:32:26,639 [ scc.config] DEBUG Found remote.origin.url 2024-07-31 00:32:26,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None 2024-07-31 00:32:27,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-31 00:32:27,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-31 00:32:28,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-31 00:32:28,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-31 00:32:28,655 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-31 00:32:28,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:32:28,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-07-31 00:32:28,705 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-31 00:32:28,709 [ scc.git] DEBUG Check current status 2024-07-31 00:32:28,709 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-31 00:32:28,712 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0 2024-07-31 00:32:28,713 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-31 00:32:28,752 [ scc.config] DEBUG Found remote.origin.url 2024-07-31 00:32:29,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None 2024-07-31 00:32:29,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-31 00:32:29,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-31 00:32:30,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-31 00:32:30,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-31 00:32:30,783 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-31 00:32:30,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:32:30,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-07-31 00:32:30,823 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-31 00:32:30,827 [ scc.git] DEBUG Check current status 2024-07-31 00:32:30,828 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-31 00:32:30,832 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0 2024-07-31 00:32:30,833 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-31 00:32:30,889 [ scc.config] DEBUG Found remote.origin.url 2024-07-31 00:32:30,890 [ scc.git] DEBUG Repository configuration: base-branch: develop 2024-07-31 00:32:31,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None 2024-07-31 00:32:31,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-31 00:32:32,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-31 00:32:32,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-31 00:32:32,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-31 00:32:32,910 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-31 00:32:32,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:32:32,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-07-31 00:32:32,956 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-31 00:32:32,960 [ scc.git] DEBUG Check current status 2024-07-31 00:32:32,960 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-31 00:32:32,964 [ scc.git] DEBUG 7cd445ce3 Bump version: 5.27.0 → 5.27.1.dev0 2024-07-31 00:32:32,964 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-31 00:32:33,005 [ scc.config] DEBUG Found remote.origin.url 2024-07-31 00:32:33,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None 2024-07-31 00:32:33,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-31 00:32:34,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-31 00:32:34,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-31 00:32:34,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-31 00:32:34,968 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-31 00:32:35,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:32:35,010 [ scc.git] DEBUG Resetting... 2024-07-31 00:32:35,010 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-07-31 00:32:35,016 [ scc.git] DEBUG HEAD is now at d2ab08d merge master -Dorg -Snone 2024-07-31 00:32:35,017 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-07-31 00:32:35,068 [ scc.git] DEBUG Check current status 2024-07-31 00:32:35,069 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-31 00:32:35,074 [ scc.git] DEBUG d2ab08d merge master -Dorg -Snone 2024-07-31 00:32:35,074 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-31 00:32:35,116 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-07-31 00:32:35,119 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-07-31 00:32:35,122 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac) 2024-07-31 00:32:35,126 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe) 2024-07-31 00:32:35,129 [ scc.git] DEBUG 7cd445ce3cc018efb4327eac5fc74701cffdc578 omero-web (v5.27.0-1-g7cd445ce3) 2024-07-31 00:32:35,130 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-07-31 00:32:35,130 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-07-31 00:32:35,131 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-07-31 00:32:35,131 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-07-31 00:32:35,131 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-07-31 00:32:35,131 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-07-31 00:32:35,131 [ scc.repo] DEBUG ## PRs found: 2024-07-31 00:32:35,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None 2024-07-31 00:32:35,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/290 HTTP/1.1" 200 None 2024-07-31 00:32:35,853 [ scc.repo] DEBUG # ... Include label: dependencies 2024-07-31 00:32:36,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e HTTP/1.1" 200 None 2024-07-31 00:32:36,831 [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-07-31 00:32:37,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e HTTP/1.1" 200 None 2024-07-31 00:32:37,685 [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-07-31 00:32:37,686 [ scc.repo] DEBUG - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`' 2024-07-31 00:32:37,686 [ scc.repo] DEBUG ## Branches found: 2024-07-31 00:32:37,686 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:32:37,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:37,690 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-31 00:32:37,693 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-31 00:32:37,694 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-31 00:32:37,697 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-31 00:32:37,701 [ scc.git] DEBUG Already up to date. 2024-07-31 00:32:37,701 [ scc.git] DEBUG Calling 'git fetch origin pull/290/head' 2024-07-31 00:32:38,016 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild 2024-07-31 00:32:38,016 [ scc.git] DEBUG * branch refs/pull/290/head -> FETCH_HEAD 2024-07-31 00:32:38,021 [ scc.git] DEBUG ## Unique users: [] 2024-07-31 00:32:38,021 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:32:38,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:38,025 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...43005729b7a6c8fd86894b00183ee7806d5fec7e' 2024-07-31 00:32:38,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:38,032 [ 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-07-31 00:32:38,035 [ scc.git] DEBUG Already up to date. 2024-07-31 00:32:38,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:32:38,167 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-31 00:32:38,211 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:32:38,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:38,215 [ scc.repo] DEBUG ## PRs found: 2024-07-31 00:32:38,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None 2024-07-31 00:32:39,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None 2024-07-31 00:32:39,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None 2024-07-31 00:32:40,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None 2024-07-31 00:32:40,636 [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-07-31 00:32:41,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None 2024-07-31 00:32:41,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2 2024-07-31 00:32:41,565 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist' 2024-07-31 00:32:41,565 [ scc.repo] DEBUG ## Branches found: 2024-07-31 00:32:41,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-07-31 00:32:41,566 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:32:41,566 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:41,570 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-31 00:32:41,573 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-31 00:32:41,573 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-31 00:32:41,577 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-31 00:32:41,581 [ scc.git] DEBUG Already up to date. 2024-07-31 00:32:41,581 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head' 2024-07-31 00:32:41,900 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox 2024-07-31 00:32:41,901 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD 2024-07-31 00:32:41,905 [ scc.git] DEBUG ## Unique users: [] 2024-07-31 00:32:41,905 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:32:41,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:41,909 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452' 2024-07-31 00:32:41,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:41,917 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452' 2024-07-31 00:32:41,992 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py 2024-07-31 00:32:41,992 [ scc.git] DEBUG Auto-merging src/fsDirectory.py 2024-07-31 00:32:41,992 [ scc.git] DEBUG Auto-merging src/fsDropBox.py 2024-07-31 00:32:41,992 [ scc.git] DEBUG Auto-merging src/fsLists.py 2024-07-31 00:32:41,992 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py 2024-07-31 00:32:41,992 [ scc.git] DEBUG Auto-merging src/fsMonitor.py 2024-07-31 00:32:41,992 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py 2024-07-31 00:32:41,992 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py 2024-07-31 00:32:41,992 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py 2024-07-31 00:32:41,992 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:32:41,996 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++--- 2024-07-31 00:32:41,996 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++-------------------- 2024-07-31 00:32:41,996 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++----------- 2024-07-31 00:32:41,996 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------ 2024-07-31 00:32:41,996 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++----- 2024-07-31 00:32:41,996 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++----------- 2024-07-31 00:32:41,996 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++----- 2024-07-31 00:32:41,996 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++---- 2024-07-31 00:32:41,998 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++--------- 2024-07-31 00:32:41,998 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-) 2024-07-31 00:32:42,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:32:42,126 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-31 00:32:42,166 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:32:42,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:42,170 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-31 00:32:42,211 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-31 00:32:42,216 [ scc.git] DEBUG has no local changes 2024-07-31 00:32:42,217 [ 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#130 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/130/)' 2024-07-31 00:32:42,225 [ scc.git] DEBUG [detached HEAD 3e126ac] merge master -Dorg -Ssuccess-only 2024-07-31 00:32:42,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:32:42,226 [ scc.repo] DEBUG ## PRs found: 2024-07-31 00:32:42,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None 2024-07-31 00:32:43,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None 2024-07-31 00:32:43,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None 2024-07-31 00:32:44,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None 2024-07-31 00:32:44,808 [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-07-31 00:32:45,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None 2024-07-31 00:32:45,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2 2024-07-31 00:32:45,656 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None' 2024-07-31 00:32:46,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None 2024-07-31 00:32:46,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None 2024-07-31 00:32:47,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None 2024-07-31 00:32:47,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None 2024-07-31 00:32:47,525 [ scc.repo] DEBUG ## Branches found: 2024-07-31 00:32:47,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-07-31 00:32:47,525 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:32:47,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:47,529 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-31 00:32:47,534 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-31 00:32:47,534 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-31 00:32:47,539 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-31 00:32:47,544 [ scc.git] DEBUG Already up to date. 2024-07-31 00:32:47,544 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-07-31 00:32:47,932 [ scc.git] DEBUG From https://github.com/ome/omero-marshal 2024-07-31 00:32:47,932 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-07-31 00:32:47,936 [ scc.git] DEBUG ## Unique users: [] 2024-07-31 00:32:47,936 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:32:47,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:47,940 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca' 2024-07-31 00:32:47,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:47,948 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca' 2024-07-31 00:32:47,959 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py 2024-07-31 00:32:47,960 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:32:47,963 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++-- 2024-07-31 00:32:47,963 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++- 2024-07-31 00:32:47,963 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-) 2024-07-31 00:32:48,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:32:48,104 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-31 00:32:48,140 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:32:48,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:32:48,144 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-31 00:32:48,180 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-31 00:32:48,185 [ scc.git] DEBUG has no local changes 2024-07-31 00:32:48,185 [ 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#130 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/130/)' 2024-07-31 00:32:48,193 [ scc.git] DEBUG [detached HEAD 99c71a0] merge master -Dorg -Ssuccess-only 2024-07-31 00:32:48,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:32:48,194 [ scc.repo] DEBUG ## PRs found: 2024-07-31 00:32:48,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None 2024-07-31 00:32:49,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None 2024-07-31 00:32:49,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None 2024-07-31 00:32:50,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-07-31 00:32:50,802 [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-07-31 00:32:51,266 [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-07-31 00:32:51,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-07-31 00:32:52,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None 2024-07-31 00:32:52,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-07-31 00:32:53,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None 2024-07-31 00:32:53,178 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method' 2024-07-31 00:32:53,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None 2024-07-31 00:32:54,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None 2024-07-31 00:32:54,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None 2024-07-31 00:32:55,101 [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-07-31 00:32:55,576 [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-07-31 00:32:56,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None 2024-07-31 00:32:56,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-07-31 00:32:56,994 [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-07-31 00:32:57,469 [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-07-31 00:32:58,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-07-31 00:32:58,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None 2024-07-31 00:32:58,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-07-31 00:32:59,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None 2024-07-31 00:32:59,294 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command' 2024-07-31 00:32:59,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None 2024-07-31 00:32:59,774 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-07-31 00:33:00,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None 2024-07-31 00:33:00,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None 2024-07-31 00:33:01,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None 2024-07-31 00:33:01,679 [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-07-31 00:33:02,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None 2024-07-31 00:33:02,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2 2024-07-31 00:33:02,582 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs' 2024-07-31 00:33:03,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None 2024-07-31 00:33:03,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None 2024-07-31 00:33:03,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-07-31 00:33:04,482 [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-07-31 00:33:04,944 [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-07-31 00:33:05,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-07-31 00:33:05,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None 2024-07-31 00:33:06,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-07-31 00:33:06,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None 2024-07-31 00:33:06,827 [ scc.repo] DEBUG - PR 332 jburel 'Build conda' 2024-07-31 00:33:07,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None 2024-07-31 00:33:07,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None 2024-07-31 00:33:08,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None 2024-07-31 00:33:08,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None 2024-07-31 00:33:09,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None 2024-07-31 00:33:09,658 [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-07-31 00:33:10,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None 2024-07-31 00:33:10,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2 2024-07-31 00:33:10,481 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj' 2024-07-31 00:33:10,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None 2024-07-31 00:33:11,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None 2024-07-31 00:33:11,866 [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-07-31 00:33:12,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None 2024-07-31 00:33:12,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2 2024-07-31 00:33:12,686 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins' 2024-07-31 00:33:13,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None 2024-07-31 00:33:13,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None 2024-07-31 00:33:14,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None 2024-07-31 00:33:14,737 [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-07-31 00:33:15,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None 2024-07-31 00:33:15,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2 2024-07-31 00:33:15,682 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error' 2024-07-31 00:33:16,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None 2024-07-31 00:33:16,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None 2024-07-31 00:33:17,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None 2024-07-31 00:33:17,581 [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-07-31 00:33:18,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None 2024-07-31 00:33:18,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2 2024-07-31 00:33:18,508 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group' 2024-07-31 00:33:18,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None 2024-07-31 00:33:19,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None 2024-07-31 00:33:19,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None 2024-07-31 00:33:20,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None 2024-07-31 00:33:20,336 [ scc.repo] DEBUG ## Branches found: 2024-07-31 00:33:20,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-07-31 00:33:20,337 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:33:20,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:20,343 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-31 00:33:20,348 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-31 00:33:20,348 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-31 00:33:20,353 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-31 00:33:20,360 [ scc.git] DEBUG Already up to date. 2024-07-31 00:33:20,361 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head' 2024-07-31 00:33:21,106 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-07-31 00:33:21,107 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD 2024-07-31 00:33:21,111 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head' 2024-07-31 00:33:21,475 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-07-31 00:33:21,475 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD 2024-07-31 00:33:21,481 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head' 2024-07-31 00:33:21,800 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-07-31 00:33:21,801 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD 2024-07-31 00:33:21,808 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head' 2024-07-31 00:33:22,125 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-07-31 00:33:22,126 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD 2024-07-31 00:33:22,131 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head' 2024-07-31 00:33:22,474 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-07-31 00:33:22,475 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD 2024-07-31 00:33:22,479 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head' 2024-07-31 00:33:23,209 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-07-31 00:33:23,210 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD 2024-07-31 00:33:23,215 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head' 2024-07-31 00:33:23,517 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-07-31 00:33:23,517 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD 2024-07-31 00:33:23,521 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head' 2024-07-31 00:33:23,863 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-07-31 00:33:23,863 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD 2024-07-31 00:33:23,868 [ scc.git] DEBUG ## Unique users: [] 2024-07-31 00:33:23,869 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:33:23,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:23,873 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec' 2024-07-31 00:33:23,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:23,888 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec' 2024-07-31 00:33:23,932 [ scc.git] DEBUG Auto-merging src/omero/cli.py 2024-07-31 00:33:23,932 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py 2024-07-31 00:33:23,933 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:33:23,939 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++ 2024-07-31 00:33:23,939 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++--- 2024-07-31 00:33:23,939 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-) 2024-07-31 00:33:24,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:24,087 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb' 2024-07-31 00:33:24,098 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:24,103 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb' 2024-07-31 00:33:24,234 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py 2024-07-31 00:33:24,234 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py 2024-07-31 00:33:24,234 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:33:24,242 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------ 2024-07-31 00:33:24,242 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++ 2024-07-31 00:33:24,242 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-) 2024-07-31 00:33:24,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:24,467 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f' 2024-07-31 00:33:24,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:24,483 [ 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-07-31 00:33:24,562 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py 2024-07-31 00:33:24,562 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:33:24,565 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++---- 2024-07-31 00:33:24,566 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-) 2024-07-31 00:33:24,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:24,851 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a' 2024-07-31 00:33:24,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:24,867 [ 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-07-31 00:33:24,958 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py 2024-07-31 00:33:24,958 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py 2024-07-31 00:33:24,960 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:33:24,965 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++- 2024-07-31 00:33:24,965 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +- 2024-07-31 00:33:24,965 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-) 2024-07-31 00:33:25,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:25,251 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc' 2024-07-31 00:33:25,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:25,267 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc' 2024-07-31 00:33:25,299 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:33:25,302 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++ 2024-07-31 00:33:25,302 [ scc.git] DEBUG connect.py | 11 +++++++++++ 2024-07-31 00:33:25,302 [ scc.git] DEBUG 2 files changed, 48 insertions(+) 2024-07-31 00:33:25,302 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml 2024-07-31 00:33:25,302 [ scc.git] DEBUG create mode 100644 connect.py 2024-07-31 00:33:25,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:25,652 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5' 2024-07-31 00:33:25,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:25,668 [ 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-07-31 00:33:25,765 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py 2024-07-31 00:33:25,766 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:33:25,769 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++ 2024-07-31 00:33:25,769 [ scc.git] DEBUG 1 file changed, 2 insertions(+) 2024-07-31 00:33:26,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:26,044 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023' 2024-07-31 00:33:26,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:26,060 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023' 2024-07-31 00:33:26,117 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py 2024-07-31 00:33:26,117 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:33:26,121 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++-- 2024-07-31 00:33:26,121 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-) 2024-07-31 00:33:26,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:26,432 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804' 2024-07-31 00:33:26,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:26,448 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804' 2024-07-31 00:33:26,501 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py 2024-07-31 00:33:26,502 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:33:26,509 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------ 2024-07-31 00:33:26,509 [ scc.git] DEBUG 1 file changed, 36 deletions(-) 2024-07-31 00:33:26,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:26,820 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-31 00:33:26,865 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:33:26,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:26,872 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-31 00:33:26,917 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-31 00:33:26,930 [ scc.git] DEBUG has no local changes 2024-07-31 00:33:26,930 [ 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' Generated by OMERO-python-superbuild-push#130 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/130/)' 2024-07-31 00:33:26,944 [ scc.git] DEBUG [detached HEAD eb9b350e] merge master -Dorg -Ssuccess-only 2024-07-31 00:33:26,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:33:26,944 [ scc.git] INFO Overriding base-branch from master to develop 2024-07-31 00:33:26,945 [ scc.repo] DEBUG ## PRs found: 2024-07-31 00:33:27,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None 2024-07-31 00:33:27,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None 2024-07-31 00:33:28,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None 2024-07-31 00:33:29,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None 2024-07-31 00:33:29,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None 2024-07-31 00:33:29,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None 2024-07-31 00:33:30,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None 2024-07-31 00:33:30,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-07-31 00:33:31,361 [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-07-31 00:33:31,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-07-31 00:33:32,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2 2024-07-31 00:33:32,294 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-07-31 00:33:32,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None 2024-07-31 00:33:33,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None 2024-07-31 00:33:33,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None 2024-07-31 00:33:34,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None 2024-07-31 00:33:34,187 [ scc.repo] DEBUG ## Branches found: 2024-07-31 00:33:34,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-07-31 00:33:34,187 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:33:34,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:34,192 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop' 2024-07-31 00:33:34,197 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-31 00:33:34,197 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop' 2024-07-31 00:33:34,202 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop' 2024-07-31 00:33:34,206 [ scc.git] DEBUG Already up to date. 2024-07-31 00:33:34,207 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head' 2024-07-31 00:33:34,681 [ scc.git] DEBUG From https://github.com/ome/omero-scripts 2024-07-31 00:33:34,681 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD 2024-07-31 00:33:34,685 [ scc.git] DEBUG ## Unique users: [] 2024-07-31 00:33:34,685 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:33:34,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:34,715 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-07-31 00:33:34,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:34,728 [ 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-07-31 00:33:34,782 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py 2024-07-31 00:33:34,782 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py 2024-07-31 00:33:34,783 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-07-31 00:33:34,783 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-07-31 00:33:34,788 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0' 2024-07-31 00:33:34,795 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0 2024-07-31 00:33:34,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:34,928 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-07-31 00:33:34,935 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0' 2024-07-31 00:33:34,940 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' Conflicting PR. Removed from build [OMERO-python-superbuild-push#130](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/130/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/130/consoleText) for more details. Possible conflicts: - Upstream changes - omero/annotation_scripts/KeyVal_to_csv.py --conflicts 2024-07-31 00:33:34,945 [ scc.config] DEBUG Found github.token 2024-07-31 00:33:34,945 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts. 2024-07-31 00:33:34,945 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-31 00:33:34,988 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:33:34,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:34,993 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-31 00:33:35,036 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-31 00:33:35,042 [ scc.git] DEBUG has no local changes 2024-07-31 00:33:35,043 [ 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#130 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/130/)' 2024-07-31 00:33:35,057 [ scc.git] DEBUG [detached HEAD fb2ad4d] merge master -Dorg -Ssuccess-only 2024-07-31 00:33:35,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:33:35,058 [ scc.repo] DEBUG ## PRs found: 2024-07-31 00:33:35,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None 2024-07-31 00:33:35,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None 2024-07-31 00:33:36,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None 2024-07-31 00:33:36,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None 2024-07-31 00:33:37,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None 2024-07-31 00:33:37,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None 2024-07-31 00:33:38,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None 2024-07-31 00:33:38,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-07-31 00:33:39,341 [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-07-31 00:33:39,860 [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-07-31 00:33:40,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-07-31 00:33:40,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None 2024-07-31 00:33:41,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-07-31 00:33:41,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None 2024-07-31 00:33:41,601 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' 2024-07-31 00:33:42,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None 2024-07-31 00:33:42,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None 2024-07-31 00:33:43,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-07-31 00:33:43,569 [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-07-31 00:33:44,018 [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-07-31 00:33:44,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-07-31 00:33:44,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None 2024-07-31 00:33:45,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-07-31 00:33:45,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None 2024-07-31 00:33:45,789 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test' 2024-07-31 00:33:46,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None 2024-07-31 00:33:46,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None 2024-07-31 00:33:47,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None 2024-07-31 00:33:47,838 [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-07-31 00:33:48,334 [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-07-31 00:33:48,336 [ scc.repo] DEBUG ## Branches found: 2024-07-31 00:33:48,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-07-31 00:33:48,337 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:33:48,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:48,342 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-31 00:33:48,346 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-31 00:33:48,346 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-31 00:33:48,351 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-31 00:33:48,356 [ scc.git] DEBUG Already up to date. 2024-07-31 00:33:48,356 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head' 2024-07-31 00:33:48,789 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-07-31 00:33:48,789 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD 2024-07-31 00:33:48,794 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head' 2024-07-31 00:33:49,123 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-07-31 00:33:49,123 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD 2024-07-31 00:33:49,127 [ scc.git] DEBUG ## Unique users: [] 2024-07-31 00:33:49,128 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:33:49,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:49,132 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767' 2024-07-31 00:33:49,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:49,143 [ 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-07-31 00:33:49,194 [ scc.git] DEBUG Auto-merging omeroweb/settings.py 2024-07-31 00:33:49,195 [ scc.git] DEBUG Auto-merging setup.py 2024-07-31 00:33:49,196 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:33:49,199 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++- 2024-07-31 00:33:49,200 [ scc.git] DEBUG setup.py | 1 + 2024-07-31 00:33:49,200 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-) 2024-07-31 00:33:49,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:49,340 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005' 2024-07-31 00:33:49,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:49,355 [ 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-07-31 00:33:49,378 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py 2024-07-31 00:33:49,378 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py 2024-07-31 00:33:49,379 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-31 00:33:49,383 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +- 2024-07-31 00:33:49,383 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++-- 2024-07-31 00:33:49,383 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-) 2024-07-31 00:33:49,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:49,722 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-31 00:33:49,759 [ scc.git] DEBUG Get sha1 of %s 2024-07-31 00:33:49,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-31 00:33:49,764 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-31 00:33:49,801 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-31 00:33:49,812 [ scc.git] DEBUG has no local changes 2024-07-31 00:33:49,812 [ 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#130 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/130/)' 2024-07-31 00:33:49,824 [ scc.git] DEBUG [detached HEAD b1181b2ba] merge master -Dorg -Ssuccess-only 2024-07-31 00:33:49,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:33:49,825 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-31 00:33:49,875 [ scc.config] DEBUG Found submodule.omero-dropbox.url 2024-07-31 00:33:50,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:50,124 [ scc.config] DEBUG Found submodule.omero-marshal.url 2024-07-31 00:33:50,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:50,518 [ scc.config] DEBUG Found submodule.omero-py.url 2024-07-31 00:33:50,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:50,901 [ scc.config] DEBUG Found submodule.omero-scripts.url 2024-07-31 00:33:51,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:51,277 [ scc.config] DEBUG Found submodule.omero-web.url 2024-07-31 00:33:51,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-31 00:33:51,652 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-31 00:33:51,681 [ scc.git] DEBUG has local changes 2024-07-31 00:33:51,681 [ 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' 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#130 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/130/)' 2024-07-31 00:33:51,690 [ scc.git] DEBUG [detached HEAD a463822] merge master -Dorg -Ssuccess-only 2024-07-31 00:33:51,691 [ scc.merge] INFO Repository: ome/omero-python-superbuild 2024-07-31 00:33:51,691 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-) 2024-07-31 00:33:51,691 [ scc.merge] INFO Already up to date. 2024-07-31 00:33:51,691 [ scc.merge] INFO 2024-07-31 00:33:51,691 [ scc.merge] INFO Merged PRs: 2024-07-31 00:33:51,691 [ scc.merge] INFO - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`' 2024-07-31 00:33:51,691 [ scc.merge] INFO 2024-07-31 00:33:51,691 [ scc.merge] INFO Repository: ome/omero-dropbox 2024-07-31 00:33:51,691 [ scc.merge] INFO Already up to date. 2024-07-31 00:33:51,691 [ scc.merge] INFO 2024-07-31 00:33:51,691 [ scc.merge] INFO Merged PRs: 2024-07-31 00:33:51,691 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist' 2024-07-31 00:33:51,691 [ scc.merge] INFO 2024-07-31 00:33:51,691 [ scc.merge] INFO Repository: ome/omero-marshal 2024-07-31 00:33:51,692 [ scc.merge] INFO Excluded PRs: 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment) 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment) 2024-07-31 00:33:51,692 [ scc.merge] INFO Already up to date. 2024-07-31 00:33:51,692 [ scc.merge] INFO 2024-07-31 00:33:51,692 [ scc.merge] INFO Merged PRs: 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None' 2024-07-31 00:33:51,692 [ scc.merge] INFO 2024-07-31 00:33:51,692 [ scc.merge] INFO Repository: ome/omero-py 2024-07-31 00:33:51,692 [ scc.merge] INFO Excluded PRs: 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure) 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude) 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn) 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft) 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment) 2024-07-31 00:33:51,692 [ scc.merge] INFO Already up to date. 2024-07-31 00:33:51,692 [ scc.merge] INFO 2024-07-31 00:33:51,692 [ scc.merge] INFO Merged PRs: 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group' 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error' 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins' 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj' 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 332 jburel 'Build conda' 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs' 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command' 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method' 2024-07-31 00:33:51,692 [ scc.merge] INFO 2024-07-31 00:33:51,692 [ scc.merge] INFO Repository: ome/omero-scripts 2024-07-31 00:33:51,692 [ scc.merge] INFO Excluded PRs: 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT) 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier) 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn) 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment) 2024-07-31 00:33:51,692 [ scc.merge] INFO Already up to date. 2024-07-31 00:33:51,692 [ scc.merge] INFO 2024-07-31 00:33:51,692 [ scc.merge] INFO Conflicting PRs (not included): 2024-07-31 00:33:51,692 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-07-31 00:33:51,692 [ scc.merge] INFO 2024-07-31 00:33:51,693 [ scc.merge] INFO Repository: ome/omero-web 2024-07-31 00:33:51,693 [ scc.merge] INFO Excluded PRs: 2024-07-31 00:33:51,693 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT) 2024-07-31 00:33:51,693 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft) 2024-07-31 00:33:51,693 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure) 2024-07-31 00:33:51,693 [ scc.merge] INFO Already up to date. 2024-07-31 00:33:51,693 [ scc.merge] INFO 2024-07-31 00:33:51,693 [ scc.merge] INFO Merged PRs: 2024-07-31 00:33:51,693 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test' 2024-07-31 00:33:51,693 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' 2024-07-31 00:33:51,693 [ scc.merge] INFO 2024-07-31 00:33:51,693 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-07-31 00:33:51,693 [ scc.git] DEBUG Calling 'git remote' 2024-07-31 00:33:51,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-07-31 00:33:51,697 [ scc.git] DEBUG Calling 'git remote' 2024-07-31 00:33:51,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:33:51,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-07-31 00:33:51,701 [ scc.git] DEBUG Calling 'git remote' 2024-07-31 00:33:51,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:33:51,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-07-31 00:33:51,705 [ scc.git] DEBUG Calling 'git remote' 2024-07-31 00:33:51,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:33:51,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-07-31 00:33:51,709 [ scc.git] DEBUG Calling 'git remote' 2024-07-31 00:33:51,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-07-31 00:33:51,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-07-31 00:33:51,713 [ scc.git] DEBUG Calling 'git remote' 2024-07-31 00:33:51,716 [ 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 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 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-07-31 00:34:19,971 [ 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