![[Jenkins]](/jenkins/static/0ce0ee70/images/svgs/logo.svg){kind=logo}
Started by upstream project "Trigger" build number 71 originally caused by: Started by timer [Pipeline] Start of Pipeline [Pipeline] node Running on testintegration in /home/omero/workspace/OMERO-python-superbuild-push [Pipeline] { [Pipeline] library Loading library recursiveMerge@master Attempting to resolve master from remote references... > git --version # timeout=10 > git --version # 'git version 2.39.2' > git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Found match: refs/heads/master revision f061dff15033c5cd55249a383f52c15ca4a0e5cf The recommended git tool is: NONE No credentials specified > git rev-parse --resolve-git-dir /var/jenkins_home/jobs/OMERO-python-superbuild-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Fetching without tags Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git > git --version # timeout=10 > git --version # 'git version 2.39.2' > git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master) > git config core.sparsecheckout # timeout=10 > git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 Commit message: "Merge pull request #17 from jburel/python3" > git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 [Pipeline] checkout The recommended git tool is: NONE No credentials specified Fetching changes from the remote Git repository Checking out Revision ee4b0bab28a953efe211ded8eba1cfe37719eb11 (refs/remotes/origin/master) > git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-python-superbuild-push/.git # timeout=10 > git config remote.origin.url https://github.com/ome/omero-python-superbuild.git # timeout=10 Fetching upstream changes from https://github.com/ome/omero-python-superbuild.git > git --version # timeout=10 > git --version # 'git version 2.39.3' > git fetch --tags --force --progress -- https://github.com/ome/omero-python-superbuild.git +refs/heads/*:refs/remotes/origin/* # timeout=10 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f ee4b0bab28a953efe211ded8eba1cfe37719eb11 # timeout=10 Commit message: "Merge pull request #278 from ome/dependabot/submodules/omero-py-53a327b" > git rev-list --no-walk ee4b0bab28a953efe211ded8eba1cfe37719eb11 # timeout=10 Cleaning workspace > git rev-parse --verify HEAD # timeout=10 Resetting working tree > git reset --hard # timeout=10 > git clean -fdx # timeout=10 > git submodule foreach --recursive git reset --hard # timeout=10 > git submodule foreach --recursive git clean -fdx # timeout=10 > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule init # timeout=10 > git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10 > git config --get submodule.omero-py.url # timeout=10 > git config -f .gitmodules --get submodule.omero-py.path # timeout=10 > git config --get submodule.omero-web.url # timeout=10 > git config -f .gitmodules --get submodule.omero-web.path # timeout=10 > git config --get submodule.omero-marshal.url # timeout=10 > git config -f .gitmodules --get submodule.omero-marshal.path # timeout=10 > git config --get submodule.omero-dropbox.url # timeout=10 > git config -f .gitmodules --get submodule.omero-dropbox.path # timeout=10 > git config --get submodule.omero-scripts.url # timeout=10 > git config -f .gitmodules --get submodule.omero-scripts.path # timeout=10 > git submodule update --init --recursive omero-py # timeout=10 > git submodule update --init --recursive omero-web # timeout=10 > git submodule update --init --recursive omero-marshal # timeout=10 [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-build-push" build number 64 [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-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.0-py3-none-any.whl (2.1 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.0 + python3 -m pip install scc Collecting scc Using cached scc-0.19.1-py3-none-any.whl.metadata (3.6 kB) Collecting PyGithub>=1.54 (from scc) Using cached PyGithub-2.3.0-py3-none-any.whl.metadata (3.8 kB) Collecting PyYAML>=5.1 (from scc) Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.1 kB) Collecting future (from scc) Using cached future-1.0.0-py3-none-any.whl.metadata (4.0 kB) Collecting ruamel.yaml (from scc) Using cached ruamel.yaml-0.18.6-py3-none-any.whl.metadata (23 kB) Collecting ruamel.yaml.jinja2 (from scc) Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl.metadata (2.9 kB) Collecting six (from scc) Using cached six-1.16.0-py2.py3-none-any.whl.metadata (1.8 kB) Collecting urllib3<2 (from scc) Using cached urllib3-1.26.18-py2.py3-none-any.whl.metadata (48 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.31.0-py3-none-any.whl.metadata (4.6 kB) Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached PyJWT-2.8.0-py3-none-any.whl.metadata (4.2 kB) Collecting typing-extensions>=4.0.0 (from PyGithub>=1.54->scc) Using cached typing_extensions-4.11.0-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-42.0.7-cp39-abi3-manylinux_2_28_x86_64.whl.metadata (5.3 kB) Collecting cffi>=1.4.1 (from pynacl>=1.4.0->PyGithub>=1.54->scc) Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (1.5 kB) Collecting charset-normalizer<4,>=2 (from requests>=2.14.0->PyGithub>=1.54->scc) Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (33 kB) Collecting idna<4,>=2.5 (from requests>=2.14.0->PyGithub>=1.54->scc) Using cached idna-3.7-py3-none-any.whl.metadata (9.9 kB) Collecting certifi>=2017.4.17 (from requests>=2.14.0->PyGithub>=1.54->scc) Using cached certifi-2024.2.2-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.19.1-py3-none-any.whl (48 kB) Using cached PyGithub-2.3.0-py3-none-any.whl (354 kB) Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (738 kB) Using cached urllib3-1.26.18-py2.py3-none-any.whl (143 kB) Using cached future-1.0.0-py3-none-any.whl (491 kB) Using cached ruamel.yaml-0.18.6-py3-none-any.whl (117 kB) Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB) Using cached six-1.16.0-py2.py3-none-any.whl (11 kB) Using cached PyJWT-2.8.0-py3-none-any.whl (22 kB) Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl (856 kB) Using cached requests-2.31.0-py3-none-any.whl (62 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.11.0-py3-none-any.whl (34 kB) Using cached Deprecated-1.2.14-py2.py3-none-any.whl (9.6 kB) Using cached certifi-2024.2.2-py3-none-any.whl (163 kB) Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (443 kB) Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (142 kB) Using cached cryptography-42.0.7-cp39-abi3-manylinux_2_28_x86_64.whl (3.8 MB) Using cached idna-3.7-py3-none-any.whl (66 kB) Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (80 kB) Using cached pycparser-2.22-py3-none-any.whl (117 kB) Installing collected packages: wrapt, urllib3, typing-extensions, six, ruamel.yaml.clib, PyYAML, pyjwt, pycparser, idna, future, charset-normalizer, certifi, yaclifw, ruamel.yaml, requests, Deprecated, cffi, ruamel.yaml.jinja2, pynacl, cryptography, PyGithub, scc Successfully installed Deprecated-1.2.14 PyGithub-2.3.0 PyYAML-6.0.1 certifi-2024.2.2 cffi-1.16.0 charset-normalizer-3.3.2 cryptography-42.0.7 future-1.0.0 idna-3.7 pycparser-2.22 pyjwt-2.8.0 pynacl-1.5.0 requests-2.31.0 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.8 ruamel.yaml.jinja2-0.2.7 scc-0.19.1 six-1.16.0 typing-extensions-4.11.0 urllib3-1.26.18 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-05-15 00:32:42,753 [ scc.config] DEBUG Found github.token 2024-05-15 00:32:42,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-05-15 00:32:43,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:32:43,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:32:43,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-05-15 00:32:43,823 [ scc.gh] DEBUG 3073 remaining from 5000 (Reset at 00:05 2024-05-15 00:32:43,823 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-15 00:32:43,827 [ scc.git] DEBUG Check current status 2024-05-15 00:32:43,828 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-15 00:32:43,831 [ scc.git] DEBUG ee4b0ba Merge pull request #278 from ome/dependabot/submodules/omero-py-53a327b 2024-05-15 00:32:43,831 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-15 00:32:43,872 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-05-15 00:32:43,875 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-05-15 00:32:43,917 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8) 2024-05-15 00:32:43,921 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893) 2024-05-15 00:32:44,007 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb) 2024-05-15 00:32:44,012 [ scc.config] DEBUG Found remote.origin.url 2024-05-15 00:32:44,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None 2024-05-15 00:32:44,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-15 00:32:45,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-15 00:32:45,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-15 00:32:46,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-15 00:32:46,041 [ scc.git] DEBUG Resetting... 2024-05-15 00:32:46,041 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-05-15 00:32:46,046 [ scc.git] DEBUG HEAD is now at ee4b0ba Merge pull request #278 from ome/dependabot/submodules/omero-py-53a327b 2024-05-15 00:32:46,047 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-05-15 00:32:46,099 [ scc.git] DEBUG Check current status 2024-05-15 00:32:46,099 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-15 00:32:46,103 [ scc.git] DEBUG ee4b0ba Merge pull request #278 from ome/dependabot/submodules/omero-py-53a327b 2024-05-15 00:32:46,103 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-15 00:32:46,145 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-05-15 00:32:46,148 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-05-15 00:32:46,152 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8) 2024-05-15 00:32:46,156 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893) 2024-05-15 00:32:46,160 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb) 2024-05-15 00:32:46,160 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-05-15 00:32:46,161 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-05-15 00:32:46,161 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-05-15 00:32:46,161 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-05-15 00:32:46,161 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-05-15 00:32:46,161 [ scc.repo] DEBUG ## PRs found: 2024-05-15 00:32:46,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2 2024-05-15 00:32:46,486 [ scc.repo] DEBUG ## Branches found: 2024-05-15 00:32:46,486 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:32:46,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:32:46,490 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-05-15 00:32:46,494 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-15 00:32:46,494 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-05-15 00:32:46,498 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-05-15 00:32:46,502 [ scc.git] DEBUG Already up to date. 2024-05-15 00:32:46,502 [ scc.git] DEBUG ## Unique users: [] 2024-05-15 00:32:46,503 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:32:46,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:32:46,506 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-15 00:32:46,548 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:32:46,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:32:46,553 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-15 00:32:46,732 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa039b85e80> has no local changes 2024-05-15 00:32:46,732 [ 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#62 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/62/)' 2024-05-15 00:32:46,757 [ scc.git] DEBUG [detached HEAD 2eb0122] merge master -Dorg -Snone 2024-05-15 00:32:46,757 [ scc.merge] INFO Repository: ome/omero-python-superbuild 2024-05-15 00:32:46,758 [ scc.merge] INFO Already up to date. 2024-05-15 00:32:46,758 [ scc.merge] INFO 2024-05-15 00:32:46,758 [ scc.merge] INFO 2024-05-15 00:32:46,758 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-05-15 00:32:46,758 [ 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-05-15 00:32:49,158 [ scc.config] DEBUG Found github.token 2024-05-15 00:32:49,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-05-15 00:32:49,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:32:49,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:32:50,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-05-15 00:32:50,216 [ scc.gh] DEBUG 3051 remaining from 5000 (Reset at 00:05 2024-05-15 00:32:50,216 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-15 00:32:50,220 [ scc.git] DEBUG Check current status 2024-05-15 00:32:50,220 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-15 00:32:50,224 [ scc.git] DEBUG 2eb0122 merge master -Dorg -Snone 2024-05-15 00:32:50,224 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-15 00:32:50,265 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-05-15 00:32:50,268 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-05-15 00:32:50,272 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8) 2024-05-15 00:32:50,275 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893) 2024-05-15 00:32:50,280 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb) 2024-05-15 00:32:50,284 [ scc.config] DEBUG Found remote.origin.url 2024-05-15 00:32:50,284 [ scc.git] DEBUG Reading repository configuration from repositories.yml 2024-05-15 00:32:50,286 [ scc.git] DEBUG Repository configuration: base-branch: master submodules: omero-scripts: base-branch: develop 2024-05-15 00:32:50,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None 2024-05-15 00:32:51,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-15 00:32:51,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-15 00:32:51,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-15 00:32:52,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-15 00:32:52,374 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-15 00:32:52,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-05-15 00:32:52,423 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-15 00:32:52,426 [ scc.git] DEBUG Check current status 2024-05-15 00:32:52,427 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-15 00:32:52,430 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0 2024-05-15 00:32:52,430 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-15 00:32:52,473 [ scc.config] DEBUG Found remote.origin.url 2024-05-15 00:32:52,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None 2024-05-15 00:32:53,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-15 00:32:53,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-15 00:32:54,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-15 00:32:54,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-15 00:32:54,573 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-15 00:32:54,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:32:54,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-05-15 00:32:54,617 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-15 00:32:54,621 [ scc.git] DEBUG Check current status 2024-05-15 00:32:54,621 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-15 00:32:54,625 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312 2024-05-15 00:32:54,625 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-15 00:32:54,671 [ scc.config] DEBUG Found remote.origin.url 2024-05-15 00:32:55,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None 2024-05-15 00:32:55,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-15 00:32:55,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-15 00:32:56,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-15 00:32:56,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-15 00:32:56,756 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-15 00:32:56,797 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:32:56,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-05-15 00:32:56,798 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-15 00:32:56,802 [ scc.git] DEBUG Check current status 2024-05-15 00:32:56,802 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-15 00:32:56,806 [ scc.git] DEBUG 53a327b8 Merge pull request #407 from jburel/install_conda_forge 2024-05-15 00:32:56,806 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-15 00:32:56,850 [ scc.config] DEBUG Found remote.origin.url 2024-05-15 00:32:57,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None 2024-05-15 00:32:57,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-15 00:32:58,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-15 00:32:58,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-15 00:32:58,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-15 00:32:58,923 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-15 00:32:58,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:32:58,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-05-15 00:32:58,965 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-15 00:32:58,969 [ scc.git] DEBUG Check current status 2024-05-15 00:32:58,969 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-15 00:32:58,974 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0 2024-05-15 00:32:58,974 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-15 00:32:59,019 [ scc.config] DEBUG Found remote.origin.url 2024-05-15 00:32:59,020 [ scc.git] DEBUG Repository configuration: base-branch: develop 2024-05-15 00:32:59,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None 2024-05-15 00:32:59,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-15 00:33:00,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-15 00:33:00,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-15 00:33:01,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-15 00:33:01,112 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-15 00:33:01,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:33:01,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-05-15 00:33:01,155 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-15 00:33:01,159 [ scc.git] DEBUG Check current status 2024-05-15 00:33:01,159 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-15 00:33:01,165 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request 2024-05-15 00:33:01,165 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-15 00:33:01,210 [ scc.config] DEBUG Found remote.origin.url 2024-05-15 00:33:01,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None 2024-05-15 00:33:02,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-15 00:33:02,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-15 00:33:02,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-15 00:33:03,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-15 00:33:03,320 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-15 00:33:03,357 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:33:03,357 [ scc.git] DEBUG Resetting... 2024-05-15 00:33:03,357 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-05-15 00:33:03,363 [ scc.git] DEBUG HEAD is now at 2eb0122 merge master -Dorg -Snone 2024-05-15 00:33:03,363 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-05-15 00:33:03,417 [ scc.git] DEBUG Check current status 2024-05-15 00:33:03,417 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-15 00:33:03,421 [ scc.git] DEBUG 2eb0122 merge master -Dorg -Snone 2024-05-15 00:33:03,422 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-15 00:33:03,461 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4) 2024-05-15 00:33:03,463 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-05-15 00:33:03,467 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8) 2024-05-15 00:33:03,471 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893) 2024-05-15 00:33:03,474 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb) 2024-05-15 00:33:03,475 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-05-15 00:33:03,476 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-05-15 00:33:03,476 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-05-15 00:33:03,476 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-05-15 00:33:03,476 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-05-15 00:33:03,476 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-05-15 00:33:03,476 [ scc.repo] DEBUG ## PRs found: 2024-05-15 00:33:03,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2 2024-05-15 00:33:03,754 [ scc.repo] DEBUG ## Branches found: 2024-05-15 00:33:03,754 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:33:03,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:03,758 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-05-15 00:33:03,762 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-15 00:33:03,762 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-05-15 00:33:03,767 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-05-15 00:33:03,771 [ scc.git] DEBUG Already up to date. 2024-05-15 00:33:03,771 [ scc.git] DEBUG ## Unique users: [] 2024-05-15 00:33:03,772 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:33:03,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:03,775 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-15 00:33:03,816 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:33:03,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:03,820 [ scc.repo] DEBUG ## PRs found: 2024-05-15 00:33:04,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None 2024-05-15 00:33:04,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None 2024-05-15 00:33:05,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None 2024-05-15 00:33:05,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None 2024-05-15 00:33:06,147 [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-05-15 00:33:06,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None 2024-05-15 00:33:07,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2 2024-05-15 00:33:07,009 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist' 2024-05-15 00:33:07,009 [ scc.repo] DEBUG ## Branches found: 2024-05-15 00:33:07,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-05-15 00:33:07,009 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:33:07,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:07,014 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-05-15 00:33:07,017 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-15 00:33:07,018 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-05-15 00:33:07,022 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-05-15 00:33:07,026 [ scc.git] DEBUG Already up to date. 2024-05-15 00:33:07,026 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head' 2024-05-15 00:33:07,424 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox 2024-05-15 00:33:07,424 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD 2024-05-15 00:33:07,428 [ scc.git] DEBUG ## Unique users: [] 2024-05-15 00:33:07,429 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:33:07,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:07,433 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452' 2024-05-15 00:33:07,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:07,442 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452' 2024-05-15 00:33:07,475 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py 2024-05-15 00:33:07,476 [ scc.git] DEBUG Auto-merging src/fsDirectory.py 2024-05-15 00:33:07,476 [ scc.git] DEBUG Auto-merging src/fsDropBox.py 2024-05-15 00:33:07,476 [ scc.git] DEBUG Auto-merging src/fsLists.py 2024-05-15 00:33:07,476 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py 2024-05-15 00:33:07,476 [ scc.git] DEBUG Auto-merging src/fsMonitor.py 2024-05-15 00:33:07,476 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py 2024-05-15 00:33:07,476 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py 2024-05-15 00:33:07,476 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py 2024-05-15 00:33:07,476 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:33:07,480 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++--- 2024-05-15 00:33:07,480 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++-------------------- 2024-05-15 00:33:07,480 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++----------- 2024-05-15 00:33:07,480 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------ 2024-05-15 00:33:07,480 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++----- 2024-05-15 00:33:07,480 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++----------- 2024-05-15 00:33:07,480 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++----- 2024-05-15 00:33:07,480 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++---- 2024-05-15 00:33:07,480 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++--------- 2024-05-15 00:33:07,480 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-) 2024-05-15 00:33:07,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:33:07,646 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-15 00:33:07,683 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:33:07,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:07,687 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-15 00:33:07,724 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-15 00:33:07,729 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3c280803d0> has no local changes 2024-05-15 00:33:07,730 [ 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#62 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/62/)' 2024-05-15 00:33:07,737 [ scc.git] DEBUG [detached HEAD 7b1b9e6] merge master -Dorg -Ssuccess-only 2024-05-15 00:33:07,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:33:07,738 [ scc.repo] DEBUG ## PRs found: 2024-05-15 00:33:08,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None 2024-05-15 00:33:08,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None 2024-05-15 00:33:09,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None 2024-05-15 00:33:09,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None 2024-05-15 00:33:10,087 [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-05-15 00:33:10,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-05-15 00:33:11,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None 2024-05-15 00:33:11,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2 2024-05-15 00:33:11,441 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None' 2024-05-15 00:33:11,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None 2024-05-15 00:33:12,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None 2024-05-15 00:33:12,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None 2024-05-15 00:33:13,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None 2024-05-15 00:33:13,418 [ scc.repo] DEBUG ## Branches found: 2024-05-15 00:33:13,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-05-15 00:33:13,418 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:33:13,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:13,423 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-05-15 00:33:13,427 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-15 00:33:13,427 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-05-15 00:33:13,432 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-05-15 00:33:13,437 [ scc.git] DEBUG Already up to date. 2024-05-15 00:33:13,438 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-05-15 00:33:13,880 [ scc.git] DEBUG From https://github.com/ome/omero-marshal 2024-05-15 00:33:13,881 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-05-15 00:33:13,886 [ scc.git] DEBUG ## Unique users: [] 2024-05-15 00:33:13,886 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:33:13,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:13,890 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca' 2024-05-15 00:33:13,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:13,899 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca' 2024-05-15 00:33:13,909 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py 2024-05-15 00:33:13,909 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:33:13,912 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++-- 2024-05-15 00:33:13,912 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++- 2024-05-15 00:33:13,912 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-) 2024-05-15 00:33:14,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:33:14,070 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-15 00:33:14,112 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:33:14,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:14,116 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-15 00:33:14,175 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-15 00:33:14,181 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3c28018f10> has no local changes 2024-05-15 00:33:14,182 [ 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#62 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/62/)' 2024-05-15 00:33:14,190 [ scc.git] DEBUG [detached HEAD d916f64] merge master -Dorg -Ssuccess-only 2024-05-15 00:33:14,190 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:33:14,190 [ scc.repo] DEBUG ## PRs found: 2024-05-15 00:33:14,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None 2024-05-15 00:33:15,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None 2024-05-15 00:33:15,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None 2024-05-15 00:33:16,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-05-15 00:33:16,795 [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-05-15 00:33:17,273 [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-05-15 00:33:17,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-05-15 00:33:18,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None 2024-05-15 00:33:18,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-05-15 00:33:19,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None 2024-05-15 00:33:19,145 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method' 2024-05-15 00:33:19,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None 2024-05-15 00:33:20,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None 2024-05-15 00:33:20,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None 2024-05-15 00:33:21,006 [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-05-15 00:33:21,495 [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-05-15 00:33:21,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None 2024-05-15 00:33:22,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-05-15 00:33:22,849 [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-05-15 00:33:23,295 [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-05-15 00:33:23,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-05-15 00:33:24,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None 2024-05-15 00:33:24,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-05-15 00:33:25,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None 2024-05-15 00:33:25,023 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command' 2024-05-15 00:33:25,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None 2024-05-15 00:33:25,502 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-05-15 00:33:25,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None 2024-05-15 00:33:26,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None 2024-05-15 00:33:26,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None 2024-05-15 00:33:27,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None 2024-05-15 00:33:27,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None 2024-05-15 00:33:28,244 [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-05-15 00:33:28,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None 2024-05-15 00:33:29,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2 2024-05-15 00:33:29,165 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs' 2024-05-15 00:33:29,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None 2024-05-15 00:33:30,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None 2024-05-15 00:33:30,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-05-15 00:33:30,984 [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-05-15 00:33:31,447 [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-05-15 00:33:31,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-05-15 00:33:32,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None 2024-05-15 00:33:32,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-05-15 00:33:33,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None 2024-05-15 00:33:33,271 [ scc.repo] DEBUG - PR 332 jburel 'Build conda' 2024-05-15 00:33:33,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None 2024-05-15 00:33:34,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None 2024-05-15 00:33:34,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None 2024-05-15 00:33:35,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None 2024-05-15 00:33:35,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None 2024-05-15 00:33:36,137 [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-05-15 00:33:36,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None 2024-05-15 00:33:37,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2 2024-05-15 00:33:37,004 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj' 2024-05-15 00:33:37,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None 2024-05-15 00:33:37,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None 2024-05-15 00:33:38,366 [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-05-15 00:33:38,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None 2024-05-15 00:33:39,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2 2024-05-15 00:33:39,230 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins' 2024-05-15 00:33:39,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None 2024-05-15 00:33:40,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None 2024-05-15 00:33:40,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None 2024-05-15 00:33:41,159 [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-05-15 00:33:41,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None 2024-05-15 00:33:42,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2 2024-05-15 00:33:42,024 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error' 2024-05-15 00:33:42,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None 2024-05-15 00:33:42,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None 2024-05-15 00:33:43,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None 2024-05-15 00:33:43,824 [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-05-15 00:33:44,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None 2024-05-15 00:33:44,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2 2024-05-15 00:33:44,759 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group' 2024-05-15 00:33:45,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None 2024-05-15 00:33:45,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None 2024-05-15 00:33:46,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None 2024-05-15 00:33:46,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None 2024-05-15 00:33:46,716 [ scc.repo] DEBUG ## Branches found: 2024-05-15 00:33:46,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-05-15 00:33:46,717 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:33:46,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:46,723 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-05-15 00:33:46,728 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-15 00:33:46,728 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-05-15 00:33:46,733 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-05-15 00:33:46,739 [ scc.git] DEBUG Already up to date. 2024-05-15 00:33:46,740 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head' 2024-05-15 00:33:47,243 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-15 00:33:47,243 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD 2024-05-15 00:33:47,249 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head' 2024-05-15 00:33:47,689 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-15 00:33:47,690 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD 2024-05-15 00:33:47,695 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head' 2024-05-15 00:33:48,106 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-15 00:33:48,106 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD 2024-05-15 00:33:48,112 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head' 2024-05-15 00:33:48,509 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-15 00:33:48,509 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD 2024-05-15 00:33:48,514 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head' 2024-05-15 00:33:48,951 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-15 00:33:48,952 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD 2024-05-15 00:33:48,957 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head' 2024-05-15 00:33:49,368 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-15 00:33:49,369 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD 2024-05-15 00:33:49,375 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head' 2024-05-15 00:33:49,769 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-15 00:33:49,770 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD 2024-05-15 00:33:49,774 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head' 2024-05-15 00:33:50,241 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-15 00:33:50,241 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD 2024-05-15 00:33:50,247 [ scc.git] DEBUG ## Unique users: [] 2024-05-15 00:33:50,247 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:33:50,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:50,252 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec' 2024-05-15 00:33:50,266 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:50,272 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec' 2024-05-15 00:33:50,333 [ scc.git] DEBUG Auto-merging src/omero/cli.py 2024-05-15 00:33:50,333 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py 2024-05-15 00:33:50,334 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:33:50,338 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++ 2024-05-15 00:33:50,338 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++--- 2024-05-15 00:33:50,339 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-) 2024-05-15 00:33:50,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:33:50,509 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb' 2024-05-15 00:33:50,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:50,525 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb' 2024-05-15 00:33:50,656 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py 2024-05-15 00:33:50,657 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py 2024-05-15 00:33:50,657 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:33:50,665 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------ 2024-05-15 00:33:50,665 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++ 2024-05-15 00:33:50,665 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-) 2024-05-15 00:33:50,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:33:50,910 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f' 2024-05-15 00:33:50,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:50,929 [ 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-05-15 00:33:51,004 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py 2024-05-15 00:33:51,005 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:33:51,009 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++---- 2024-05-15 00:33:51,009 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-) 2024-05-15 00:33:51,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:33:51,330 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a' 2024-05-15 00:33:51,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:51,347 [ 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-05-15 00:33:51,415 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py 2024-05-15 00:33:51,415 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py 2024-05-15 00:33:51,416 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:33:51,420 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++- 2024-05-15 00:33:51,420 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +- 2024-05-15 00:33:51,420 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-) 2024-05-15 00:33:51,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:33:51,725 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc' 2024-05-15 00:33:51,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:51,742 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc' 2024-05-15 00:33:51,773 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:33:51,776 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++ 2024-05-15 00:33:51,776 [ scc.git] DEBUG connect.py | 11 +++++++++++ 2024-05-15 00:33:51,776 [ scc.git] DEBUG 2 files changed, 48 insertions(+) 2024-05-15 00:33:51,776 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml 2024-05-15 00:33:51,776 [ scc.git] DEBUG create mode 100644 connect.py 2024-05-15 00:33:52,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:33:52,131 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5' 2024-05-15 00:33:52,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:52,147 [ 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-05-15 00:33:52,200 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py 2024-05-15 00:33:52,202 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:33:52,206 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++ 2024-05-15 00:33:52,206 [ scc.git] DEBUG 1 file changed, 2 insertions(+) 2024-05-15 00:33:52,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:33:52,538 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023' 2024-05-15 00:33:52,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:52,554 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023' 2024-05-15 00:33:52,638 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py 2024-05-15 00:33:52,639 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:33:52,642 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++-- 2024-05-15 00:33:52,642 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-) 2024-05-15 00:33:52,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:33:52,951 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804' 2024-05-15 00:33:52,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:52,968 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804' 2024-05-15 00:33:53,037 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py 2024-05-15 00:33:53,039 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:33:53,048 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------ 2024-05-15 00:33:53,048 [ scc.git] DEBUG 1 file changed, 36 deletions(-) 2024-05-15 00:33:53,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:33:53,355 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-15 00:33:53,399 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:33:53,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:33:53,403 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-15 00:33:53,446 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-15 00:33:53,454 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3c26fbb760> has no local changes 2024-05-15 00:33:53,454 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-py Excluded PRs: - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure) - PR 387 will-moore 'Numpy pixels type' (label: exclude) - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu) - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn) - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft) - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment) Already up to date. Merged PRs: - PR 199 joshmoore 'user: allow setting default group' - PR 207 manics 'BlitzGateway.connect raise on error' - PR 266 joshmoore 'errors: use raise_error from cli plugins' - PR 299 joshmoore 'Add parents and children to omero obj' - PR 332 jburel 'Build conda' - PR 337 will-moore 'bulk.yml depth is passed to xargs' - PR 391 joshmoore 'Add jstack command' - PR 408 jburel 'remove deprecated method' Generated by OMERO-python-superbuild-push#62 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/62/)' 2024-05-15 00:33:53,465 [ scc.git] DEBUG [detached HEAD 9c6bfd7b] merge master -Dorg -Ssuccess-only 2024-05-15 00:33:53,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:33:53,466 [ scc.git] INFO Overriding base-branch from master to develop 2024-05-15 00:33:53,466 [ scc.repo] DEBUG ## PRs found: 2024-05-15 00:33:53,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None 2024-05-15 00:33:54,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None 2024-05-15 00:33:54,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None 2024-05-15 00:33:55,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None 2024-05-15 00:33:55,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None 2024-05-15 00:33:56,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None 2024-05-15 00:33:56,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None 2024-05-15 00:33:57,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-05-15 00:33:57,727 [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-05-15 00:33:58,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-05-15 00:33:58,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2 2024-05-15 00:33:58,575 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-05-15 00:33:59,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None 2024-05-15 00:33:59,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None 2024-05-15 00:33:59,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None 2024-05-15 00:34:00,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None 2024-05-15 00:34:00,476 [ scc.repo] DEBUG ## Branches found: 2024-05-15 00:34:00,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-05-15 00:34:00,476 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:34:00,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:00,480 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop' 2024-05-15 00:34:00,484 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-15 00:34:00,484 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop' 2024-05-15 00:34:00,488 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop' 2024-05-15 00:34:00,493 [ scc.git] DEBUG Already up to date. 2024-05-15 00:34:00,493 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head' 2024-05-15 00:34:00,994 [ scc.git] DEBUG From https://github.com/ome/omero-scripts 2024-05-15 00:34:00,994 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD 2024-05-15 00:34:00,999 [ scc.git] DEBUG ## Unique users: [] 2024-05-15 00:34:01,000 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:34:01,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:01,005 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-05-15 00:34:01,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:01,018 [ 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-05-15 00:34:01,055 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py 2024-05-15 00:34:01,055 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py 2024-05-15 00:34:01,056 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-05-15 00:34:01,056 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-05-15 00:34:01,061 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a' 2024-05-15 00:34:01,067 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0 2024-05-15 00:34:01,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:34:01,229 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-05-15 00:34:01,235 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a' 2024-05-15 00:34:01,241 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' Conflicting PR. Removed from build [OMERO-python-superbuild-push#62](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/62/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/62/consoleText) for more details. Possible conflicts: - Upstream changes - omero/annotation_scripts/KeyVal_to_csv.py --conflicts 2024-05-15 00:34:01,246 [ scc.config] DEBUG Found github.token 2024-05-15 00:34:01,246 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts. 2024-05-15 00:34:01,246 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-15 00:34:01,287 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:34:01,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:01,291 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-15 00:34:01,334 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-15 00:34:01,342 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3c26fa2640> has no local changes 2024-05-15 00:34:01,342 [ 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#62 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/62/)' 2024-05-15 00:34:01,350 [ scc.git] DEBUG [detached HEAD 171ca50] merge master -Dorg -Ssuccess-only 2024-05-15 00:34:01,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:34:01,351 [ scc.repo] DEBUG ## PRs found: 2024-05-15 00:34:01,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None 2024-05-15 00:34:02,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/554 HTTP/1.1" 200 None 2024-05-15 00:34:02,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/553 HTTP/1.1" 200 None 2024-05-15 00:34:03,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None 2024-05-15 00:34:03,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None 2024-05-15 00:34:04,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6 HTTP/1.1" 200 None 2024-05-15 00:34:04,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-05-15 00:34:05,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-05-15 00:34:05,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6 HTTP/1.1" 200 None 2024-05-15 00:34:05,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/cdfac8b370264c2875799e26a2c49f31482124e6?per_page=1 HTTP/1.1" 200 None 2024-05-15 00:34:06,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6 HTTP/1.1" 200 None 2024-05-15 00:34:06,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6/status HTTP/1.1" 200 None 2024-05-15 00:34:06,815 [ scc.repo] DEBUG - PR 549 knabar 'Remove webgateway cache' 2024-05-15 00:34:07,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None 2024-05-15 00:34:07,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None 2024-05-15 00:34:08,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None 2024-05-15 00:34:08,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-05-15 00:34:09,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-05-15 00:34:09,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None 2024-05-15 00:34:10,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4?per_page=1 HTTP/1.1" 200 None 2024-05-15 00:34:10,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None 2024-05-15 00:34:10,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None 2024-05-15 00:34:10,972 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks' 2024-05-15 00:34:11,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None 2024-05-15 00:34:11,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None 2024-05-15 00:34:11,941 [ scc.repo] DEBUG # ... Include label: include 2024-05-15 00:34:12,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None 2024-05-15 00:34:12,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-05-15 00:34:13,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-05-15 00:34:13,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None 2024-05-15 00:34:14,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/977f7b65169e6dee479197a9156993bbadd2d2e2?per_page=1 HTTP/1.1" 200 None 2024-05-15 00:34:14,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None 2024-05-15 00:34:15,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None 2024-05-15 00:34:15,161 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display' 2024-05-15 00:34:15,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None 2024-05-15 00:34:16,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None 2024-05-15 00:34:16,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None 2024-05-15 00:34:17,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-05-15 00:34:17,515 [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-05-15 00:34:18,045 [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-05-15 00:34:18,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-05-15 00:34:18,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None 2024-05-15 00:34:19,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-05-15 00:34:19,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None 2024-05-15 00:34:19,742 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' 2024-05-15 00:34:20,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None 2024-05-15 00:34:20,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533/comments HTTP/1.1" 200 None 2024-05-15 00:34:21,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945 HTTP/1.1" 200 None 2024-05-15 00:34:21,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-05-15 00:34:22,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-05-15 00:34:22,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945 HTTP/1.1" 200 None 2024-05-15 00:34:22,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/9a13dceec34523f81d5b6059c98b5ed05cada945?per_page=1 HTTP/1.1" 200 None 2024-05-15 00:34:23,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945 HTTP/1.1" 200 None 2024-05-15 00:34:23,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945/status HTTP/1.1" 200 None 2024-05-15 00:34:23,834 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel' 2024-05-15 00:34:24,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None 2024-05-15 00:34:24,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None 2024-05-15 00:34:25,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-05-15 00:34:25,680 [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-05-15 00:34:26,162 [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-05-15 00:34:26,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-05-15 00:34:27,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None 2024-05-15 00:34:27,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-05-15 00:34:27,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None 2024-05-15 00:34:27,973 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test' 2024-05-15 00:34:28,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None 2024-05-15 00:34:29,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None 2024-05-15 00:34:29,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None 2024-05-15 00:34:29,953 [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-05-15 00:34:30,417 [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-05-15 00:34:30,420 [ scc.repo] DEBUG ## Branches found: 2024-05-15 00:34:30,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-05-15 00:34:30,420 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:34:30,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:30,425 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-05-15 00:34:30,429 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-15 00:34:30,430 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-05-15 00:34:30,437 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-05-15 00:34:30,447 [ scc.git] DEBUG Already up to date. 2024-05-15 00:34:30,447 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head' 2024-05-15 00:34:30,987 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-05-15 00:34:30,987 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD 2024-05-15 00:34:30,993 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head' 2024-05-15 00:34:31,478 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-05-15 00:34:31,478 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD 2024-05-15 00:34:31,484 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head' 2024-05-15 00:34:31,907 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-05-15 00:34:31,907 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD 2024-05-15 00:34:31,913 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head' 2024-05-15 00:34:32,638 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-05-15 00:34:32,638 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD 2024-05-15 00:34:32,643 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head' 2024-05-15 00:34:33,461 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-05-15 00:34:33,461 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD 2024-05-15 00:34:33,465 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head' 2024-05-15 00:34:33,988 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-05-15 00:34:33,989 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD 2024-05-15 00:34:33,993 [ scc.git] DEBUG ## Unique users: [] 2024-05-15 00:34:33,993 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:34:33,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:33,998 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767' 2024-05-15 00:34:34,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:34,007 [ 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-05-15 00:34:34,049 [ scc.git] DEBUG Auto-merging omeroweb/settings.py 2024-05-15 00:34:34,049 [ scc.git] DEBUG Auto-merging setup.py 2024-05-15 00:34:34,050 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:34:34,054 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++- 2024-05-15 00:34:34,054 [ scc.git] DEBUG setup.py | 1 + 2024-05-15 00:34:34,054 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-) 2024-05-15 00:34:34,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:34:34,213 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9a13dceec34523f81d5b6059c98b5ed05cada945' 2024-05-15 00:34:34,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:34,223 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) 9a13dceec34523f81d5b6059c98b5ed05cada945' 2024-05-15 00:34:34,252 [ scc.git] DEBUG Auto-merging README.rst 2024-05-15 00:34:34,253 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:34:34,256 [ scc.git] DEBUG README.rst | 5 ++--- 2024-05-15 00:34:34,256 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 3 deletions(-) 2024-05-15 00:34:34,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:34:34,617 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005' 2024-05-15 00:34:34,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:34,629 [ 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-05-15 00:34:34,691 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py 2024-05-15 00:34:34,691 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py 2024-05-15 00:34:34,692 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:34:34,697 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +- 2024-05-15 00:34:34,697 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++-- 2024-05-15 00:34:34,697 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-) 2024-05-15 00:34:35,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:34:35,026 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2' 2024-05-15 00:34:35,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:35,037 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2' 2024-05-15 00:34:35,163 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py 2024-05-15 00:34:35,165 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:34:35,172 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++------- 2024-05-15 00:34:35,172 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++---- 2024-05-15 00:34:35,172 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++ 2024-05-15 00:34:35,172 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++--- 2024-05-15 00:34:35,172 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++----- 2024-05-15 00:34:35,172 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +- 2024-05-15 00:34:35,172 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++-- 2024-05-15 00:34:35,172 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-) 2024-05-15 00:34:35,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:34:35,441 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4' 2024-05-15 00:34:35,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:35,454 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 543 (Block UI for some long running tasks) 8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4' 2024-05-15 00:34:35,527 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html 2024-05-15 00:34:35,529 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:34:35,534 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++ 2024-05-15 00:34:35,535 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++----- 2024-05-15 00:34:35,535 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++--- 2024-05-15 00:34:35,535 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 + 2024-05-15 00:34:35,535 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +- 2024-05-15 00:34:35,535 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +- 2024-05-15 00:34:35,535 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 --------------------- 2024-05-15 00:34:35,535 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 - 2024-05-15 00:34:35,535 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++-- 2024-05-15 00:34:35,535 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-) 2024-05-15 00:34:35,535 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js 2024-05-15 00:34:35,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:34:35,845 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cdfac8b370264c2875799e26a2c49f31482124e6' 2024-05-15 00:34:35,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:35,857 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Remove webgateway cache) cdfac8b370264c2875799e26a2c49f31482124e6' 2024-05-15 00:34:35,902 [ scc.git] DEBUG Auto-merging omeroweb/settings.py 2024-05-15 00:34:35,903 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py 2024-05-15 00:34:35,907 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-15 00:34:35,917 [ scc.git] DEBUG omeroweb/settings.py | 1 - 2024-05-15 00:34:35,917 [ scc.git] DEBUG omeroweb/webgateway/views.py | 118 +--- 2024-05-15 00:34:35,917 [ scc.git] DEBUG omeroweb/webgateway/webgateway_cache.py | 1043 ---------------------------- 2024-05-15 00:34:35,918 [ scc.git] DEBUG omeroweb/webgateway/webgateway_tempfile.py | 200 ++++++ 2024-05-15 00:34:35,918 [ scc.git] DEBUG test/unit/test_webgateway.py | 271 +------- 2024-05-15 00:34:35,918 [ scc.git] DEBUG 5 files changed, 231 insertions(+), 1402 deletions(-) 2024-05-15 00:34:35,918 [ scc.git] DEBUG delete mode 100644 omeroweb/webgateway/webgateway_cache.py 2024-05-15 00:34:35,918 [ scc.git] DEBUG create mode 100644 omeroweb/webgateway/webgateway_tempfile.py 2024-05-15 00:34:36,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:34:36,264 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-15 00:34:36,305 [ scc.git] DEBUG Get sha1 of %s 2024-05-15 00:34:36,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-15 00:34:36,310 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-15 00:34:36,347 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-15 00:34:36,359 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3c26fce910> has no local changes 2024-05-15 00:34:36,359 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-web Excluded PRs: - PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft) - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot]) - 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 533 jburel 'use conda-forge channel' - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display' - PR 543 knabar 'Block UI for some long running tasks' - PR 549 knabar 'Remove webgateway cache' Generated by OMERO-python-superbuild-push#62 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/62/)' 2024-05-15 00:34:36,370 [ scc.git] DEBUG [detached HEAD 84e71a75f] merge master -Dorg -Ssuccess-only 2024-05-15 00:34:36,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:34:36,371 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-15 00:34:36,422 [ scc.config] DEBUG Found submodule.omero-dropbox.url 2024-05-15 00:34:36,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:34:36,668 [ scc.config] DEBUG Found submodule.omero-marshal.url 2024-05-15 00:34:37,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:34:37,066 [ scc.config] DEBUG Found submodule.omero-py.url 2024-05-15 00:34:37,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:34:37,474 [ scc.config] DEBUG Found submodule.omero-scripts.url 2024-05-15 00:34:37,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:34:37,872 [ scc.config] DEBUG Found submodule.omero-web.url 2024-05-15 00:34:38,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-15 00:34:38,276 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-15 00:34:38,303 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3c28114e80> has local changes 2024-05-15 00:34:38,304 [ 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 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure) - PR 387 will-moore 'Numpy pixels type' (label: exclude) - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu) - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn) - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft) - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment) Already up to date. Merged PRs: - PR 199 joshmoore 'user: allow setting default group' - PR 207 manics 'BlitzGateway.connect raise on error' - PR 266 joshmoore 'errors: use raise_error from cli plugins' - PR 299 joshmoore 'Add parents and children to omero obj' - PR 332 jburel 'Build conda' - PR 337 will-moore 'bulk.yml depth is passed to xargs' - PR 391 joshmoore 'Add jstack command' - PR 408 jburel 'remove deprecated method' Repository: ome/omero-scripts Excluded PRs: - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT) - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier) - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn) - PR 103 joshmoore 'Script for calculating min/max' (exclude comment) Already up to date. Conflicting PRs (not included): - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' Repository: ome/omero-web Excluded PRs: - PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft) - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot]) - 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 533 jburel 'use conda-forge channel' - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display' - PR 543 knabar 'Block UI for some long running tasks' - PR 549 knabar 'Remove webgateway cache' Generated by OMERO-python-superbuild-push#62 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/62/)' 2024-05-15 00:34:38,313 [ scc.git] DEBUG [detached HEAD 46fb6c4] merge master -Dorg -Ssuccess-only 2024-05-15 00:34:38,314 [ scc.merge] INFO Repository: ome/omero-python-superbuild 2024-05-15 00:34:38,314 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-) 2024-05-15 00:34:38,314 [ scc.merge] INFO Already up to date. 2024-05-15 00:34:38,314 [ scc.merge] INFO 2024-05-15 00:34:38,314 [ scc.merge] INFO 2024-05-15 00:34:38,314 [ scc.merge] INFO Repository: ome/omero-dropbox 2024-05-15 00:34:38,314 [ scc.merge] INFO Already up to date. 2024-05-15 00:34:38,314 [ scc.merge] INFO 2024-05-15 00:34:38,314 [ scc.merge] INFO Merged PRs: 2024-05-15 00:34:38,314 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist' 2024-05-15 00:34:38,315 [ scc.merge] INFO 2024-05-15 00:34:38,315 [ scc.merge] INFO Repository: ome/omero-marshal 2024-05-15 00:34:38,315 [ scc.merge] INFO Excluded PRs: 2024-05-15 00:34:38,315 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment) 2024-05-15 00:34:38,315 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment) 2024-05-15 00:34:38,315 [ scc.merge] INFO Already up to date. 2024-05-15 00:34:38,315 [ scc.merge] INFO 2024-05-15 00:34:38,315 [ scc.merge] INFO Merged PRs: 2024-05-15 00:34:38,315 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None' 2024-05-15 00:34:38,315 [ scc.merge] INFO 2024-05-15 00:34:38,315 [ scc.merge] INFO Repository: ome/omero-py 2024-05-15 00:34:38,315 [ scc.merge] INFO Excluded PRs: 2024-05-15 00:34:38,315 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure) 2024-05-15 00:34:38,316 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude) 2024-05-15 00:34:38,316 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu) 2024-05-15 00:34:38,316 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn) 2024-05-15 00:34:38,316 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft) 2024-05-15 00:34:38,316 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment) 2024-05-15 00:34:38,316 [ scc.merge] INFO Already up to date. 2024-05-15 00:34:38,316 [ scc.merge] INFO 2024-05-15 00:34:38,316 [ scc.merge] INFO Merged PRs: 2024-05-15 00:34:38,316 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group' 2024-05-15 00:34:38,316 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error' 2024-05-15 00:34:38,316 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins' 2024-05-15 00:34:38,316 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj' 2024-05-15 00:34:38,317 [ scc.merge] INFO - PR 332 jburel 'Build conda' 2024-05-15 00:34:38,317 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs' 2024-05-15 00:34:38,317 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command' 2024-05-15 00:34:38,317 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method' 2024-05-15 00:34:38,317 [ scc.merge] INFO 2024-05-15 00:34:38,317 [ scc.merge] INFO Repository: ome/omero-scripts 2024-05-15 00:34:38,317 [ scc.merge] INFO Excluded PRs: 2024-05-15 00:34:38,317 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT) 2024-05-15 00:34:38,317 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier) 2024-05-15 00:34:38,317 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn) 2024-05-15 00:34:38,317 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment) 2024-05-15 00:34:38,317 [ scc.merge] INFO Already up to date. 2024-05-15 00:34:38,317 [ scc.merge] INFO 2024-05-15 00:34:38,318 [ scc.merge] INFO Conflicting PRs (not included): 2024-05-15 00:34:38,318 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-05-15 00:34:38,318 [ scc.merge] INFO 2024-05-15 00:34:38,318 [ scc.merge] INFO Repository: ome/omero-web 2024-05-15 00:34:38,318 [ scc.merge] INFO Excluded PRs: 2024-05-15 00:34:38,318 [ scc.merge] INFO - PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft) 2024-05-15 00:34:38,318 [ scc.merge] INFO - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot]) 2024-05-15 00:34:38,318 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft) 2024-05-15 00:34:38,318 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure) 2024-05-15 00:34:38,318 [ scc.merge] INFO Already up to date. 2024-05-15 00:34:38,318 [ scc.merge] INFO 2024-05-15 00:34:38,318 [ scc.merge] INFO Merged PRs: 2024-05-15 00:34:38,318 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test' 2024-05-15 00:34:38,318 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel' 2024-05-15 00:34:38,319 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' 2024-05-15 00:34:38,319 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display' 2024-05-15 00:34:38,319 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks' 2024-05-15 00:34:38,319 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache' 2024-05-15 00:34:38,319 [ scc.merge] INFO 2024-05-15 00:34:38,319 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-05-15 00:34:38,319 [ scc.git] DEBUG Calling 'git remote' 2024-05-15 00:34:38,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-05-15 00:34:38,325 [ scc.git] DEBUG Calling 'git remote' 2024-05-15 00:34:38,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:34:38,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-05-15 00:34:38,329 [ scc.git] DEBUG Calling 'git remote' 2024-05-15 00:34:38,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:34:38,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-05-15 00:34:38,334 [ scc.git] DEBUG Calling 'git remote' 2024-05-15 00:34:38,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:34:38,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-05-15 00:34:38,340 [ scc.git] DEBUG Calling 'git remote' 2024-05-15 00:34:38,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-15 00:34:38,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-05-15 00:34:38,347 [ scc.git] DEBUG Calling 'git remote' 2024-05-15 00:34:38,353 [ 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 53a327b8 nothing to commit, working tree clean Entering 'omero-scripts' HEAD detached from 5a90893 nothing to commit, working tree clean Entering 'omero-web' HEAD detached from e1b1355eb nothing to commit, working tree clean HEAD detached from ee4b0ba nothing to commit, working tree clean 2024-05-15 00:35:07,635 [ 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