![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
Started by upstream project "Trigger" build number 187 originally caused by: Started by user devspace [Pipeline] Start of Pipeline [Pipeline] node Running on testintegration in /home/omero/workspace/OMERO-python-superbuild-push [Pipeline] { [Pipeline] library Loading library recursiveMerge@master Attempting to resolve master from remote references... > git --version # timeout=10 > git --version # 'git version 2.39.2' > git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Found match: refs/heads/master revision f061dff15033c5cd55249a383f52c15ca4a0e5cf The recommended git tool is: NONE No credentials specified > git rev-parse --resolve-git-dir /var/jenkins_home/jobs/OMERO-python-superbuild-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Fetching without tags Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git > git --version # timeout=10 > git --version # 'git version 2.39.2' > git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master) > git config core.sparsecheckout # timeout=10 > git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 Commit message: "Merge pull request #17 from jburel/python3" > git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 [Pipeline] checkout The recommended git tool is: NONE No credentials specified Fetching changes from the remote Git repository Checking out Revision 18cc8a4949001c5ff23dababa2232f564d7c74e6 (refs/remotes/origin/master) > git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-python-superbuild-push/.git # timeout=10 > git config remote.origin.url https://github.com/ome/omero-python-superbuild.git # timeout=10 Fetching upstream changes from https://github.com/ome/omero-python-superbuild.git > git --version # timeout=10 > git --version # 'git version 2.39.3' > git fetch --tags --force --progress -- https://github.com/ome/omero-python-superbuild.git +refs/heads/*:refs/remotes/origin/* # timeout=10 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f 18cc8a4949001c5ff23dababa2232f564d7c74e6 # timeout=10 Commit message: "Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe" > git rev-list --no-walk 18cc8a4949001c5ff23dababa2232f564d7c74e6 # timeout=10 Cleaning workspace > git rev-parse --verify HEAD # timeout=10 Resetting working tree > git reset --hard # timeout=10 > git clean -fdx # timeout=10 > git submodule foreach --recursive git reset --hard # timeout=10 > git submodule foreach --recursive git clean -fdx # timeout=10 > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule init # timeout=10 > git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10 > git config --get submodule.omero-py.url # timeout=10 > git config -f .gitmodules --get submodule.omero-py.path # timeout=10 > git config --get submodule.omero-web.url # timeout=10 > git config -f .gitmodules --get submodule.omero-web.path # timeout=10 > git config --get submodule.omero-marshal.url # timeout=10 > git config -f .gitmodules --get submodule.omero-marshal.path # timeout=10 > git config --get submodule.omero-dropbox.url # timeout=10 > git config -f .gitmodules --get submodule.omero-dropbox.path # timeout=10 > git config --get submodule.omero-scripts.url # timeout=10 > git config -f .gitmodules --get submodule.omero-scripts.path # timeout=10 > git submodule update --init --recursive omero-py # timeout=10 > git submodule update --init --recursive omero-web # timeout=10 [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-build-push" build number 164 [Pipeline] sh > git submodule update --init --recursive omero-marshal # timeout=10 > git submodule update --init --recursive omero-dropbox # timeout=10 > git submodule update --init --recursive omero-scripts # timeout=10 + pushd build ~/workspace/OMERO-python-superbuild-push/build ~/workspace/OMERO-python-superbuild-push + curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz + tar -zxf - + popd ~/workspace/OMERO-python-superbuild-push + python3 -m venv build/venv + . build/venv/bin/activate ++ deactivate nondestructive ++ '[' -n '' ']' ++ '[' -n '' ']' ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r ++ '[' -n '' ']' ++ unset VIRTUAL_ENV ++ '[' '!' nondestructive = nondestructive ']' ++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv ++ export VIRTUAL_ENV ++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ export PATH ++ '[' -n '' ']' ++ '[' -z '' ']' ++ _OLD_VIRTUAL_PS1= ++ PS1='(venv) ' ++ export PS1 ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r + python3 -m pip install -U pip Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3) Collecting pip Using cached pip-24.2-py3-none-any.whl (1.8 MB) Installing collected packages: pip Attempting uninstall: pip Found existing installation: pip 21.2.3 Uninstalling pip-21.2.3: Successfully uninstalled pip-21.2.3 Successfully installed pip-24.2 + python3 -m pip install scc Collecting scc Using cached scc-0.20.0-py3-none-any.whl.metadata (3.6 kB) Collecting PyGithub>=1.54 (from scc) Using cached PyGithub-2.4.0-py3-none-any.whl.metadata (3.9 kB) Collecting PyYAML>=5.1 (from scc) Using cached PyYAML-6.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.1 kB) Collecting future (from scc) Using cached future-1.0.0-py3-none-any.whl.metadata (4.0 kB) Collecting ruamel.yaml (from scc) Using cached ruamel.yaml-0.18.6-py3-none-any.whl.metadata (23 kB) Collecting ruamel.yaml.jinja2 (from scc) Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl.metadata (2.9 kB) Collecting six (from scc) Using cached six-1.16.0-py2.py3-none-any.whl.metadata (1.8 kB) Collecting urllib3<2 (from scc) Using cached urllib3-1.26.19-py2.py3-none-any.whl.metadata (49 kB) Collecting yaclifw<0.3,>=0.2.0 (from scc) Using cached yaclifw-0.2.0-py3-none-any.whl Collecting pynacl>=1.4.0 (from PyGithub>=1.54->scc) Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl.metadata (8.6 kB) Collecting requests>=2.14.0 (from PyGithub>=1.54->scc) Using cached requests-2.32.3-py3-none-any.whl.metadata (4.6 kB) Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached PyJWT-2.9.0-py3-none-any.whl.metadata (3.0 kB) Collecting typing-extensions>=4.0.0 (from PyGithub>=1.54->scc) Using cached typing_extensions-4.12.2-py3-none-any.whl.metadata (3.0 kB) Collecting Deprecated (from PyGithub>=1.54->scc) Using cached Deprecated-1.2.14-py2.py3-none-any.whl.metadata (5.4 kB) Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc) Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl.metadata (2.2 kB) Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached cryptography-43.0.0-cp39-abi3-manylinux_2_28_x86_64.whl.metadata (5.4 kB) Collecting cffi>=1.4.1 (from pynacl>=1.4.0->PyGithub>=1.54->scc) Using cached cffi-1.17.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.8-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.4.0-py3-none-any.whl (362 kB) Using cached PyYAML-6.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (737 kB) Using cached urllib3-1.26.19-py2.py3-none-any.whl (143 kB) Using cached future-1.0.0-py3-none-any.whl (491 kB) Using cached ruamel.yaml-0.18.6-py3-none-any.whl (117 kB) Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB) Using cached six-1.16.0-py2.py3-none-any.whl (11 kB) Using cached PyJWT-2.9.0-py3-none-any.whl (22 kB) Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl (856 kB) Using cached requests-2.32.3-py3-none-any.whl (64 kB) Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl (562 kB) Using cached typing_extensions-4.12.2-py3-none-any.whl (37 kB) Using cached Deprecated-1.2.14-py2.py3-none-any.whl (9.6 kB) Using cached certifi-2024.7.4-py3-none-any.whl (162 kB) Using cached cffi-1.17.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (444 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.8-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.4.0 PyYAML-6.0.2 certifi-2024.7.4 cffi-1.17.0 charset-normalizer-3.3.2 cryptography-43.0.0 future-1.0.0 idna-3.8 pycparser-2.22 pyjwt-2.9.0 pynacl-1.5.0 requests-2.32.3 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.8 ruamel.yaml.jinja2-0.2.7 scc-0.20.0 six-1.16.0 typing-extensions-4.12.2 urllib3-1.26.19 wrapt-1.16.0 yaclifw-0.2.0 [Pipeline] sh + export BASE_REPO=omero-python-superbuild.git + BASE_REPO=omero-python-superbuild.git + export BASE_BRANCH=master + BASE_BRANCH=master + export VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv + VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv + . build/venv/bin/activate ++ deactivate nondestructive ++ '[' -n '' ']' ++ '[' -n '' ']' ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r ++ '[' -n '' ']' ++ unset VIRTUAL_ENV ++ '[' '!' nondestructive = nondestructive ']' ++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv ++ export VIRTUAL_ENV ++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ export PATH ++ '[' -n '' ']' ++ '[' -z '' ']' ++ _OLD_VIRTUAL_PS1= ++ PS1='(venv) ' ++ export PS1 ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r + '[' merge_ci '!=' null ']' + export PUSH_BRANCH=merge_ci + PUSH_BRANCH=merge_ci + '[' null '!=' null ']' + export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment' + STATUS=success-only + MERGE_OPTIONS='-vvv --no-ask --reset --comment' + bash build/build-infra-master/recursive-merge Merge base repository (no submodule updates) 2024-08-27 17:24:49,141 [ scc.config] DEBUG Found github.token 2024-08-27 17:24:49,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-08-27 17:24:49,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:24:49,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:24:50,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-08-27 17:24:50,079 [ scc.gh] DEBUG 4998 remaining from 5000 (Reset at 18:08 2024-08-27 17:24:50,080 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-08-27 17:24:50,084 [ scc.git] DEBUG Check current status 2024-08-27 17:24:50,085 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-27 17:24:50,088 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe 2024-08-27 17:24:50,088 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-27 17:24:50,126 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-08-27 17:24:50,129 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-08-27 17:24:50,133 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac) 2024-08-27 17:24:50,137 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe) 2024-08-27 17:24:50,325 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c) 2024-08-27 17:24:50,329 [ scc.config] DEBUG Found remote.origin.url 2024-08-27 17:24:50,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None 2024-08-27 17:24:50,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-08-27 17:24:51,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-08-27 17:24:51,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-08-27 17:24:52,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-08-27 17:24:52,255 [ scc.git] DEBUG Resetting... 2024-08-27 17:24:52,255 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-08-27 17:24:52,261 [ scc.git] DEBUG HEAD is now at 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe 2024-08-27 17:24:52,261 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-08-27 17:24:52,318 [ scc.git] DEBUG Check current status 2024-08-27 17:24:52,318 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-27 17:24:52,322 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe 2024-08-27 17:24:52,322 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-27 17:24:52,361 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-08-27 17:24:52,364 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-08-27 17:24:52,367 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac) 2024-08-27 17:24:52,371 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe) 2024-08-27 17:24:52,376 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c) 2024-08-27 17:24:52,377 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-08-27 17:24:52,377 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-08-27 17:24:52,377 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-08-27 17:24:52,377 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-08-27 17:24:52,377 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-08-27 17:24:52,377 [ scc.repo] DEBUG ## PRs found: 2024-08-27 17:24:52,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None 2024-08-27 17:24:53,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/290 HTTP/1.1" 200 None 2024-08-27 17:24:53,283 [ scc.repo] DEBUG # ... Include label: dependencies 2024-08-27 17:24:53,283 [ scc.repo] DEBUG - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`' 2024-08-27 17:24:53,283 [ scc.repo] DEBUG ## Branches found: 2024-08-27 17:24:53,284 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:24:53,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:24:53,288 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-08-27 17:24:53,291 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-08-27 17:24:53,292 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-08-27 17:24:53,295 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-08-27 17:24:53,299 [ scc.git] DEBUG Already up to date. 2024-08-27 17:24:53,299 [ scc.git] DEBUG Calling 'git fetch origin pull/290/head' 2024-08-27 17:24:53,604 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild 2024-08-27 17:24:53,605 [ scc.git] DEBUG * branch refs/pull/290/head -> FETCH_HEAD 2024-08-27 17:24:53,609 [ scc.git] DEBUG ## Unique users: [] 2024-08-27 17:24:53,610 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:24:53,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:24:53,629 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...43005729b7a6c8fd86894b00183ee7806d5fec7e' 2024-08-27 17:24:53,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:24:53,656 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 290 (Bump omero-web from `ba8c7e2` to `7cd445c`) 43005729b7a6c8fd86894b00183ee7806d5fec7e' 2024-08-27 17:24:53,666 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:24:53,668 [ scc.git] DEBUG omero-web | 2 +- 2024-08-27 17:24:53,668 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-08-27 17:24:53,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:24:53,818 [ scc.git] DEBUG Calling 'git submodule update' 2024-08-27 17:24:53,876 [ scc.git] DEBUG Submodule path 'omero-web': checked out '7cd445ce3cc018efb4327eac5fc74701cffdc578' 2024-08-27 17:24:53,877 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:24:53,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:24:53,880 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-08-27 17:24:54,018 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2b4ef0fd00> has no local changes 2024-08-27 17:24:54,018 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/156/)' 2024-08-27 17:24:54,044 [ scc.git] DEBUG [detached HEAD 89ed3dc] merge master -Dorg -Snone 2024-08-27 17:24:54,045 [ scc.merge] INFO Repository: ome/omero-python-superbuild 2024-08-27 17:24:54,045 [ scc.merge] INFO Already up to date. 2024-08-27 17:24:54,045 [ scc.merge] INFO 2024-08-27 17:24:54,045 [ scc.merge] INFO Merged PRs: 2024-08-27 17:24:54,045 [ scc.merge] INFO - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`' 2024-08-27 17:24:54,045 [ scc.merge] INFO 2024-08-27 17:24:54,045 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-08-27 17:24:54,045 [ scc.git] DEBUG Calling 'git remote' Synchronizing submodule url for 'omero-dropbox' Synchronizing submodule url for 'omero-marshal' Synchronizing submodule url for 'omero-py' Synchronizing submodule url for 'omero-scripts' Synchronizing submodule url for 'omero-web' Merge all submodules using repository configuration: base-branch: master submodules: omero-scripts: base-branch: develop 2024-08-27 17:24:56,219 [ scc.config] DEBUG Found github.token 2024-08-27 17:24:56,222 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-08-27 17:24:56,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:24:56,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:24:57,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-08-27 17:24:57,153 [ scc.gh] DEBUG 4988 remaining from 5000 (Reset at 18:08 2024-08-27 17:24:57,153 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-08-27 17:24:57,157 [ scc.git] DEBUG Check current status 2024-08-27 17:24:57,157 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-27 17:24:57,160 [ scc.git] DEBUG 89ed3dc merge master -Dorg -Snone 2024-08-27 17:24:57,160 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-27 17:24:57,199 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-08-27 17:24:57,201 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-08-27 17:24:57,204 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac) 2024-08-27 17:24:57,208 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe) 2024-08-27 17:24:57,211 [ scc.git] DEBUG 7cd445ce3cc018efb4327eac5fc74701cffdc578 omero-web (v5.27.0-1-g7cd445ce3) 2024-08-27 17:24:57,215 [ scc.config] DEBUG Found remote.origin.url 2024-08-27 17:24:57,215 [ scc.git] DEBUG Reading repository configuration from repositories.yml 2024-08-27 17:24:57,216 [ scc.git] DEBUG Repository configuration: base-branch: master submodules: omero-scripts: base-branch: develop 2024-08-27 17:24:57,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None 2024-08-27 17:24:58,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-08-27 17:24:58,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-08-27 17:24:58,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-08-27 17:24:59,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-08-27 17:24:59,363 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-27 17:24:59,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-08-27 17:24:59,414 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-08-27 17:24:59,418 [ scc.git] DEBUG Check current status 2024-08-27 17:24:59,418 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-27 17:24:59,421 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0 2024-08-27 17:24:59,421 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-27 17:24:59,466 [ scc.config] DEBUG Found remote.origin.url 2024-08-27 17:24:59,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None 2024-08-27 17:25:00,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-08-27 17:25:00,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-08-27 17:25:01,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-08-27 17:25:01,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-08-27 17:25:01,519 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-27 17:25:01,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:25:01,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-08-27 17:25:01,556 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-08-27 17:25:01,560 [ scc.git] DEBUG Check current status 2024-08-27 17:25:01,560 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-27 17:25:01,564 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312 2024-08-27 17:25:01,564 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-27 17:25:01,605 [ scc.config] DEBUG Found remote.origin.url 2024-08-27 17:25:01,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None 2024-08-27 17:25:02,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-08-27 17:25:02,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-08-27 17:25:03,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-08-27 17:25:03,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-08-27 17:25:03,691 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-27 17:25:03,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:25:03,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-08-27 17:25:03,735 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-08-27 17:25:03,739 [ scc.git] DEBUG Check current status 2024-08-27 17:25:03,740 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-27 17:25:03,744 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0 2024-08-27 17:25:03,744 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-27 17:25:03,788 [ scc.config] DEBUG Found remote.origin.url 2024-08-27 17:25:04,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None 2024-08-27 17:25:04,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-08-27 17:25:05,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-08-27 17:25:05,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-08-27 17:25:05,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-08-27 17:25:05,836 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-27 17:25:05,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:25:05,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-08-27 17:25:05,887 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-08-27 17:25:05,893 [ scc.git] DEBUG Check current status 2024-08-27 17:25:05,894 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-27 17:25:05,912 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0 2024-08-27 17:25:05,913 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-27 17:25:05,967 [ scc.config] DEBUG Found remote.origin.url 2024-08-27 17:25:05,968 [ scc.git] DEBUG Repository configuration: base-branch: develop 2024-08-27 17:25:06,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None 2024-08-27 17:25:06,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-08-27 17:25:07,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-08-27 17:25:07,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-08-27 17:25:07,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-08-27 17:25:07,973 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-27 17:25:08,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:25:08,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-08-27 17:25:08,017 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-08-27 17:25:08,021 [ scc.git] DEBUG Check current status 2024-08-27 17:25:08,021 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-27 17:25:08,026 [ scc.git] DEBUG 7cd445ce3 Bump version: 5.27.0 → 5.27.1.dev0 2024-08-27 17:25:08,026 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-27 17:25:08,072 [ scc.config] DEBUG Found remote.origin.url 2024-08-27 17:25:08,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None 2024-08-27 17:25:08,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-08-27 17:25:09,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-08-27 17:25:09,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-08-27 17:25:10,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-08-27 17:25:10,071 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-27 17:25:10,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:25:10,111 [ scc.git] DEBUG Resetting... 2024-08-27 17:25:10,111 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-08-27 17:25:10,116 [ scc.git] DEBUG HEAD is now at 89ed3dc merge master -Dorg -Snone 2024-08-27 17:25:10,116 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-08-27 17:25:10,169 [ scc.git] DEBUG Check current status 2024-08-27 17:25:10,169 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-27 17:25:10,173 [ scc.git] DEBUG 89ed3dc merge master -Dorg -Snone 2024-08-27 17:25:10,173 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-27 17:25:10,218 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-08-27 17:25:10,221 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-08-27 17:25:10,225 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac) 2024-08-27 17:25:10,231 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe) 2024-08-27 17:25:10,234 [ scc.git] DEBUG 7cd445ce3cc018efb4327eac5fc74701cffdc578 omero-web (v5.27.0-1-g7cd445ce3) 2024-08-27 17:25:10,235 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-08-27 17:25:10,236 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-08-27 17:25:10,236 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-08-27 17:25:10,236 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-08-27 17:25:10,236 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-08-27 17:25:10,236 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-08-27 17:25:10,236 [ scc.repo] DEBUG ## PRs found: 2024-08-27 17:25:10,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None 2024-08-27 17:25:11,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/290 HTTP/1.1" 200 None 2024-08-27 17:25:11,016 [ scc.repo] DEBUG # ... Include label: dependencies 2024-08-27 17:25:11,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e HTTP/1.1" 200 None 2024-08-27 17:25:12,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:12,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e HTTP/1.1" 200 None 2024-08-27 17:25:13,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/43005729b7a6c8fd86894b00183ee7806d5fec7e?per_page=1 HTTP/1.1" 200 2 2024-08-27 17:25:13,139 [ scc.repo] DEBUG - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`' 2024-08-27 17:25:13,139 [ scc.repo] DEBUG ## Branches found: 2024-08-27 17:25:13,140 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:25:13,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:13,144 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-08-27 17:25:13,148 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-08-27 17:25:13,148 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-08-27 17:25:13,152 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-08-27 17:25:13,157 [ scc.git] DEBUG Already up to date. 2024-08-27 17:25:13,157 [ scc.git] DEBUG Calling 'git fetch origin pull/290/head' 2024-08-27 17:25:13,459 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild 2024-08-27 17:25:13,459 [ scc.git] DEBUG * branch refs/pull/290/head -> FETCH_HEAD 2024-08-27 17:25:13,464 [ scc.git] DEBUG ## Unique users: [] 2024-08-27 17:25:13,465 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:25:13,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:13,469 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...43005729b7a6c8fd86894b00183ee7806d5fec7e' 2024-08-27 17:25:13,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:13,477 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 290 (Bump omero-web from `ba8c7e2` to `7cd445c`) 43005729b7a6c8fd86894b00183ee7806d5fec7e' 2024-08-27 17:25:13,481 [ scc.git] DEBUG Already up to date. 2024-08-27 17:25:13,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:25:13,616 [ scc.git] DEBUG Calling 'git submodule update' 2024-08-27 17:25:13,672 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:25:13,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:13,676 [ scc.repo] DEBUG ## PRs found: 2024-08-27 17:25:14,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None 2024-08-27 17:25:14,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None 2024-08-27 17:25:15,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None 2024-08-27 17:25:15,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None 2024-08-27 17:25:16,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:16,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None 2024-08-27 17:25:16,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2 2024-08-27 17:25:16,950 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist' 2024-08-27 17:25:16,950 [ scc.repo] DEBUG ## Branches found: 2024-08-27 17:25:16,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-08-27 17:25:16,950 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:25:16,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:16,955 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-08-27 17:25:16,959 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-08-27 17:25:16,959 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-08-27 17:25:16,964 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-08-27 17:25:16,970 [ scc.git] DEBUG Already up to date. 2024-08-27 17:25:16,970 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head' 2024-08-27 17:25:17,336 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox 2024-08-27 17:25:17,336 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD 2024-08-27 17:25:17,342 [ scc.git] DEBUG ## Unique users: [] 2024-08-27 17:25:17,343 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:25:17,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:17,347 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452' 2024-08-27 17:25:17,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:17,358 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452' 2024-08-27 17:25:17,413 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py 2024-08-27 17:25:17,413 [ scc.git] DEBUG Auto-merging src/fsDirectory.py 2024-08-27 17:25:17,413 [ scc.git] DEBUG Auto-merging src/fsDropBox.py 2024-08-27 17:25:17,413 [ scc.git] DEBUG Auto-merging src/fsLists.py 2024-08-27 17:25:17,413 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py 2024-08-27 17:25:17,413 [ scc.git] DEBUG Auto-merging src/fsMonitor.py 2024-08-27 17:25:17,413 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py 2024-08-27 17:25:17,413 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py 2024-08-27 17:25:17,413 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py 2024-08-27 17:25:17,414 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:25:17,418 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++--- 2024-08-27 17:25:17,418 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++-------------------- 2024-08-27 17:25:17,418 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++----------- 2024-08-27 17:25:17,418 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------ 2024-08-27 17:25:17,418 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++----- 2024-08-27 17:25:17,418 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++----------- 2024-08-27 17:25:17,418 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++----- 2024-08-27 17:25:17,418 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++---- 2024-08-27 17:25:17,418 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++--------- 2024-08-27 17:25:17,420 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-) 2024-08-27 17:25:17,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:25:17,567 [ scc.git] DEBUG Calling 'git submodule update' 2024-08-27 17:25:17,609 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:25:17,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:17,614 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-27 17:25:17,651 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-08-27 17:25:17,657 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b483151c0> has no local changes 2024-08-27 17:25:17,657 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/156/)' 2024-08-27 17:25:17,666 [ scc.git] DEBUG [detached HEAD 25ad416] merge master -Dorg -Ssuccess-only 2024-08-27 17:25:17,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:25:17,667 [ scc.repo] DEBUG ## PRs found: 2024-08-27 17:25:18,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None 2024-08-27 17:25:18,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None 2024-08-27 17:25:18,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None 2024-08-27 17:25:19,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None 2024-08-27 17:25:19,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:20,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None 2024-08-27 17:25:20,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2 2024-08-27 17:25:20,907 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None' 2024-08-27 17:25:21,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None 2024-08-27 17:25:21,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None 2024-08-27 17:25:22,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None 2024-08-27 17:25:22,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None 2024-08-27 17:25:22,707 [ scc.repo] DEBUG ## Branches found: 2024-08-27 17:25:22,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-08-27 17:25:22,707 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:25:22,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:22,711 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-08-27 17:25:22,716 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-08-27 17:25:22,716 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-08-27 17:25:22,720 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-08-27 17:25:22,725 [ scc.git] DEBUG Already up to date. 2024-08-27 17:25:22,726 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-08-27 17:25:23,119 [ scc.git] DEBUG From https://github.com/ome/omero-marshal 2024-08-27 17:25:23,119 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-08-27 17:25:23,124 [ scc.git] DEBUG ## Unique users: [] 2024-08-27 17:25:23,124 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:25:23,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:23,130 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca' 2024-08-27 17:25:23,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:23,139 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca' 2024-08-27 17:25:23,150 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py 2024-08-27 17:25:23,151 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:25:23,153 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++-- 2024-08-27 17:25:23,154 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++- 2024-08-27 17:25:23,154 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-) 2024-08-27 17:25:23,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:25:23,306 [ scc.git] DEBUG Calling 'git submodule update' 2024-08-27 17:25:23,344 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:25:23,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:23,348 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-27 17:25:23,386 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-08-27 17:25:23,392 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b471f0730> has no local changes 2024-08-27 17:25:23,392 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/156/)' 2024-08-27 17:25:23,400 [ scc.git] DEBUG [detached HEAD 39e991e] merge master -Dorg -Ssuccess-only 2024-08-27 17:25:23,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:25:23,401 [ scc.repo] DEBUG ## PRs found: 2024-08-27 17:25:24,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None 2024-08-27 17:25:24,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424 HTTP/1.1" 200 None 2024-08-27 17:25:24,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424/comments HTTP/1.1" 200 None 2024-08-27 17:25:25,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None 2024-08-27 17:25:25,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:26,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-27 17:25:26,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None 2024-08-27 17:25:27,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec?per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:27,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None 2024-08-27 17:25:28,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/status HTTP/1.1" 200 None 2024-08-27 17:25:28,192 [ scc.repo] DEBUG - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active' 2024-08-27 17:25:28,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None 2024-08-27 17:25:29,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None 2024-08-27 17:25:29,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-08-27 17:25:30,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:30,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-27 17:25:31,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-08-27 17:25:31,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:32,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-08-27 17:25:32,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None 2024-08-27 17:25:32,508 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method' 2024-08-27 17:25:32,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None 2024-08-27 17:25:33,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None 2024-08-27 17:25:33,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None 2024-08-27 17:25:34,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:34,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-27 17:25:35,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None 2024-08-27 17:25:35,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-08-27 17:25:36,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:36,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-27 17:25:37,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-08-27 17:25:37,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:38,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-08-27 17:25:38,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None 2024-08-27 17:25:38,592 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command' 2024-08-27 17:25:39,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None 2024-08-27 17:25:39,024 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-08-27 17:25:39,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None 2024-08-27 17:25:39,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None 2024-08-27 17:25:40,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None 2024-08-27 17:25:40,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:41,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None 2024-08-27 17:25:41,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2 2024-08-27 17:25:41,789 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs' 2024-08-27 17:25:42,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None 2024-08-27 17:25:42,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None 2024-08-27 17:25:43,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-08-27 17:25:43,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:44,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-27 17:25:44,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-08-27 17:25:44,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:45,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-08-27 17:25:45,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None 2024-08-27 17:25:45,794 [ scc.repo] DEBUG - PR 332 jburel 'Build conda' 2024-08-27 17:25:46,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None 2024-08-27 17:25:46,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None 2024-08-27 17:25:47,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None 2024-08-27 17:25:47,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None 2024-08-27 17:25:48,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None 2024-08-27 17:25:48,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:49,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None 2024-08-27 17:25:49,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2 2024-08-27 17:25:49,488 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj' 2024-08-27 17:25:49,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None 2024-08-27 17:25:50,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None 2024-08-27 17:25:50,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:51,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None 2024-08-27 17:25:51,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2 2024-08-27 17:25:51,724 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins' 2024-08-27 17:25:52,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None 2024-08-27 17:25:52,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None 2024-08-27 17:25:53,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None 2024-08-27 17:25:54,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:54,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None 2024-08-27 17:25:55,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2 2024-08-27 17:25:55,323 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error' 2024-08-27 17:25:55,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None 2024-08-27 17:25:56,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None 2024-08-27 17:25:56,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None 2024-08-27 17:25:57,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:25:57,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None 2024-08-27 17:25:58,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2 2024-08-27 17:25:58,078 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group' 2024-08-27 17:25:58,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None 2024-08-27 17:25:58,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None 2024-08-27 17:25:59,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None 2024-08-27 17:25:59,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None 2024-08-27 17:25:59,888 [ scc.repo] DEBUG ## Branches found: 2024-08-27 17:25:59,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-08-27 17:25:59,888 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:25:59,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:25:59,894 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-08-27 17:25:59,898 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-08-27 17:25:59,898 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-08-27 17:25:59,905 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-08-27 17:25:59,910 [ scc.git] DEBUG Already up to date. 2024-08-27 17:25:59,910 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head' 2024-08-27 17:26:00,583 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-08-27 17:26:00,584 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD 2024-08-27 17:26:00,589 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head' 2024-08-27 17:26:00,935 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-08-27 17:26:00,935 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD 2024-08-27 17:26:00,942 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head' 2024-08-27 17:26:01,282 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-08-27 17:26:01,283 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD 2024-08-27 17:26:01,288 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head' 2024-08-27 17:26:01,580 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-08-27 17:26:01,581 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD 2024-08-27 17:26:01,586 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head' 2024-08-27 17:26:01,928 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-08-27 17:26:01,928 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD 2024-08-27 17:26:01,933 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head' 2024-08-27 17:26:02,226 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-08-27 17:26:02,226 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD 2024-08-27 17:26:02,232 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head' 2024-08-27 17:26:02,522 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-08-27 17:26:02,522 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD 2024-08-27 17:26:02,529 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head' 2024-08-27 17:26:02,893 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-08-27 17:26:02,893 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD 2024-08-27 17:26:02,898 [ scc.git] DEBUG Calling 'git fetch origin pull/424/head' 2024-08-27 17:26:03,269 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-08-27 17:26:03,269 [ scc.git] DEBUG * branch refs/pull/424/head -> FETCH_HEAD 2024-08-27 17:26:03,274 [ scc.git] DEBUG ## Unique users: [] 2024-08-27 17:26:03,274 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:26:03,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:03,278 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec' 2024-08-27 17:26:03,288 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:03,292 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec' 2024-08-27 17:26:03,349 [ scc.git] DEBUG Auto-merging src/omero/cli.py 2024-08-27 17:26:03,349 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py 2024-08-27 17:26:03,350 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:03,354 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++ 2024-08-27 17:26:03,354 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++--- 2024-08-27 17:26:03,354 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-) 2024-08-27 17:26:03,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:03,487 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb' 2024-08-27 17:26:03,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:03,505 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb' 2024-08-27 17:26:03,644 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py 2024-08-27 17:26:03,644 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py 2024-08-27 17:26:03,644 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:03,652 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------ 2024-08-27 17:26:03,652 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++ 2024-08-27 17:26:03,652 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-) 2024-08-27 17:26:03,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:03,873 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f' 2024-08-27 17:26:03,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:03,890 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f' 2024-08-27 17:26:03,982 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py 2024-08-27 17:26:03,983 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:03,987 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++---- 2024-08-27 17:26:03,987 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-) 2024-08-27 17:26:04,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:04,265 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a' 2024-08-27 17:26:04,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:04,283 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a' 2024-08-27 17:26:04,387 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py 2024-08-27 17:26:04,387 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py 2024-08-27 17:26:04,388 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:04,392 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++- 2024-08-27 17:26:04,392 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +- 2024-08-27 17:26:04,392 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-) 2024-08-27 17:26:04,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:04,655 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc' 2024-08-27 17:26:04,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:04,672 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc' 2024-08-27 17:26:04,699 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:04,702 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++ 2024-08-27 17:26:04,702 [ scc.git] DEBUG connect.py | 11 +++++++++++ 2024-08-27 17:26:04,703 [ scc.git] DEBUG 2 files changed, 48 insertions(+) 2024-08-27 17:26:04,703 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml 2024-08-27 17:26:04,703 [ scc.git] DEBUG create mode 100644 connect.py 2024-08-27 17:26:05,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:05,051 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5' 2024-08-27 17:26:05,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:05,068 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5' 2024-08-27 17:26:05,126 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py 2024-08-27 17:26:05,128 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:05,131 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++ 2024-08-27 17:26:05,131 [ scc.git] DEBUG 1 file changed, 2 insertions(+) 2024-08-27 17:26:05,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:05,432 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023' 2024-08-27 17:26:05,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:05,449 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023' 2024-08-27 17:26:05,522 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py 2024-08-27 17:26:05,523 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:05,526 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++-- 2024-08-27 17:26:05,527 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-) 2024-08-27 17:26:05,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:05,815 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804' 2024-08-27 17:26:05,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:05,832 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804' 2024-08-27 17:26:05,920 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py 2024-08-27 17:26:05,921 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:05,929 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------ 2024-08-27 17:26:05,930 [ scc.git] DEBUG 1 file changed, 36 deletions(-) 2024-08-27 17:26:06,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:06,203 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec' 2024-08-27 17:26:06,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:06,220 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 424 (Prevent hang on exit while omero.client keepalive is active) 0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec' 2024-08-27 17:26:06,242 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:06,245 [ scc.git] DEBUG src/omero/util/__init__.py | 8 +------- 2024-08-27 17:26:06,245 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 7 deletions(-) 2024-08-27 17:26:06,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:06,595 [ scc.git] DEBUG Calling 'git submodule update' 2024-08-27 17:26:06,640 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:26:06,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:06,645 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-27 17:26:06,684 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-08-27 17:26:06,692 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b471f05b0> has no local changes 2024-08-27 17:26:06,692 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-py Excluded PRs: - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure) - PR 387 will-moore 'Numpy pixels type' (label: exclude) - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn) - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft) - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment) Already up to date. Merged PRs: - PR 199 joshmoore 'user: allow setting default group' - PR 207 manics 'BlitzGateway.connect raise on error' - PR 266 joshmoore 'errors: use raise_error from cli plugins' - PR 299 joshmoore 'Add parents and children to omero obj' - PR 332 jburel 'Build conda' - PR 337 will-moore 'bulk.yml depth is passed to xargs' - PR 391 joshmoore 'Add jstack command' - PR 408 jburel 'remove deprecated method' - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active' Generated by OMERO-python-superbuild-push#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/156/)' 2024-08-27 17:26:06,702 [ scc.git] DEBUG [detached HEAD 5b0f926b] merge master -Dorg -Ssuccess-only 2024-08-27 17:26:06,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:26:06,703 [ scc.git] INFO Overriding base-branch from master to develop 2024-08-27 17:26:06,703 [ scc.repo] DEBUG ## PRs found: 2024-08-27 17:26:07,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None 2024-08-27 17:26:07,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None 2024-08-27 17:26:08,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None 2024-08-27 17:26:08,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None 2024-08-27 17:26:09,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None 2024-08-27 17:26:09,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None 2024-08-27 17:26:10,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None 2024-08-27 17:26:10,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-08-27 17:26:11,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:26:11,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-08-27 17:26:11,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2 2024-08-27 17:26:11,979 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-08-27 17:26:12,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None 2024-08-27 17:26:12,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None 2024-08-27 17:26:13,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None 2024-08-27 17:26:13,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None 2024-08-27 17:26:13,895 [ scc.repo] DEBUG ## Branches found: 2024-08-27 17:26:13,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-08-27 17:26:13,896 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:26:13,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:13,900 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop' 2024-08-27 17:26:13,904 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-08-27 17:26:13,905 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop' 2024-08-27 17:26:13,910 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop' 2024-08-27 17:26:13,915 [ scc.git] DEBUG Already up to date. 2024-08-27 17:26:13,915 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head' 2024-08-27 17:26:14,299 [ scc.git] DEBUG From https://github.com/ome/omero-scripts 2024-08-27 17:26:14,300 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD 2024-08-27 17:26:14,304 [ scc.git] DEBUG ## Unique users: [] 2024-08-27 17:26:14,304 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:26:14,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:14,309 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-08-27 17:26:14,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:14,322 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-08-27 17:26:14,373 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py 2024-08-27 17:26:14,373 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py 2024-08-27 17:26:14,374 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-08-27 17:26:14,374 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-08-27 17:26:14,379 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0' 2024-08-27 17:26:14,384 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0 2024-08-27 17:26:14,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:14,523 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-08-27 17:26:14,530 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0' 2024-08-27 17:26:14,535 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' Conflicting PR. Removed from build [OMERO-python-superbuild-push#156](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/156/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/156/consoleText) for more details. Possible conflicts: - Upstream changes - omero/annotation_scripts/KeyVal_to_csv.py --conflicts 2024-08-27 17:26:14,539 [ scc.config] DEBUG Found github.token 2024-08-27 17:26:14,539 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts. 2024-08-27 17:26:14,539 [ scc.git] DEBUG Calling 'git submodule update' 2024-08-27 17:26:14,577 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:26:14,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:14,581 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-27 17:26:14,618 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-08-27 17:26:14,623 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b47266eb0> has no local changes 2024-08-27 17:26:14,624 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/156/)' 2024-08-27 17:26:14,632 [ scc.git] DEBUG [detached HEAD a9ab59b] merge master -Dorg -Ssuccess-only 2024-08-27 17:26:14,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:26:14,632 [ scc.repo] DEBUG ## PRs found: 2024-08-27 17:26:15,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None 2024-08-27 17:26:15,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/575 HTTP/1.1" 200 None 2024-08-27 17:26:15,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/575/comments HTTP/1.1" 200 None 2024-08-27 17:26:16,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7405491a259e77e752bdd43ef0ee19f9db876fcd HTTP/1.1" 200 None 2024-08-27 17:26:16,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7405491a259e77e752bdd43ef0ee19f9db876fcd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:26:17,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7405491a259e77e752bdd43ef0ee19f9db876fcd/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-27 17:26:17,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7405491a259e77e752bdd43ef0ee19f9db876fcd HTTP/1.1" 200 None 2024-08-27 17:26:18,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/7405491a259e77e752bdd43ef0ee19f9db876fcd?per_page=1 HTTP/1.1" 200 None 2024-08-27 17:26:18,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7405491a259e77e752bdd43ef0ee19f9db876fcd HTTP/1.1" 200 None 2024-08-27 17:26:19,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7405491a259e77e752bdd43ef0ee19f9db876fcd/status HTTP/1.1" 200 None 2024-08-27 17:26:19,158 [ scc.repo] DEBUG - PR 575 will-moore 'Fix breaking change: _marshal_images() handles missing archived flag' 2024-08-27 17:26:19,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574 HTTP/1.1" 200 None 2024-08-27 17:26:20,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None 2024-08-27 17:26:20,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:26:20,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-27 17:26:21,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None 2024-08-27 17:26:21,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c?per_page=1 HTTP/1.1" 200 None 2024-08-27 17:26:22,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None 2024-08-27 17:26:22,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/status HTTP/1.1" 200 None 2024-08-27 17:26:22,717 [ scc.repo] DEBUG - PR 574 will-moore 'Fix word wrap for names' 2024-08-27 17:26:23,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/571 HTTP/1.1" 200 None 2024-08-27 17:26:23,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None 2024-08-27 17:26:24,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None 2024-08-27 17:26:24,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None 2024-08-27 17:26:24,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None 2024-08-27 17:26:25,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None 2024-08-27 17:26:25,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None 2024-08-27 17:26:26,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-08-27 17:26:26,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:26:27,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-27 17:26:27,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-08-27 17:26:28,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None 2024-08-27 17:26:28,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-08-27 17:26:29,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None 2024-08-27 17:26:29,171 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' 2024-08-27 17:26:29,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None 2024-08-27 17:26:30,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None 2024-08-27 17:26:30,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-08-27 17:26:31,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:26:31,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-27 17:26:31,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-08-27 17:26:32,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None 2024-08-27 17:26:32,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-08-27 17:26:33,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None 2024-08-27 17:26:33,200 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test' 2024-08-27 17:26:33,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None 2024-08-27 17:26:34,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None 2024-08-27 17:26:34,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None 2024-08-27 17:26:35,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-27 17:26:35,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-27 17:26:35,548 [ scc.repo] DEBUG ## Branches found: 2024-08-27 17:26:35,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-08-27 17:26:35,548 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:26:35,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:35,553 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-08-27 17:26:35,557 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-08-27 17:26:35,557 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-08-27 17:26:35,561 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-08-27 17:26:35,566 [ scc.git] DEBUG Already up to date. 2024-08-27 17:26:35,566 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head' 2024-08-27 17:26:36,043 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-08-27 17:26:36,043 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD 2024-08-27 17:26:36,049 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head' 2024-08-27 17:26:36,399 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-08-27 17:26:36,399 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD 2024-08-27 17:26:36,404 [ scc.git] DEBUG Calling 'git fetch origin pull/574/head' 2024-08-27 17:26:36,711 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-08-27 17:26:36,713 [ scc.git] DEBUG * branch refs/pull/574/head -> FETCH_HEAD 2024-08-27 17:26:36,720 [ scc.git] DEBUG Calling 'git fetch origin pull/575/head' 2024-08-27 17:26:37,097 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-08-27 17:26:37,097 [ scc.git] DEBUG * branch refs/pull/575/head -> FETCH_HEAD 2024-08-27 17:26:37,103 [ scc.git] DEBUG ## Unique users: [] 2024-08-27 17:26:37,104 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:26:37,104 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:37,111 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767' 2024-08-27 17:26:37,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:37,134 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767' 2024-08-27 17:26:37,178 [ scc.git] DEBUG Auto-merging omeroweb/settings.py 2024-08-27 17:26:37,179 [ scc.git] DEBUG Auto-merging setup.py 2024-08-27 17:26:37,180 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:37,183 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++- 2024-08-27 17:26:37,183 [ scc.git] DEBUG setup.py | 1 + 2024-08-27 17:26:37,183 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-) 2024-08-27 17:26:37,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:37,318 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005' 2024-08-27 17:26:37,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:37,332 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005' 2024-08-27 17:26:37,422 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py 2024-08-27 17:26:37,422 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py 2024-08-27 17:26:37,424 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:37,428 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +- 2024-08-27 17:26:37,428 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++-- 2024-08-27 17:26:37,428 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-) 2024-08-27 17:26:37,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:37,694 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ad846e500db8aa8ec32fe0ea9b828ecb44871c2c' 2024-08-27 17:26:37,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:37,707 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 574 (Fix word wrap for names) ad846e500db8aa8ec32fe0ea9b828ecb44871c2c' 2024-08-27 17:26:37,770 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:37,775 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/layout.css | 2 ++ 2024-08-27 17:26:37,775 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/includes/name.html | 4 ++-- 2024-08-27 17:26:37,775 [ scc.git] DEBUG 2 files changed, 4 insertions(+), 2 deletions(-) 2024-08-27 17:26:38,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:38,118 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7405491a259e77e752bdd43ef0ee19f9db876fcd' 2024-08-27 17:26:38,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:38,131 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 575 (Fix breaking change: _marshal_images() handles missing archived flag) 7405491a259e77e752bdd43ef0ee19f9db876fcd' 2024-08-27 17:26:38,151 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-27 17:26:38,156 [ scc.git] DEBUG omeroweb/webclient/tree.py | 14 ++++++++++++-- 2024-08-27 17:26:38,156 [ scc.git] DEBUG 1 file changed, 12 insertions(+), 2 deletions(-) 2024-08-27 17:26:38,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:38,505 [ scc.git] DEBUG Calling 'git submodule update' 2024-08-27 17:26:38,548 [ scc.git] DEBUG Get sha1 of %s 2024-08-27 17:26:38,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-27 17:26:38,553 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-27 17:26:38,597 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-08-27 17:26:38,609 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b451ac760> has no local changes 2024-08-27 17:26:38,609 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-web Excluded PRs: - PR 571 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot]) - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT) - PR 535 will-moore 'Initial working browser history' (stage: draft) - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure) Already up to date. Merged PRs: - PR 527 will-moore 'Add some initial CSP settings to test' - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' - PR 574 will-moore 'Fix word wrap for names' - PR 575 will-moore 'Fix breaking change: _marshal_images() handles missing archived flag' Generated by OMERO-python-superbuild-push#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/156/)' 2024-08-27 17:26:38,621 [ scc.git] DEBUG [detached HEAD dd3299dc1] merge master -Dorg -Ssuccess-only 2024-08-27 17:26:38,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:26:38,622 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-27 17:26:38,674 [ scc.config] DEBUG Found submodule.omero-dropbox.url 2024-08-27 17:26:38,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:38,924 [ scc.config] DEBUG Found submodule.omero-marshal.url 2024-08-27 17:26:39,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:39,328 [ scc.config] DEBUG Found submodule.omero-py.url 2024-08-27 17:26:39,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:39,700 [ scc.config] DEBUG Found submodule.omero-scripts.url 2024-08-27 17:26:40,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:40,095 [ scc.config] DEBUG Found submodule.omero-web.url 2024-08-27 17:26:40,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-27 17:26:40,474 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-08-27 17:26:40,503 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b48fefe20> has local changes 2024-08-27 17:26:40,503 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-python-superbuild Already up to date. Merged PRs: - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`' Repository: ome/omero-dropbox Already up to date. Merged PRs: - PR 16 joshmoore 'Review all instances of whitelist/blacklist' Repository: ome/omero-marshal Excluded PRs: - PR 34 chris-allan 'Initial support for Event' (exclude comment) - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment) Already up to date. Merged PRs: - PR 69 will-moore 'Roi encoder allows Shape None' Repository: ome/omero-py Excluded PRs: - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure) - PR 387 will-moore 'Numpy pixels type' (label: exclude) - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn) - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft) - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment) Already up to date. Merged PRs: - PR 199 joshmoore 'user: allow setting default group' - PR 207 manics 'BlitzGateway.connect raise on error' - PR 266 joshmoore 'errors: use raise_error from cli plugins' - PR 299 joshmoore 'Add parents and children to omero obj' - PR 332 jburel 'Build conda' - PR 337 will-moore 'bulk.yml depth is passed to xargs' - PR 391 joshmoore 'Add jstack command' - PR 408 jburel 'remove deprecated method' - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active' Repository: ome/omero-scripts Excluded PRs: - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT) - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier) - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn) - PR 103 joshmoore 'Script for calculating min/max' (exclude comment) Already up to date. Conflicting PRs (not included): - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' Repository: ome/omero-web Excluded PRs: - PR 571 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot]) - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT) - PR 535 will-moore 'Initial working browser history' (stage: draft) - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure) Already up to date. Merged PRs: - PR 527 will-moore 'Add some initial CSP settings to test' - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' - PR 574 will-moore 'Fix word wrap for names' - PR 575 will-moore 'Fix breaking change: _marshal_images() handles missing archived flag' Generated by OMERO-python-superbuild-push#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/156/)' 2024-08-27 17:26:40,512 [ scc.git] DEBUG [detached HEAD d4f494a] merge master -Dorg -Ssuccess-only 2024-08-27 17:26:40,513 [ scc.merge] INFO Repository: ome/omero-python-superbuild 2024-08-27 17:26:40,513 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-) 2024-08-27 17:26:40,513 [ scc.merge] INFO Already up to date. 2024-08-27 17:26:40,513 [ scc.merge] INFO 2024-08-27 17:26:40,513 [ scc.merge] INFO Merged PRs: 2024-08-27 17:26:40,513 [ scc.merge] INFO - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`' 2024-08-27 17:26:40,513 [ scc.merge] INFO 2024-08-27 17:26:40,513 [ scc.merge] INFO Repository: ome/omero-dropbox 2024-08-27 17:26:40,513 [ scc.merge] INFO Already up to date. 2024-08-27 17:26:40,513 [ scc.merge] INFO 2024-08-27 17:26:40,513 [ scc.merge] INFO Merged PRs: 2024-08-27 17:26:40,513 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist' 2024-08-27 17:26:40,513 [ scc.merge] INFO 2024-08-27 17:26:40,513 [ scc.merge] INFO Repository: ome/omero-marshal 2024-08-27 17:26:40,513 [ scc.merge] INFO Excluded PRs: 2024-08-27 17:26:40,513 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment) 2024-08-27 17:26:40,513 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment) 2024-08-27 17:26:40,513 [ scc.merge] INFO Already up to date. 2024-08-27 17:26:40,513 [ scc.merge] INFO 2024-08-27 17:26:40,513 [ scc.merge] INFO Merged PRs: 2024-08-27 17:26:40,513 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None' 2024-08-27 17:26:40,513 [ scc.merge] INFO 2024-08-27 17:26:40,513 [ scc.merge] INFO Repository: ome/omero-py 2024-08-27 17:26:40,513 [ scc.merge] INFO Excluded PRs: 2024-08-27 17:26:40,513 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure) 2024-08-27 17:26:40,513 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude) 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn) 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft) 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment) 2024-08-27 17:26:40,514 [ scc.merge] INFO Already up to date. 2024-08-27 17:26:40,514 [ scc.merge] INFO 2024-08-27 17:26:40,514 [ scc.merge] INFO Merged PRs: 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group' 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error' 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins' 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj' 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 332 jburel 'Build conda' 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs' 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command' 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method' 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active' 2024-08-27 17:26:40,514 [ scc.merge] INFO 2024-08-27 17:26:40,514 [ scc.merge] INFO Repository: ome/omero-scripts 2024-08-27 17:26:40,514 [ scc.merge] INFO Excluded PRs: 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT) 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier) 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn) 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment) 2024-08-27 17:26:40,514 [ scc.merge] INFO Already up to date. 2024-08-27 17:26:40,514 [ scc.merge] INFO 2024-08-27 17:26:40,514 [ scc.merge] INFO Conflicting PRs (not included): 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-08-27 17:26:40,514 [ scc.merge] INFO 2024-08-27 17:26:40,514 [ scc.merge] INFO Repository: ome/omero-web 2024-08-27 17:26:40,514 [ scc.merge] INFO Excluded PRs: 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 571 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot]) 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT) 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft) 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure) 2024-08-27 17:26:40,514 [ scc.merge] INFO Already up to date. 2024-08-27 17:26:40,514 [ scc.merge] INFO 2024-08-27 17:26:40,514 [ scc.merge] INFO Merged PRs: 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test' 2024-08-27 17:26:40,514 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' 2024-08-27 17:26:40,515 [ scc.merge] INFO - PR 574 will-moore 'Fix word wrap for names' 2024-08-27 17:26:40,515 [ scc.merge] INFO - PR 575 will-moore 'Fix breaking change: _marshal_images() handles missing archived flag' 2024-08-27 17:26:40,515 [ scc.merge] INFO 2024-08-27 17:26:40,515 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-08-27 17:26:40,515 [ scc.git] DEBUG Calling 'git remote' 2024-08-27 17:26:40,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-08-27 17:26:40,519 [ scc.git] DEBUG Calling 'git remote' 2024-08-27 17:26:40,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:26:40,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-08-27 17:26:40,523 [ scc.git] DEBUG Calling 'git remote' 2024-08-27 17:26:40,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:26:40,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-08-27 17:26:40,527 [ scc.git] DEBUG Calling 'git remote' 2024-08-27 17:26:40,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:26:40,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-08-27 17:26:40,531 [ scc.git] DEBUG Calling 'git remote' 2024-08-27 17:26:40,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-08-27 17:26:40,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-08-27 17:26:40,534 [ scc.git] DEBUG Calling 'git remote' 2024-08-27 17:26:40,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push Update component versions Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ... Traceback (most recent call last): File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module> download_blitz_target() File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target resp = urlopen(loc) File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen return opener.open(url, data, timeout) File "/usr/lib64/python3.9/urllib/request.py", line 523, in open response = meth(req, response) File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response response = self.parent.error( File "/usr/lib64/python3.9/urllib/request.py", line 561, in error return self._call_chain(*args) File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain result = func(*args) File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default raise HTTPError(req.full_url, code, msg, hdrs, fp) urllib.error.HTTPError: HTTP Error 404: Not Found Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ... Traceback (most recent call last): File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module> download_blitz_target() File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target resp = urlopen(loc) File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen return opener.open(url, data, timeout) File "/usr/lib64/python3.9/urllib/request.py", line 523, in open response = meth(req, response) File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response response = self.parent.error( File "/usr/lib64/python3.9/urllib/request.py", line 561, in error return self._call_chain(*args) File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain result = func(*args) File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default raise HTTPError(req.full_url, code, msg, hdrs, fp) urllib.error.HTTPError: HTTP Error 404: Not Found grep: build.gradle: No such file or directory Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Commit all component version changes Entering 'omero-dropbox' Entering 'omero-marshal' Entering 'omero-py' Entering 'omero-scripts' Entering 'omero-web' Entering 'omero-dropbox' HEAD detached from a4307f4 nothing to commit, working tree clean Entering 'omero-marshal' HEAD detached from cca4c2f nothing to commit, working tree clean Entering 'omero-py' HEAD detached from 749a68ac nothing to commit, working tree clean Entering 'omero-scripts' HEAD detached from 312afbe nothing to commit, working tree clean Entering 'omero-web' HEAD detached from 7cd445ce3 nothing to commit, working tree clean HEAD detached from 18cc8a4 nothing to commit, working tree clean 2024-08-27 17:27:07,621 [ 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