![[Jenkins]](/jenkins/static/58f98332/images/svgs/logo.svg){kind=logo}
Started by upstream project "Trigger" build number 207 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 e849d7220735d67c4a474051cc03805d0a822cde (refs/remotes/origin/master) Commit message: "Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1" > 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 e849d7220735d67c4a474051cc03805d0a822cde # timeout=10 > git rev-list --no-walk e849d7220735d67c4a474051cc03805d0a822cde # 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 179 [Pipeline] sh + pushd build ~/workspace/OMERO-python-superbuild-push/build ~/workspace/OMERO-python-superbuild-push + curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz + tar -zxf - + popd ~/workspace/OMERO-python-superbuild-push + python3 -m venv build/venv > 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 + . 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.20-py2.py3-none-any.whl.metadata (50 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.1-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.1-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.8.30-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.20-py2.py3-none-any.whl (144 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.8.30-py3-none-any.whl (167 kB) Using cached cffi-1.17.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (445 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.1-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.8.30 cffi-1.17.1 charset-normalizer-3.3.2 cryptography-43.0.1 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.20 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-09-11 14:37:48,095 [ scc.config] DEBUG Found github.token 2024-09-11 14:37:48,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-09-11 14:37:48,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:37:48,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:37:49,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-09-11 14:37:49,249 [ scc.gh] DEBUG 4336 remaining from 5000 (Reset at 15:09 2024-09-11 14:37:49,250 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-09-11 14:37:49,254 [ scc.git] DEBUG Check current status 2024-09-11 14:37:49,254 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-11 14:37:49,258 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1 2024-09-11 14:37:49,259 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-11 14:37:49,304 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-09-11 14:37:49,308 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-09-11 14:37:49,312 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac) 2024-09-11 14:37:49,316 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe) 2024-09-11 14:37:49,320 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f) 2024-09-11 14:37:49,326 [ scc.config] DEBUG Found remote.origin.url 2024-09-11 14:37:49,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None 2024-09-11 14:37:50,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-09-11 14:37:50,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-09-11 14:37:51,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-09-11 14:37:51,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-09-11 14:37:51,519 [ scc.git] DEBUG Resetting... 2024-09-11 14:37:51,520 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-09-11 14:37:51,528 [ scc.git] DEBUG HEAD is now at e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1 2024-09-11 14:37:51,529 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-09-11 14:37:51,596 [ scc.git] DEBUG Check current status 2024-09-11 14:37:51,596 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-11 14:37:51,603 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1 2024-09-11 14:37:51,603 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-11 14:37:51,654 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-09-11 14:37:51,657 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-09-11 14:37:51,662 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac) 2024-09-11 14:37:51,666 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe) 2024-09-11 14:37:51,670 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f) 2024-09-11 14:37:51,671 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-09-11 14:37:51,671 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-09-11 14:37:51,671 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-09-11 14:37:51,671 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-09-11 14:37:51,671 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-09-11 14:37:51,671 [ scc.repo] DEBUG ## PRs found: 2024-09-11 14:37:51,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2 2024-09-11 14:37:51,986 [ scc.repo] DEBUG ## Branches found: 2024-09-11 14:37:51,987 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:37:51,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:37:51,992 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-09-11 14:37:51,995 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-09-11 14:37:51,996 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-09-11 14:37:52,000 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-09-11 14:37:52,004 [ scc.git] DEBUG Already up to date. 2024-09-11 14:37:52,004 [ scc.git] DEBUG ## Unique users: [] 2024-09-11 14:37:52,004 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:37:52,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:37:52,008 [ scc.git] DEBUG Calling 'git submodule update' 2024-09-11 14:37:52,052 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:37:52,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:37:52,058 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-09-11 14:37:52,215 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41107b1e50> has no local changes 2024-09-11 14:37:52,216 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone Repository: ome/omero-python-superbuild Already up to date. Generated by OMERO-python-superbuild-push#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/170/)' 2024-09-11 14:37:52,245 [ scc.git] DEBUG [detached HEAD dde0131] merge master -Dorg -Snone 2024-09-11 14:37:52,245 [ scc.merge] INFO Repository: ome/omero-python-superbuild 2024-09-11 14:37:52,246 [ scc.merge] INFO Already up to date. 2024-09-11 14:37:52,246 [ scc.merge] INFO 2024-09-11 14:37:52,246 [ scc.merge] INFO 2024-09-11 14:37:52,246 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-09-11 14:37:52,246 [ 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-09-11 14:37:54,531 [ scc.config] DEBUG Found github.token 2024-09-11 14:37:54,534 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-09-11 14:37:54,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:37:55,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:37:55,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-09-11 14:37:55,524 [ scc.gh] DEBUG 4328 remaining from 5000 (Reset at 15:09 2024-09-11 14:37:55,524 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-09-11 14:37:55,528 [ scc.git] DEBUG Check current status 2024-09-11 14:37:55,528 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-11 14:37:55,533 [ scc.git] DEBUG dde0131 merge master -Dorg -Snone 2024-09-11 14:37:55,533 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-11 14:37:55,573 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-09-11 14:37:55,576 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-09-11 14:37:55,579 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac) 2024-09-11 14:37:55,583 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe) 2024-09-11 14:37:55,586 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f) 2024-09-11 14:37:55,590 [ scc.config] DEBUG Found remote.origin.url 2024-09-11 14:37:55,591 [ scc.git] DEBUG Reading repository configuration from repositories.yml 2024-09-11 14:37:55,592 [ scc.git] DEBUG Repository configuration: base-branch: master submodules: omero-scripts: base-branch: develop 2024-09-11 14:37:56,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None 2024-09-11 14:37:56,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-09-11 14:37:56,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-09-11 14:37:57,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-09-11 14:37:57,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-09-11 14:37:57,790 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-11 14:37:57,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-09-11 14:37:57,845 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-09-11 14:37:57,849 [ scc.git] DEBUG Check current status 2024-09-11 14:37:57,850 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-11 14:37:57,854 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0 2024-09-11 14:37:57,854 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-11 14:37:57,907 [ scc.config] DEBUG Found remote.origin.url 2024-09-11 14:37:58,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None 2024-09-11 14:37:58,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-09-11 14:37:59,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-09-11 14:37:59,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-09-11 14:38:00,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-09-11 14:38:00,004 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-11 14:38:00,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:38:00,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-09-11 14:38:00,048 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-09-11 14:38:00,055 [ scc.git] DEBUG Check current status 2024-09-11 14:38:00,055 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-11 14:38:00,061 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312 2024-09-11 14:38:00,061 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-11 14:38:00,112 [ scc.config] DEBUG Found remote.origin.url 2024-09-11 14:38:00,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None 2024-09-11 14:38:00,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-09-11 14:38:01,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-09-11 14:38:01,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-09-11 14:38:02,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-09-11 14:38:02,254 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-11 14:38:02,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:38:02,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-09-11 14:38:02,300 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-09-11 14:38:02,305 [ scc.git] DEBUG Check current status 2024-09-11 14:38:02,305 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-11 14:38:02,317 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0 2024-09-11 14:38:02,318 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-11 14:38:02,374 [ scc.config] DEBUG Found remote.origin.url 2024-09-11 14:38:02,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None 2024-09-11 14:38:03,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-09-11 14:38:03,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-09-11 14:38:03,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-09-11 14:38:04,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-09-11 14:38:04,396 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-11 14:38:04,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:38:04,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-09-11 14:38:04,443 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-09-11 14:38:04,448 [ scc.git] DEBUG Check current status 2024-09-11 14:38:04,448 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-11 14:38:04,453 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0 2024-09-11 14:38:04,453 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-11 14:38:04,503 [ scc.config] DEBUG Found remote.origin.url 2024-09-11 14:38:04,504 [ scc.git] DEBUG Repository configuration: base-branch: develop 2024-09-11 14:38:04,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None 2024-09-11 14:38:05,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-09-11 14:38:05,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-09-11 14:38:06,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-09-11 14:38:06,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-09-11 14:38:06,604 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-11 14:38:06,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:38:06,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-09-11 14:38:06,645 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-09-11 14:38:06,650 [ scc.git] DEBUG Check current status 2024-09-11 14:38:06,650 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-11 14:38:06,654 [ scc.git] DEBUG da5b7d11f Bump version: 5.27.2 → 5.27.3.dev0 2024-09-11 14:38:06,655 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-11 14:38:06,701 [ scc.config] DEBUG Found remote.origin.url 2024-09-11 14:38:07,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None 2024-09-11 14:38:07,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-09-11 14:38:08,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-09-11 14:38:08,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-09-11 14:38:09,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-09-11 14:38:09,067 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-11 14:38:09,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:38:09,111 [ scc.git] DEBUG Resetting... 2024-09-11 14:38:09,111 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-09-11 14:38:09,117 [ scc.git] DEBUG HEAD is now at dde0131 merge master -Dorg -Snone 2024-09-11 14:38:09,117 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-09-11 14:38:09,168 [ scc.git] DEBUG Check current status 2024-09-11 14:38:09,169 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-11 14:38:09,175 [ scc.git] DEBUG dde0131 merge master -Dorg -Snone 2024-09-11 14:38:09,175 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-11 14:38:09,224 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-09-11 14:38:09,227 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-09-11 14:38:09,231 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac) 2024-09-11 14:38:09,235 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe) 2024-09-11 14:38:09,241 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f) 2024-09-11 14:38:09,242 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-09-11 14:38:09,242 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-09-11 14:38:09,242 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-09-11 14:38:09,242 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-09-11 14:38:09,242 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-09-11 14:38:09,242 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-09-11 14:38:09,242 [ scc.repo] DEBUG ## PRs found: 2024-09-11 14:38:09,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2 2024-09-11 14:38:09,488 [ scc.repo] DEBUG ## Branches found: 2024-09-11 14:38:09,488 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:38:09,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:38:09,493 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-09-11 14:38:09,497 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-09-11 14:38:09,497 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-09-11 14:38:09,502 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-09-11 14:38:09,507 [ scc.git] DEBUG Already up to date. 2024-09-11 14:38:09,507 [ scc.git] DEBUG ## Unique users: [] 2024-09-11 14:38:09,507 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:38:09,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:38:09,512 [ scc.git] DEBUG Calling 'git submodule update' 2024-09-11 14:38:09,560 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:38:09,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:38:09,565 [ scc.repo] DEBUG ## PRs found: 2024-09-11 14:38:10,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None 2024-09-11 14:38:10,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None 2024-09-11 14:38:10,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None 2024-09-11 14:38:11,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None 2024-09-11 14:38:11,964 [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-09-11 14:38:12,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None 2024-09-11 14:38:12,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2 2024-09-11 14:38:12,951 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist' 2024-09-11 14:38:12,952 [ scc.repo] DEBUG ## Branches found: 2024-09-11 14:38:12,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-09-11 14:38:12,952 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:38:12,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:38:12,957 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-09-11 14:38:12,961 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-09-11 14:38:12,961 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-09-11 14:38:12,966 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-09-11 14:38:12,971 [ scc.git] DEBUG Already up to date. 2024-09-11 14:38:12,971 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head' 2024-09-11 14:38:13,328 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox 2024-09-11 14:38:13,328 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD 2024-09-11 14:38:13,334 [ scc.git] DEBUG ## Unique users: [] 2024-09-11 14:38:13,334 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:38:13,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:38:13,339 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452' 2024-09-11 14:38:13,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:38:13,351 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452' 2024-09-11 14:38:13,518 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py 2024-09-11 14:38:13,518 [ scc.git] DEBUG Auto-merging src/fsDirectory.py 2024-09-11 14:38:13,518 [ scc.git] DEBUG Auto-merging src/fsDropBox.py 2024-09-11 14:38:13,518 [ scc.git] DEBUG Auto-merging src/fsLists.py 2024-09-11 14:38:13,518 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py 2024-09-11 14:38:13,519 [ scc.git] DEBUG Auto-merging src/fsMonitor.py 2024-09-11 14:38:13,519 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py 2024-09-11 14:38:13,519 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py 2024-09-11 14:38:13,519 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py 2024-09-11 14:38:13,587 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:38:13,591 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++--- 2024-09-11 14:38:13,592 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++-------------------- 2024-09-11 14:38:13,592 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++----------- 2024-09-11 14:38:13,592 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------ 2024-09-11 14:38:13,595 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++----- 2024-09-11 14:38:13,595 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++----------- 2024-09-11 14:38:13,595 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++----- 2024-09-11 14:38:13,595 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++---- 2024-09-11 14:38:13,595 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++--------- 2024-09-11 14:38:13,595 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-) 2024-09-11 14:38:13,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:38:13,752 [ scc.git] DEBUG Calling 'git submodule update' 2024-09-11 14:38:13,803 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:38:13,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:38:13,808 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-11 14:38:13,851 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-09-11 14:38:13,857 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8963b8f700> has no local changes 2024-09-11 14:38:13,857 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/170/)' 2024-09-11 14:38:13,866 [ scc.git] DEBUG [detached HEAD 0605dd1] merge master -Dorg -Ssuccess-only 2024-09-11 14:38:13,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:38:13,867 [ scc.repo] DEBUG ## PRs found: 2024-09-11 14:38:14,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None 2024-09-11 14:38:14,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None 2024-09-11 14:38:15,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None 2024-09-11 14:38:15,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None 2024-09-11 14:38:16,352 [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-09-11 14:38:16,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None 2024-09-11 14:38:17,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2 2024-09-11 14:38:17,314 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None' 2024-09-11 14:38:17,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None 2024-09-11 14:38:18,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None 2024-09-11 14:38:18,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None 2024-09-11 14:38:19,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None 2024-09-11 14:38:19,262 [ scc.repo] DEBUG ## Branches found: 2024-09-11 14:38:19,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-09-11 14:38:19,262 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:38:19,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:38:19,267 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-09-11 14:38:19,272 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-09-11 14:38:19,272 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-09-11 14:38:19,277 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-09-11 14:38:19,281 [ scc.git] DEBUG Already up to date. 2024-09-11 14:38:19,282 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-09-11 14:38:19,598 [ scc.git] DEBUG From https://github.com/ome/omero-marshal 2024-09-11 14:38:19,598 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-09-11 14:38:19,603 [ scc.git] DEBUG ## Unique users: [] 2024-09-11 14:38:19,603 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:38:19,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:38:19,608 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca' 2024-09-11 14:38:19,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:38:19,618 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca' 2024-09-11 14:38:19,633 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py 2024-09-11 14:38:19,633 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:38:19,636 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++-- 2024-09-11 14:38:19,636 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++- 2024-09-11 14:38:19,636 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-) 2024-09-11 14:38:19,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:38:19,786 [ scc.git] DEBUG Calling 'git submodule update' 2024-09-11 14:38:19,829 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:38:19,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:38:19,834 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-11 14:38:19,876 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-09-11 14:38:19,883 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8962a7b730> has no local changes 2024-09-11 14:38:19,883 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/170/)' 2024-09-11 14:38:19,893 [ scc.git] DEBUG [detached HEAD 118e629] merge master -Dorg -Ssuccess-only 2024-09-11 14:38:19,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:38:19,893 [ scc.repo] DEBUG ## PRs found: 2024-09-11 14:38:20,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None 2024-09-11 14:38:21,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None 2024-09-11 14:38:21,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None 2024-09-11 14:38:22,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424 HTTP/1.1" 200 None 2024-09-11 14:38:22,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424/comments HTTP/1.1" 200 None 2024-09-11 14:38:23,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None 2024-09-11 14:38:23,673 [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-09-11 14:38:24,142 [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-09-11 14:38:24,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None 2024-09-11 14:38:24,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec?per_page=1 HTTP/1.1" 200 None 2024-09-11 14:38:25,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None 2024-09-11 14:38:25,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/status HTTP/1.1" 200 None 2024-09-11 14:38:25,987 [ scc.repo] DEBUG - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active' 2024-09-11 14:38:26,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None 2024-09-11 14:38:26,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None 2024-09-11 14:38:27,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-09-11 14:38:27,932 [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-09-11 14:38:28,447 [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-09-11 14:38:29,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-09-11 14:38:29,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None 2024-09-11 14:38:30,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-09-11 14:38:30,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None 2024-09-11 14:38:30,597 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method' 2024-09-11 14:38:31,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None 2024-09-11 14:38:31,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None 2024-09-11 14:38:32,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None 2024-09-11 14:38:32,506 [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-09-11 14:38:33,005 [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-09-11 14:38:33,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None 2024-09-11 14:38:33,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-09-11 14:38:34,515 [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-09-11 14:38:35,029 [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-09-11 14:38:35,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-09-11 14:38:35,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None 2024-09-11 14:38:36,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-09-11 14:38:36,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None 2024-09-11 14:38:36,909 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command' 2024-09-11 14:38:37,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None 2024-09-11 14:38:37,349 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-09-11 14:38:37,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None 2024-09-11 14:38:38,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None 2024-09-11 14:38:38,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None 2024-09-11 14:38:39,366 [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-09-11 14:38:39,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None 2024-09-11 14:38:40,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2 2024-09-11 14:38:40,269 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs' 2024-09-11 14:38:40,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None 2024-09-11 14:38:41,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None 2024-09-11 14:38:41,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-09-11 14:38:42,233 [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-09-11 14:38:42,726 [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-09-11 14:38:43,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-09-11 14:38:43,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None 2024-09-11 14:38:44,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-09-11 14:38:44,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None 2024-09-11 14:38:44,547 [ scc.repo] DEBUG - PR 332 jburel 'Build conda' 2024-09-11 14:38:45,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None 2024-09-11 14:38:45,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None 2024-09-11 14:38:46,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None 2024-09-11 14:38:46,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None 2024-09-11 14:38:47,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None 2024-09-11 14:38:47,901 [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-09-11 14:38:49,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None 2024-09-11 14:38:49,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2 2024-09-11 14:38:49,538 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj' 2024-09-11 14:38:50,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None 2024-09-11 14:38:50,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None 2024-09-11 14:38:51,040 [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-09-11 14:38:51,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None 2024-09-11 14:38:52,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2 2024-09-11 14:38:52,015 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins' 2024-09-11 14:38:52,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None 2024-09-11 14:38:53,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None 2024-09-11 14:38:53,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None 2024-09-11 14:38:54,331 [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-09-11 14:38:54,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None 2024-09-11 14:38:55,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2 2024-09-11 14:38:55,346 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error' 2024-09-11 14:38:55,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None 2024-09-11 14:38:56,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None 2024-09-11 14:38:56,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None 2024-09-11 14:38:57,377 [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-09-11 14:38:57,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None 2024-09-11 14:38:58,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2 2024-09-11 14:38:58,229 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group' 2024-09-11 14:38:58,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None 2024-09-11 14:38:59,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None 2024-09-11 14:38:59,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None 2024-09-11 14:39:00,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None 2024-09-11 14:39:00,101 [ scc.repo] DEBUG ## Branches found: 2024-09-11 14:39:00,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-09-11 14:39:00,102 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:39:00,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:00,107 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-09-11 14:39:00,112 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-09-11 14:39:00,112 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-09-11 14:39:00,118 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-09-11 14:39:00,124 [ scc.git] DEBUG Already up to date. 2024-09-11 14:39:00,124 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head' 2024-09-11 14:39:00,685 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-09-11 14:39:00,685 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD 2024-09-11 14:39:00,692 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head' 2024-09-11 14:39:00,989 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-09-11 14:39:00,989 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD 2024-09-11 14:39:00,995 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head' 2024-09-11 14:39:01,308 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-09-11 14:39:01,309 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD 2024-09-11 14:39:01,314 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head' 2024-09-11 14:39:01,728 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-09-11 14:39:01,729 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD 2024-09-11 14:39:01,734 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head' 2024-09-11 14:39:02,062 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-09-11 14:39:02,062 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD 2024-09-11 14:39:02,067 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head' 2024-09-11 14:39:02,360 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-09-11 14:39:02,361 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD 2024-09-11 14:39:02,366 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head' 2024-09-11 14:39:02,671 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-09-11 14:39:02,671 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD 2024-09-11 14:39:02,677 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head' 2024-09-11 14:39:02,955 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-09-11 14:39:02,956 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD 2024-09-11 14:39:02,960 [ scc.git] DEBUG Calling 'git fetch origin pull/424/head' 2024-09-11 14:39:03,383 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-09-11 14:39:03,383 [ scc.git] DEBUG * branch refs/pull/424/head -> FETCH_HEAD 2024-09-11 14:39:03,389 [ scc.git] DEBUG ## Unique users: [] 2024-09-11 14:39:03,389 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:39:03,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:03,394 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec' 2024-09-11 14:39:03,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:03,411 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec' 2024-09-11 14:39:03,469 [ scc.git] DEBUG Auto-merging src/omero/cli.py 2024-09-11 14:39:03,469 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py 2024-09-11 14:39:03,470 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:39:03,474 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++ 2024-09-11 14:39:03,474 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++--- 2024-09-11 14:39:03,474 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-) 2024-09-11 14:39:03,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:03,621 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb' 2024-09-11 14:39:03,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:03,638 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb' 2024-09-11 14:39:03,671 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py 2024-09-11 14:39:03,671 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py 2024-09-11 14:39:03,672 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:39:03,679 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------ 2024-09-11 14:39:03,679 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++ 2024-09-11 14:39:03,679 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-) 2024-09-11 14:39:04,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:04,009 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f' 2024-09-11 14:39:04,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:04,026 [ 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-09-11 14:39:04,046 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py 2024-09-11 14:39:04,047 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:39:04,049 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++---- 2024-09-11 14:39:04,049 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-) 2024-09-11 14:39:04,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:04,518 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a' 2024-09-11 14:39:04,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:04,535 [ 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-09-11 14:39:04,555 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py 2024-09-11 14:39:04,555 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py 2024-09-11 14:39:04,556 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:39:04,560 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++- 2024-09-11 14:39:04,560 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +- 2024-09-11 14:39:04,560 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-) 2024-09-11 14:39:04,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:04,914 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc' 2024-09-11 14:39:04,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:04,930 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc' 2024-09-11 14:39:04,950 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:39:04,952 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++ 2024-09-11 14:39:04,952 [ scc.git] DEBUG connect.py | 11 +++++++++++ 2024-09-11 14:39:04,953 [ scc.git] DEBUG 2 files changed, 48 insertions(+) 2024-09-11 14:39:04,953 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml 2024-09-11 14:39:04,953 [ scc.git] DEBUG create mode 100644 connect.py 2024-09-11 14:39:05,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:05,339 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5' 2024-09-11 14:39:05,352 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:05,357 [ 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-09-11 14:39:05,538 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py 2024-09-11 14:39:05,539 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:39:05,542 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++ 2024-09-11 14:39:05,542 [ scc.git] DEBUG 1 file changed, 2 insertions(+) 2024-09-11 14:39:05,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:05,733 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023' 2024-09-11 14:39:05,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:05,749 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023' 2024-09-11 14:39:06,206 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py 2024-09-11 14:39:06,207 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:39:06,211 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++-- 2024-09-11 14:39:06,211 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-) 2024-09-11 14:39:06,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:06,352 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804' 2024-09-11 14:39:06,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:06,370 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804' 2024-09-11 14:39:06,457 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py 2024-09-11 14:39:06,458 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:39:06,466 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------ 2024-09-11 14:39:06,466 [ scc.git] DEBUG 1 file changed, 36 deletions(-) 2024-09-11 14:39:06,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:06,733 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec' 2024-09-11 14:39:06,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:06,753 [ 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-09-11 14:39:06,798 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:39:06,801 [ scc.git] DEBUG src/omero/util/__init__.py | 8 +------- 2024-09-11 14:39:06,801 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 7 deletions(-) 2024-09-11 14:39:07,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:07,113 [ scc.git] DEBUG Calling 'git submodule update' 2024-09-11 14:39:07,156 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:39:07,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:07,161 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-11 14:39:07,202 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-09-11 14:39:07,212 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8962a7b5b0> has no local changes 2024-09-11 14:39:07,212 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-py Excluded PRs: - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller) - PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier) - 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/170/)' 2024-09-11 14:39:07,240 [ scc.git] DEBUG [detached HEAD cedbd183] merge master -Dorg -Ssuccess-only 2024-09-11 14:39:07,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:39:07,241 [ scc.git] INFO Overriding base-branch from master to develop 2024-09-11 14:39:07,241 [ scc.repo] DEBUG ## PRs found: 2024-09-11 14:39:07,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None 2024-09-11 14:39:08,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None 2024-09-11 14:39:08,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None 2024-09-11 14:39:09,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None 2024-09-11 14:39:09,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None 2024-09-11 14:39:10,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None 2024-09-11 14:39:10,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None 2024-09-11 14:39:11,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-09-11 14:39:12,023 [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-09-11 14:39:12,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-09-11 14:39:12,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2 2024-09-11 14:39:12,992 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-09-11 14:39:13,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None 2024-09-11 14:39:14,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None 2024-09-11 14:39:14,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None 2024-09-11 14:39:15,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None 2024-09-11 14:39:15,142 [ scc.repo] DEBUG ## Branches found: 2024-09-11 14:39:15,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-09-11 14:39:15,143 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:39:15,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:15,147 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop' 2024-09-11 14:39:15,151 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-09-11 14:39:15,151 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop' 2024-09-11 14:39:15,155 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop' 2024-09-11 14:39:15,159 [ scc.git] DEBUG Already up to date. 2024-09-11 14:39:15,160 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head' 2024-09-11 14:39:15,534 [ scc.git] DEBUG From https://github.com/ome/omero-scripts 2024-09-11 14:39:15,535 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD 2024-09-11 14:39:15,540 [ scc.git] DEBUG ## Unique users: [] 2024-09-11 14:39:15,540 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:39:15,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:15,545 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-09-11 14:39:15,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:15,557 [ 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-09-11 14:39:15,567 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py 2024-09-11 14:39:15,568 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py 2024-09-11 14:39:15,568 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-09-11 14:39:15,568 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-09-11 14:39:15,574 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0' 2024-09-11 14:39:15,582 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0 2024-09-11 14:39:15,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:15,730 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-09-11 14:39:15,737 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0' 2024-09-11 14:39:15,743 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' Conflicting PR. Removed from build [OMERO-python-superbuild-push#170](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/170/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/170/consoleText) for more details. Possible conflicts: - Upstream changes - omero/annotation_scripts/KeyVal_to_csv.py --conflicts 2024-09-11 14:39:15,747 [ scc.config] DEBUG Found github.token 2024-09-11 14:39:15,748 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts. 2024-09-11 14:39:15,748 [ scc.git] DEBUG Calling 'git submodule update' 2024-09-11 14:39:15,791 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:39:15,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:15,797 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-11 14:39:15,840 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-09-11 14:39:15,846 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8962ac5c40> has no local changes 2024-09-11 14:39:15,846 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/170/)' 2024-09-11 14:39:15,856 [ scc.git] DEBUG [detached HEAD 87c69a3] merge master -Dorg -Ssuccess-only 2024-09-11 14:39:15,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:39:15,857 [ scc.repo] DEBUG ## PRs found: 2024-09-11 14:39:16,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None 2024-09-11 14:39:16,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None 2024-09-11 14:39:17,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None 2024-09-11 14:39:17,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None 2024-09-11 14:39:18,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None 2024-09-11 14:39:18,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None 2024-09-11 14:39:19,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None 2024-09-11 14:39:19,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-09-11 14:39:20,468 [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-09-11 14:39:21,000 [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-09-11 14:39:21,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-09-11 14:39:21,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None 2024-09-11 14:39:22,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-09-11 14:39:22,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None 2024-09-11 14:39:22,808 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' 2024-09-11 14:39:23,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None 2024-09-11 14:39:23,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None 2024-09-11 14:39:24,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-09-11 14:39:24,777 [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-09-11 14:39:25,245 [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-09-11 14:39:25,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-09-11 14:39:26,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None 2024-09-11 14:39:26,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-09-11 14:39:27,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None 2024-09-11 14:39:27,121 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test' 2024-09-11 14:39:27,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None 2024-09-11 14:39:28,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None 2024-09-11 14:39:28,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None 2024-09-11 14:39:29,156 [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-09-11 14:39:29,639 [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-09-11 14:39:29,642 [ scc.repo] DEBUG ## Branches found: 2024-09-11 14:39:29,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-09-11 14:39:29,642 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:39:29,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:29,648 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-09-11 14:39:29,653 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-09-11 14:39:29,653 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-09-11 14:39:29,660 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-09-11 14:39:29,672 [ scc.git] DEBUG Already up to date. 2024-09-11 14:39:29,673 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head' 2024-09-11 14:39:30,067 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-09-11 14:39:30,068 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD 2024-09-11 14:39:30,074 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head' 2024-09-11 14:39:30,700 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-09-11 14:39:30,701 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD 2024-09-11 14:39:30,708 [ scc.git] DEBUG ## Unique users: [] 2024-09-11 14:39:30,708 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:39:30,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:30,714 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767' 2024-09-11 14:39:30,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:30,729 [ 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-09-11 14:39:30,866 [ scc.git] DEBUG Auto-merging omeroweb/settings.py 2024-09-11 14:39:30,866 [ scc.git] DEBUG Auto-merging setup.py 2024-09-11 14:39:30,868 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:39:30,872 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++- 2024-09-11 14:39:30,872 [ scc.git] DEBUG setup.py | 1 + 2024-09-11 14:39:30,872 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-) 2024-09-11 14:39:31,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:31,060 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005' 2024-09-11 14:39:31,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:31,075 [ 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-09-11 14:39:31,099 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py 2024-09-11 14:39:31,099 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py 2024-09-11 14:39:31,101 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-11 14:39:31,106 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +- 2024-09-11 14:39:31,106 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++-- 2024-09-11 14:39:31,106 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-) 2024-09-11 14:39:31,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:31,456 [ scc.git] DEBUG Calling 'git submodule update' 2024-09-11 14:39:31,500 [ scc.git] DEBUG Get sha1 of %s 2024-09-11 14:39:31,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-11 14:39:31,504 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-11 14:39:31,553 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-09-11 14:39:31,565 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8960a24310> has no local changes 2024-09-11 14:39:31,565 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-web Excluded PRs: - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT) - PR 535 will-moore 'Initial working browser history' (stage: draft) - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure) Already up to date. Merged PRs: - PR 527 will-moore 'Add some initial CSP settings to test' - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' Generated by OMERO-python-superbuild-push#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/170/)' 2024-09-11 14:39:31,580 [ scc.git] DEBUG [detached HEAD b705171c1] merge master -Dorg -Ssuccess-only 2024-09-11 14:39:31,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:39:31,580 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-11 14:39:31,641 [ scc.config] DEBUG Found submodule.omero-dropbox.url 2024-09-11 14:39:31,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:31,874 [ scc.config] DEBUG Found submodule.omero-marshal.url 2024-09-11 14:39:32,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:32,267 [ scc.config] DEBUG Found submodule.omero-py.url 2024-09-11 14:39:32,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:32,662 [ scc.config] DEBUG Found submodule.omero-scripts.url 2024-09-11 14:39:33,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:33,041 [ scc.config] DEBUG Found submodule.omero-web.url 2024-09-11 14:39:33,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-11 14:39:33,431 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-09-11 14:39:33,461 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8964867e50> has local changes 2024-09-11 14:39:33,461 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-python-superbuild Already up to date. Repository: ome/omero-dropbox Already up to date. Merged PRs: - PR 16 joshmoore 'Review all instances of whitelist/blacklist' Repository: ome/omero-marshal Excluded PRs: - PR 34 chris-allan 'Initial support for Event' (exclude comment) - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment) Already up to date. Merged PRs: - PR 69 will-moore 'Roi encoder allows Shape None' Repository: ome/omero-py Excluded PRs: - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller) - PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier) - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure) - PR 387 will-moore 'Numpy pixels type' (label: exclude) - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn) - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft) - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment) Already up to date. Merged PRs: - PR 199 joshmoore 'user: allow setting default group' - PR 207 manics 'BlitzGateway.connect raise on error' - PR 266 joshmoore 'errors: use raise_error from cli plugins' - PR 299 joshmoore 'Add parents and children to omero obj' - PR 332 jburel 'Build conda' - PR 337 will-moore 'bulk.yml depth is passed to xargs' - PR 391 joshmoore 'Add jstack command' - PR 408 jburel 'remove deprecated method' - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active' Repository: ome/omero-scripts Excluded PRs: - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT) - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier) - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn) - PR 103 joshmoore 'Script for calculating min/max' (exclude comment) Already up to date. Conflicting PRs (not included): - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' Repository: ome/omero-web Excluded PRs: - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT) - PR 535 will-moore 'Initial working browser history' (stage: draft) - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure) Already up to date. Merged PRs: - PR 527 will-moore 'Add some initial CSP settings to test' - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' Generated by OMERO-python-superbuild-push#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/170/)' 2024-09-11 14:39:33,471 [ scc.git] DEBUG [detached HEAD fa5c571] merge master -Dorg -Ssuccess-only 2024-09-11 14:39:33,471 [ scc.merge] INFO Repository: ome/omero-python-superbuild 2024-09-11 14:39:33,471 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-) 2024-09-11 14:39:33,471 [ scc.merge] INFO Already up to date. 2024-09-11 14:39:33,472 [ scc.merge] INFO 2024-09-11 14:39:33,472 [ scc.merge] INFO 2024-09-11 14:39:33,472 [ scc.merge] INFO Repository: ome/omero-dropbox 2024-09-11 14:39:33,472 [ scc.merge] INFO Already up to date. 2024-09-11 14:39:33,472 [ scc.merge] INFO 2024-09-11 14:39:33,472 [ scc.merge] INFO Merged PRs: 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist' 2024-09-11 14:39:33,472 [ scc.merge] INFO 2024-09-11 14:39:33,472 [ scc.merge] INFO Repository: ome/omero-marshal 2024-09-11 14:39:33,472 [ scc.merge] INFO Excluded PRs: 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment) 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment) 2024-09-11 14:39:33,472 [ scc.merge] INFO Already up to date. 2024-09-11 14:39:33,472 [ scc.merge] INFO 2024-09-11 14:39:33,472 [ scc.merge] INFO Merged PRs: 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None' 2024-09-11 14:39:33,472 [ scc.merge] INFO 2024-09-11 14:39:33,472 [ scc.merge] INFO Repository: ome/omero-py 2024-09-11 14:39:33,472 [ scc.merge] INFO Excluded PRs: 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller) 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier) 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure) 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude) 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn) 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft) 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment) 2024-09-11 14:39:33,472 [ scc.merge] INFO Already up to date. 2024-09-11 14:39:33,472 [ scc.merge] INFO 2024-09-11 14:39:33,472 [ scc.merge] INFO Merged PRs: 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group' 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error' 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins' 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj' 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 332 jburel 'Build conda' 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs' 2024-09-11 14:39:33,472 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command' 2024-09-11 14:39:33,473 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method' 2024-09-11 14:39:33,473 [ scc.merge] INFO - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active' 2024-09-11 14:39:33,473 [ scc.merge] INFO 2024-09-11 14:39:33,473 [ scc.merge] INFO Repository: ome/omero-scripts 2024-09-11 14:39:33,473 [ scc.merge] INFO Excluded PRs: 2024-09-11 14:39:33,473 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT) 2024-09-11 14:39:33,473 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier) 2024-09-11 14:39:33,473 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn) 2024-09-11 14:39:33,473 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment) 2024-09-11 14:39:33,473 [ scc.merge] INFO Already up to date. 2024-09-11 14:39:33,473 [ scc.merge] INFO 2024-09-11 14:39:33,473 [ scc.merge] INFO Conflicting PRs (not included): 2024-09-11 14:39:33,473 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-09-11 14:39:33,473 [ scc.merge] INFO 2024-09-11 14:39:33,473 [ scc.merge] INFO Repository: ome/omero-web 2024-09-11 14:39:33,473 [ scc.merge] INFO Excluded PRs: 2024-09-11 14:39:33,473 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT) 2024-09-11 14:39:33,473 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft) 2024-09-11 14:39:33,473 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure) 2024-09-11 14:39:33,473 [ scc.merge] INFO Already up to date. 2024-09-11 14:39:33,473 [ scc.merge] INFO 2024-09-11 14:39:33,473 [ scc.merge] INFO Merged PRs: 2024-09-11 14:39:33,473 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test' 2024-09-11 14:39:33,473 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' 2024-09-11 14:39:33,473 [ scc.merge] INFO 2024-09-11 14:39:33,473 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-09-11 14:39:33,473 [ scc.git] DEBUG Calling 'git remote' 2024-09-11 14:39:33,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-09-11 14:39:33,478 [ scc.git] DEBUG Calling 'git remote' 2024-09-11 14:39:33,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:39:33,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-09-11 14:39:33,483 [ scc.git] DEBUG Calling 'git remote' 2024-09-11 14:39:33,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:39:33,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-09-11 14:39:33,488 [ scc.git] DEBUG Calling 'git remote' 2024-09-11 14:39:33,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:39:33,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-09-11 14:39:33,492 [ scc.git] DEBUG Calling 'git remote' 2024-09-11 14:39:33,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-09-11 14:39:33,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-09-11 14:39:33,497 [ scc.git] DEBUG Calling 'git remote' 2024-09-11 14:39:33,501 [ 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 da5b7d11f nothing to commit, working tree clean HEAD detached from e849d72 nothing to commit, working tree clean 2024-09-11 14:40:03,839 [ 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