Started by upstream project "Trigger" build number 58 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 > git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-python-superbuild-push/.git # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/ome/omero-python-superbuild.git # timeout=10 Fetching upstream changes from https://github.com/ome/omero-python-superbuild.git > git --version # timeout=10 > git --version # 'git version 2.39.3' > git fetch --tags --force --progress -- https://github.com/ome/omero-python-superbuild.git +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision 9308a59a6f1a72952cbb6ddf7f7fcbe2366f4f3a (refs/remotes/origin/master) Commit message: "Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893" > git rev-parse refs/remotes/origin/master^{commit} # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f 9308a59a6f1a72952cbb6ddf7f7fcbe2366f4f3a # timeout=10 > git rev-list --no-walk 9308a59a6f1a72952cbb6ddf7f7fcbe2366f4f3a # timeout=10 Cleaning workspace > git rev-parse --verify HEAD # timeout=10 Resetting working tree > git reset --hard # timeout=10 > git clean -fdx # timeout=10 > git submodule foreach --recursive git reset --hard # timeout=10 > git submodule foreach --recursive git clean -fdx # timeout=10 > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule init # timeout=10 > git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10 > git config --get submodule.omero-py.url # timeout=10 > git config -f .gitmodules --get submodule.omero-py.path # timeout=10 > git config --get submodule.omero-web.url # timeout=10 > git config -f .gitmodules --get submodule.omero-web.path # timeout=10 > git config --get submodule.omero-marshal.url # timeout=10 > git config -f .gitmodules --get submodule.omero-marshal.path # timeout=10 > git config --get submodule.omero-dropbox.url # timeout=10 > git config -f .gitmodules --get submodule.omero-dropbox.path # timeout=10 > git config --get submodule.omero-scripts.url # timeout=10 > git config -f .gitmodules --get submodule.omero-scripts.path # timeout=10 > git submodule update --init --recursive omero-py # timeout=10 > git submodule update --init --recursive omero-web # timeout=10 > git submodule update --init --recursive omero-marshal # timeout=10 > git submodule update --init --recursive omero-dropbox # timeout=10 > git submodule update --init --recursive omero-scripts # timeout=10 [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-build-push" build number 51 [Pipeline] sh + pushd build ~/workspace/OMERO-python-superbuild-push/build ~/workspace/OMERO-python-superbuild-push + curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz + tar -zxf - + popd ~/workspace/OMERO-python-superbuild-push + python3 -m venv build/venv + . build/venv/bin/activate ++ deactivate nondestructive ++ '[' -n '' ']' ++ '[' -n '' ']' ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r ++ '[' -n '' ']' ++ unset VIRTUAL_ENV ++ '[' '!' nondestructive = nondestructive ']' ++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv ++ export VIRTUAL_ENV ++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ export PATH ++ '[' -n '' ']' ++ '[' -z '' ']' ++ _OLD_VIRTUAL_PS1= ++ PS1='(venv) ' ++ export PS1 ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r + python3 -m pip install -U pip Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3) Collecting pip Using cached pip-24.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.5-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.5-cp39-abi3-manylinux_2_28_x86_64.whl (4.6 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.5 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-02 00:34:30,073 [ scc.config] DEBUG Found github.token 2024-05-02 00:34:30,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-05-02 00:34:30,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:34:30,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:34:31,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-05-02 00:34:31,111 [ scc.gh] DEBUG 4309 remaining from 5000 (Reset at 00:05 2024-05-02 00:34:31,112 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-02 00:34:31,116 [ scc.git] DEBUG Check current status 2024-05-02 00:34:31,117 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-02 00:34:31,120 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893 2024-05-02 00:34:31,120 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-02 00:34:31,176 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350) 2024-05-02 00:34:31,179 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-05-02 00:34:31,195 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4) 2024-05-02 00:34:31,200 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893) 2024-05-02 00:34:31,345 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb) 2024-05-02 00:34:31,349 [ scc.config] DEBUG Found remote.origin.url 2024-05-02 00:34:31,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None 2024-05-02 00:34:32,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-02 00:34:32,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-02 00:34:32,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-02 00:34:33,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-02 00:34:33,314 [ scc.git] DEBUG Resetting... 2024-05-02 00:34:33,315 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-05-02 00:34:33,321 [ scc.git] DEBUG HEAD is now at 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893 2024-05-02 00:34:33,321 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-05-02 00:34:33,387 [ scc.git] DEBUG Check current status 2024-05-02 00:34:33,387 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-02 00:34:33,392 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893 2024-05-02 00:34:33,393 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-02 00:34:33,447 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350) 2024-05-02 00:34:33,450 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-05-02 00:34:33,454 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4) 2024-05-02 00:34:33,458 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893) 2024-05-02 00:34:33,462 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb) 2024-05-02 00:34:33,463 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-05-02 00:34:33,464 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-05-02 00:34:33,464 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-05-02 00:34:33,464 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-05-02 00:34:33,464 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-05-02 00:34:33,464 [ scc.repo] DEBUG ## PRs found: 2024-05-02 00:34:33,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2 2024-05-02 00:34:33,757 [ scc.repo] DEBUG ## Branches found: 2024-05-02 00:34:33,757 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:34:33,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:34:33,761 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-05-02 00:34:33,764 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-02 00:34:33,764 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-05-02 00:34:33,769 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-05-02 00:34:33,773 [ scc.git] DEBUG Already up to date. 2024-05-02 00:34:33,773 [ scc.git] DEBUG ## Unique users: [] 2024-05-02 00:34:33,774 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:34:33,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:34:33,779 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-02 00:34:33,822 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:34:33,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:34:33,825 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-02 00:34:34,072 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec5569f460> has no local changes 2024-05-02 00:34:34,072 [ 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#49 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/49/)' 2024-05-02 00:34:34,101 [ scc.git] DEBUG [detached HEAD b156f12] merge master -Dorg -Snone 2024-05-02 00:34:34,101 [ scc.merge] INFO Repository: ome/omero-python-superbuild 2024-05-02 00:34:34,101 [ scc.merge] INFO Already up to date. 2024-05-02 00:34:34,101 [ scc.merge] INFO 2024-05-02 00:34:34,101 [ scc.merge] INFO 2024-05-02 00:34:34,101 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-05-02 00:34:34,102 [ 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' From https://github.com/ome/omero-py 52d9a6f4..53a327b8 master -> origin/master Submodule path 'omero-py': checked out '53a327b85034cf09ae5e7255e6fd70b59392b680' Merge all submodules using repository configuration: base-branch: master submodules: omero-scripts: base-branch: develop 2024-05-02 00:34:36,966 [ scc.config] DEBUG Found github.token 2024-05-02 00:34:36,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-05-02 00:34:37,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:34:37,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:34:38,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-05-02 00:34:38,075 [ scc.gh] DEBUG 4301 remaining from 5000 (Reset at 00:05 2024-05-02 00:34:38,076 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-02 00:34:38,081 [ scc.git] DEBUG Check current status 2024-05-02 00:34:38,081 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-02 00:34:38,085 [ scc.git] DEBUG b156f12 merge master -Dorg -Snone 2024-05-02 00:34:38,086 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-02 00:34:38,136 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350) 2024-05-02 00:34:38,139 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-05-02 00:34:38,142 [ scc.git] DEBUG +53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8) 2024-05-02 00:34:38,147 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893) 2024-05-02 00:34:38,151 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb) 2024-05-02 00:34:38,155 [ scc.config] DEBUG Found remote.origin.url 2024-05-02 00:34:38,156 [ scc.git] DEBUG Reading repository configuration from repositories.yml 2024-05-02 00:34:38,158 [ scc.git] DEBUG Repository configuration: base-branch: master submodules: omero-scripts: base-branch: develop 2024-05-02 00:34:38,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None 2024-05-02 00:34:39,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-02 00:34:39,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-02 00:34:39,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-02 00:34:40,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-02 00:34:40,311 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-02 00:34:40,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-05-02 00:34:40,363 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-02 00:34:40,367 [ scc.git] DEBUG Check current status 2024-05-02 00:34:40,368 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-02 00:34:40,372 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311 2024-05-02 00:34:40,372 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-02 00:34:40,415 [ scc.config] DEBUG Found remote.origin.url 2024-05-02 00:34:40,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None 2024-05-02 00:34:41,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-02 00:34:41,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-02 00:34:42,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-02 00:34:42,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-02 00:34:42,525 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-02 00:34:42,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:34:42,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-05-02 00:34:42,584 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-02 00:34:42,589 [ scc.git] DEBUG Check current status 2024-05-02 00:34:42,589 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-02 00:34:42,593 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312 2024-05-02 00:34:42,594 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-02 00:34:42,649 [ scc.config] DEBUG Found remote.origin.url 2024-05-02 00:34:43,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None 2024-05-02 00:34:43,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-02 00:34:43,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-02 00:34:44,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-02 00:34:44,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-02 00:34:44,821 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-02 00:34:44,874 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:34:44,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-05-02 00:34:44,875 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-02 00:34:44,881 [ scc.git] DEBUG Check current status 2024-05-02 00:34:44,882 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-02 00:34:44,911 [ scc.git] DEBUG 53a327b8 Merge pull request #407 from jburel/install_conda_forge 2024-05-02 00:34:44,911 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-02 00:34:44,962 [ scc.config] DEBUG Found remote.origin.url 2024-05-02 00:34:45,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None 2024-05-02 00:34:45,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-02 00:34:46,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-02 00:34:46,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-02 00:34:46,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-02 00:34:46,995 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-02 00:34:47,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:34:47,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-05-02 00:34:47,049 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-02 00:34:47,054 [ scc.git] DEBUG Check current status 2024-05-02 00:34:47,054 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-02 00:34:47,085 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0 2024-05-02 00:34:47,086 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-02 00:34:47,141 [ scc.config] DEBUG Found remote.origin.url 2024-05-02 00:34:47,142 [ scc.git] DEBUG Repository configuration: base-branch: develop 2024-05-02 00:34:47,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None 2024-05-02 00:34:47,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-02 00:34:48,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-02 00:34:48,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-02 00:34:49,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-02 00:34:49,162 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-02 00:34:49,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:34:49,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-05-02 00:34:49,219 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-05-02 00:34:49,224 [ scc.git] DEBUG Check current status 2024-05-02 00:34:49,225 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-02 00:34:49,230 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request 2024-05-02 00:34:49,230 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-02 00:34:49,284 [ scc.config] DEBUG Found remote.origin.url 2024-05-02 00:34:49,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None 2024-05-02 00:34:50,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-05-02 00:34:50,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-05-02 00:34:50,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-05-02 00:34:51,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-05-02 00:34:51,341 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-02 00:34:51,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:34:51,390 [ scc.git] DEBUG Resetting... 2024-05-02 00:34:51,390 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-05-02 00:34:51,398 [ scc.git] DEBUG HEAD is now at b156f12 merge master -Dorg -Snone 2024-05-02 00:34:51,399 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-05-02 00:34:51,459 [ scc.git] DEBUG Submodule path 'omero-py': checked out '52d9a6f42690aa033acaf808521612720dd50757' 2024-05-02 00:34:51,469 [ scc.git] DEBUG Check current status 2024-05-02 00:34:51,469 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-05-02 00:34:51,474 [ scc.git] DEBUG b156f12 merge master -Dorg -Snone 2024-05-02 00:34:51,474 [ scc.git] DEBUG Calling 'git submodule status' 2024-05-02 00:34:51,515 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350) 2024-05-02 00:34:51,518 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-05-02 00:34:51,522 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4) 2024-05-02 00:34:51,526 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893) 2024-05-02 00:34:51,529 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb) 2024-05-02 00:34:51,530 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-05-02 00:34:51,530 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-05-02 00:34:51,530 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-05-02 00:34:51,530 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-05-02 00:34:51,530 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-05-02 00:34:51,531 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-05-02 00:34:51,531 [ scc.repo] DEBUG ## PRs found: 2024-05-02 00:34:51,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2 2024-05-02 00:34:51,781 [ scc.repo] DEBUG ## Branches found: 2024-05-02 00:34:51,782 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:34:51,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:34:51,786 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-05-02 00:34:51,790 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-02 00:34:51,791 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-05-02 00:34:51,795 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-05-02 00:34:51,799 [ scc.git] DEBUG Already up to date. 2024-05-02 00:34:51,799 [ scc.git] DEBUG ## Unique users: [] 2024-05-02 00:34:51,799 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:34:51,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:34:51,803 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-02 00:34:51,846 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:34:51,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:34:51,850 [ scc.repo] DEBUG ## PRs found: 2024-05-02 00:34:52,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None 2024-05-02 00:34:52,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None 2024-05-02 00:34:53,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None 2024-05-02 00:34:53,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None 2024-05-02 00:34:54,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-05-02 00:34:54,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-05-02 00:34:55,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None 2024-05-02 00:34:55,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8?per_page=1 HTTP/1.1" 200 2 2024-05-02 00:34:55,677 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code' 2024-05-02 00:34:56,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None 2024-05-02 00:34:56,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None 2024-05-02 00:34:57,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None 2024-05-02 00:34:57,534 [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-02 00:34:57,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None 2024-05-02 00:34:58,377 [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-02 00:34:58,378 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist' 2024-05-02 00:34:58,378 [ scc.repo] DEBUG ## Branches found: 2024-05-02 00:34:58,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-05-02 00:34:58,379 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:34:58,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:34:58,385 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-05-02 00:34:58,390 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-02 00:34:58,390 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-05-02 00:34:58,395 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-05-02 00:34:58,401 [ scc.git] DEBUG Already up to date. 2024-05-02 00:34:58,402 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head' 2024-05-02 00:34:58,818 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox 2024-05-02 00:34:58,818 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD 2024-05-02 00:34:58,823 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head' 2024-05-02 00:34:59,219 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox 2024-05-02 00:34:59,219 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD 2024-05-02 00:34:59,225 [ scc.git] DEBUG ## Unique users: [] 2024-05-02 00:34:59,225 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:34:59,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:34:59,230 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452' 2024-05-02 00:34:59,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:34:59,240 [ 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-02 00:34:59,300 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:34:59,304 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++--- 2024-05-02 00:34:59,304 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++-------------------- 2024-05-02 00:34:59,304 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++----------- 2024-05-02 00:34:59,306 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------ 2024-05-02 00:34:59,306 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++----- 2024-05-02 00:34:59,307 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++----------- 2024-05-02 00:34:59,307 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++----- 2024-05-02 00:34:59,307 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++---- 2024-05-02 00:34:59,307 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++--------- 2024-05-02 00:34:59,307 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-) 2024-05-02 00:34:59,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:34:59,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8' 2024-05-02 00:34:59,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:34:59,471 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8' 2024-05-02 00:34:59,581 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py 2024-05-02 00:34:59,582 [ scc.git] DEBUG Auto-merging src/fsDirectory.py 2024-05-02 00:34:59,582 [ scc.git] DEBUG Auto-merging src/fsDropBox.py 2024-05-02 00:34:59,582 [ scc.git] DEBUG Auto-merging src/fsLists.py 2024-05-02 00:34:59,582 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py 2024-05-02 00:34:59,582 [ scc.git] DEBUG Auto-merging src/fsMonitor.py 2024-05-02 00:34:59,582 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py 2024-05-02 00:34:59,582 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py 2024-05-02 00:34:59,582 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py 2024-05-02 00:34:59,582 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:34:59,589 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +- 2024-05-02 00:34:59,590 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++-- 2024-05-02 00:34:59,590 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++-- 2024-05-02 00:34:59,590 [ scc.git] DEBUG Dockerfile | 32 ---------------------- 2024-05-02 00:34:59,590 [ scc.git] DEBUG setup.py | 2 +- 2024-05-02 00:34:59,590 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 - 2024-05-02 00:34:59,590 [ scc.git] DEBUG src/fsDirectory.py | 8 +----- 2024-05-02 00:34:59,590 [ scc.git] DEBUG src/fsDropBox.py | 8 +----- 2024-05-02 00:34:59,590 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +------- 2024-05-02 00:34:59,590 [ scc.git] DEBUG src/fsFileServer.py | 12 ++------- 2024-05-02 00:34:59,590 [ scc.git] DEBUG src/fsLists.py | 2 -- 2024-05-02 00:34:59,590 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------ 2024-05-02 00:34:59,590 [ scc.git] DEBUG src/fsMonitor.py | 2 -- 2024-05-02 00:34:59,590 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++--- 2024-05-02 00:34:59,590 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 --- 2024-05-02 00:34:59,590 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++---------- 2024-05-02 00:34:59,591 [ scc.git] DEBUG src/fsUtil.py | 9 +++---- 2024-05-02 00:34:59,591 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +----- 2024-05-02 00:34:59,591 [ scc.git] DEBUG test/conftest.py | 2 -- 2024-05-02 00:34:59,591 [ scc.git] DEBUG test/drivers.py | 17 +++--------- 2024-05-02 00:34:59,591 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++---------------------- 2024-05-02 00:34:59,591 [ scc.git] DEBUG test/unit/test_monitor.py | 2 -- 2024-05-02 00:34:59,591 [ scc.git] DEBUG test/unit/test_replay.py | 8 +----- 2024-05-02 00:34:59,591 [ scc.git] DEBUG test/unit/test_state.py | 1 - 2024-05-02 00:34:59,591 [ scc.git] DEBUG tox.ini | 3 ++- 2024-05-02 00:34:59,591 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-) 2024-05-02 00:34:59,591 [ scc.git] DEBUG delete mode 100644 Dockerfile 2024-05-02 00:34:59,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:34:59,864 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-02 00:34:59,912 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:34:59,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:34:59,917 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-02 00:34:59,962 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-02 00:34:59,969 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f678c0fdc10> has no local changes 2024-05-02 00:34:59,970 [ 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' - PR 23 sbesson 'Remove python-future compatibility code' Generated by OMERO-python-superbuild-push#49 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/49/)' 2024-05-02 00:34:59,981 [ scc.git] DEBUG [detached HEAD aa8d7a0] merge master -Dorg -Ssuccess-only 2024-05-02 00:34:59,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:34:59,982 [ scc.repo] DEBUG ## PRs found: 2024-05-02 00:35:00,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None 2024-05-02 00:35:00,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None 2024-05-02 00:35:01,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None 2024-05-02 00:35:01,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None 2024-05-02 00:35:02,329 [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-02 00:35:02,827 [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-02 00:35:03,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None 2024-05-02 00:35:03,760 [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-02 00:35:03,760 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None' 2024-05-02 00:35:04,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None 2024-05-02 00:35:04,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None 2024-05-02 00:35:05,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None 2024-05-02 00:35:05,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None 2024-05-02 00:35:05,609 [ scc.repo] DEBUG ## Branches found: 2024-05-02 00:35:05,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-05-02 00:35:05,610 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:35:05,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:05,615 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-05-02 00:35:05,619 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-02 00:35:05,619 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-05-02 00:35:05,624 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-05-02 00:35:05,629 [ scc.git] DEBUG Already up to date. 2024-05-02 00:35:05,630 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-05-02 00:35:06,073 [ scc.git] DEBUG From https://github.com/ome/omero-marshal 2024-05-02 00:35:06,074 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-05-02 00:35:06,079 [ scc.git] DEBUG ## Unique users: [] 2024-05-02 00:35:06,079 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:35:06,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:06,085 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca' 2024-05-02 00:35:06,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:06,094 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca' 2024-05-02 00:35:06,119 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py 2024-05-02 00:35:06,120 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:35:06,123 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++-- 2024-05-02 00:35:06,123 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++- 2024-05-02 00:35:06,123 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-) 2024-05-02 00:35:06,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:35:06,277 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-02 00:35:06,326 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:35:06,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:06,331 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-02 00:35:06,368 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-02 00:35:06,374 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f678c09a0d0> has no local changes 2024-05-02 00:35:06,374 [ 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#49 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/49/)' 2024-05-02 00:35:06,383 [ scc.git] DEBUG [detached HEAD 5ebe9b6] merge master -Dorg -Ssuccess-only 2024-05-02 00:35:06,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:35:06,383 [ scc.repo] DEBUG ## PRs found: 2024-05-02 00:35:06,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None 2024-05-02 00:35:07,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None 2024-05-02 00:35:07,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-05-02 00:35:08,443 [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-02 00:35:08,928 [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-02 00:35:09,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-05-02 00:35:09,783 [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-02 00:35:10,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None 2024-05-02 00:35:10,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None 2024-05-02 00:35:10,703 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method' 2024-05-02 00:35:11,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None 2024-05-02 00:35:11,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None 2024-05-02 00:35:12,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None 2024-05-02 00:35:12,608 [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-02 00:35:13,054 [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-02 00:35:13,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None 2024-05-02 00:35:13,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-05-02 00:35:14,472 [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-02 00:35:14,969 [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-02 00:35:15,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-05-02 00:35:15,898 [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-02 00:35:16,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-05-02 00:35:16,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None 2024-05-02 00:35:16,761 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command' 2024-05-02 00:35:17,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None 2024-05-02 00:35:17,242 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-05-02 00:35:17,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None 2024-05-02 00:35:18,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None 2024-05-02 00:35:18,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None 2024-05-02 00:35:19,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None 2024-05-02 00:35:19,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None 2024-05-02 00:35:20,090 [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-02 00:35:20,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None 2024-05-02 00:35:20,952 [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-02 00:35:20,953 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs' 2024-05-02 00:35:21,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None 2024-05-02 00:35:22,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None 2024-05-02 00:35:22,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-05-02 00:35:23,053 [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-02 00:35:23,573 [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-02 00:35:24,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-05-02 00:35:24,489 [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-02 00:35:24,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-05-02 00:35:25,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None 2024-05-02 00:35:25,379 [ scc.repo] DEBUG - PR 332 jburel 'Build conda' 2024-05-02 00:35:25,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None 2024-05-02 00:35:26,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None 2024-05-02 00:35:26,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None 2024-05-02 00:35:27,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None 2024-05-02 00:35:27,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None 2024-05-02 00:35:28,252 [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-02 00:35:28,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None 2024-05-02 00:35:29,167 [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-02 00:35:29,168 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj' 2024-05-02 00:35:29,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None 2024-05-02 00:35:30,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None 2024-05-02 00:35:30,606 [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-02 00:35:31,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None 2024-05-02 00:35:31,461 [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-02 00:35:31,461 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins' 2024-05-02 00:35:31,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None 2024-05-02 00:35:32,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None 2024-05-02 00:35:32,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None 2024-05-02 00:35:33,376 [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-02 00:35:33,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None 2024-05-02 00:35:34,316 [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-02 00:35:34,316 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error' 2024-05-02 00:35:34,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None 2024-05-02 00:35:35,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None 2024-05-02 00:35:35,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None 2024-05-02 00:35:36,176 [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-02 00:35:36,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None 2024-05-02 00:35:37,096 [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-02 00:35:37,096 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group' 2024-05-02 00:35:37,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None 2024-05-02 00:35:38,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None 2024-05-02 00:35:38,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None 2024-05-02 00:35:38,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None 2024-05-02 00:35:38,927 [ scc.repo] DEBUG ## Branches found: 2024-05-02 00:35:38,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-05-02 00:35:38,928 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:35:38,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:38,938 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-05-02 00:35:38,946 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-02 00:35:38,947 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-05-02 00:35:38,955 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-05-02 00:35:38,971 [ scc.git] DEBUG Updating 52d9a6f4..53a327b8 2024-05-02 00:35:39,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls/407 HTTP/1.1" 200 None 2024-05-02 00:35:39,559 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head' 2024-05-02 00:35:40,116 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-02 00:35:40,117 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD 2024-05-02 00:35:40,123 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head' 2024-05-02 00:35:40,637 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-02 00:35:40,637 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD 2024-05-02 00:35:40,643 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head' 2024-05-02 00:35:41,131 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-02 00:35:41,131 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD 2024-05-02 00:35:41,136 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head' 2024-05-02 00:35:41,533 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-02 00:35:41,534 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD 2024-05-02 00:35:41,539 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head' 2024-05-02 00:35:42,023 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-02 00:35:42,023 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD 2024-05-02 00:35:42,030 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head' 2024-05-02 00:35:42,451 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-02 00:35:42,451 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD 2024-05-02 00:35:42,458 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head' 2024-05-02 00:35:42,836 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-02 00:35:42,837 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD 2024-05-02 00:35:42,843 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head' 2024-05-02 00:35:43,419 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-05-02 00:35:43,420 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD 2024-05-02 00:35:43,422 [ scc.git] DEBUG ## Unique users: [] 2024-05-02 00:35:43,423 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:35:43,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:43,428 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec' 2024-05-02 00:35:43,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:43,444 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec' 2024-05-02 00:35:43,511 [ scc.git] DEBUG Auto-merging src/omero/cli.py 2024-05-02 00:35:43,511 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py 2024-05-02 00:35:43,512 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:35:43,516 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++ 2024-05-02 00:35:43,516 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++--- 2024-05-02 00:35:43,517 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-) 2024-05-02 00:35:43,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:35:43,669 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb' 2024-05-02 00:35:43,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:43,686 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb' 2024-05-02 00:35:43,818 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py 2024-05-02 00:35:43,818 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py 2024-05-02 00:35:43,819 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:35:43,827 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------ 2024-05-02 00:35:43,827 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++ 2024-05-02 00:35:43,827 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-) 2024-05-02 00:35:44,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:35:44,085 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f' 2024-05-02 00:35:44,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:44,102 [ 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-02 00:35:44,161 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py 2024-05-02 00:35:44,162 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:35:44,165 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++---- 2024-05-02 00:35:44,165 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-) 2024-05-02 00:35:44,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:35:44,483 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a' 2024-05-02 00:35:44,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:44,502 [ 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-02 00:35:44,555 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py 2024-05-02 00:35:44,555 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py 2024-05-02 00:35:44,556 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:35:44,560 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++- 2024-05-02 00:35:44,560 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +- 2024-05-02 00:35:44,560 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-) 2024-05-02 00:35:44,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:35:44,893 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc' 2024-05-02 00:35:44,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:44,910 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc' 2024-05-02 00:35:44,932 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:35:44,935 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++ 2024-05-02 00:35:44,935 [ scc.git] DEBUG connect.py | 11 +++++++++++ 2024-05-02 00:35:44,935 [ scc.git] DEBUG 2 files changed, 48 insertions(+) 2024-05-02 00:35:44,935 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml 2024-05-02 00:35:44,935 [ scc.git] DEBUG create mode 100644 connect.py 2024-05-02 00:35:45,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:35:45,305 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5' 2024-05-02 00:35:45,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:45,323 [ 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-02 00:35:45,418 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py 2024-05-02 00:35:45,418 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:35:45,422 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++ 2024-05-02 00:35:45,423 [ scc.git] DEBUG 1 file changed, 2 insertions(+) 2024-05-02 00:35:45,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:35:45,721 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023' 2024-05-02 00:35:45,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:45,741 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023' 2024-05-02 00:35:45,779 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py 2024-05-02 00:35:45,781 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:35:45,785 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++-- 2024-05-02 00:35:45,785 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-) 2024-05-02 00:35:46,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:35:46,130 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804' 2024-05-02 00:35:46,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:46,147 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804' 2024-05-02 00:35:46,195 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py 2024-05-02 00:35:46,195 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:35:46,203 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------ 2024-05-02 00:35:46,203 [ scc.git] DEBUG 1 file changed, 36 deletions(-) 2024-05-02 00:35:46,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:35:46,545 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-02 00:35:46,587 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:35:46,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:46,593 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-02 00:35:46,637 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-02 00:35:46,647 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f678b03b760> has no local changes 2024-05-02 00:35:46,647 [ 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) Updating 52d9a6f4..53a327b8 Previously merged: - PR 407 jburel 'Remove ref to ome channel for zeroc-ice' 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#49 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/49/)' 2024-05-02 00:35:46,661 [ scc.git] DEBUG [detached HEAD fb030c74] merge master -Dorg -Ssuccess-only 2024-05-02 00:35:46,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:35:46,661 [ scc.git] INFO Overriding base-branch from master to develop 2024-05-02 00:35:46,661 [ scc.repo] DEBUG ## PRs found: 2024-05-02 00:35:47,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None 2024-05-02 00:35:47,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None 2024-05-02 00:35:48,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None 2024-05-02 00:35:48,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None 2024-05-02 00:35:49,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None 2024-05-02 00:35:49,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None 2024-05-02 00:35:50,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None 2024-05-02 00:35:50,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-05-02 00:35:50,926 [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-02 00:35:51,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-05-02 00:35:51,847 [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-02 00:35:51,848 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-05-02 00:35:52,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None 2024-05-02 00:35:52,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None 2024-05-02 00:35:53,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None 2024-05-02 00:35:53,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None 2024-05-02 00:35:53,855 [ scc.repo] DEBUG ## Branches found: 2024-05-02 00:35:53,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-05-02 00:35:53,856 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:35:53,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:53,901 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop' 2024-05-02 00:35:53,908 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-02 00:35:53,909 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop' 2024-05-02 00:35:53,914 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop' 2024-05-02 00:35:53,921 [ scc.git] DEBUG Already up to date. 2024-05-02 00:35:53,921 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head' 2024-05-02 00:35:54,415 [ scc.git] DEBUG From https://github.com/ome/omero-scripts 2024-05-02 00:35:54,415 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD 2024-05-02 00:35:54,420 [ scc.git] DEBUG ## Unique users: [] 2024-05-02 00:35:54,420 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:35:54,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:54,426 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-05-02 00:35:54,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:54,438 [ 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-02 00:35:54,513 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py 2024-05-02 00:35:54,513 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py 2024-05-02 00:35:54,514 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-05-02 00:35:54,514 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-05-02 00:35:54,520 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a' 2024-05-02 00:35:54,528 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0 2024-05-02 00:35:54,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:35:54,693 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-05-02 00:35:54,700 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a' 2024-05-02 00:35:54,706 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' Conflicting PR. Removed from build [OMERO-python-superbuild-push#49](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/49/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/49/consoleText) for more details. Possible conflicts: - Upstream changes - omero/annotation_scripts/KeyVal_to_csv.py --conflicts 2024-05-02 00:35:54,711 [ scc.config] DEBUG Found github.token 2024-05-02 00:35:54,711 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts. 2024-05-02 00:35:54,712 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-02 00:35:54,766 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:35:54,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:35:54,775 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-02 00:35:54,854 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-02 00:35:54,863 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f678b020640> has no local changes 2024-05-02 00:35:54,864 [ 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#49 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/49/)' 2024-05-02 00:35:54,875 [ scc.git] DEBUG [detached HEAD 598d529] merge master -Dorg -Ssuccess-only 2024-05-02 00:35:54,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:35:54,876 [ scc.repo] DEBUG ## PRs found: 2024-05-02 00:35:55,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None 2024-05-02 00:35:55,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/553 HTTP/1.1" 200 None 2024-05-02 00:35:56,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None 2024-05-02 00:35:56,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None 2024-05-02 00:35:57,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712 HTTP/1.1" 200 None 2024-05-02 00:35:57,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-05-02 00:35:58,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-05-02 00:35:58,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None 2024-05-02 00:35:59,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None 2024-05-02 00:35:59,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None 2024-05-02 00:36:00,083 [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-02 00:36:00,551 [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-02 00:36:00,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None 2024-05-02 00:36:01,429 [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-02 00:36:01,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None 2024-05-02 00:36:02,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None 2024-05-02 00:36:02,312 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks' 2024-05-02 00:36:02,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None 2024-05-02 00:36:03,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None 2024-05-02 00:36:03,281 [ scc.repo] DEBUG # ... Include label: include 2024-05-02 00:36:03,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None 2024-05-02 00:36:04,282 [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-02 00:36:04,753 [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-02 00:36:05,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None 2024-05-02 00:36:05,643 [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-02 00:36:06,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None 2024-05-02 00:36:06,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None 2024-05-02 00:36:06,540 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display' 2024-05-02 00:36:06,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None 2024-05-02 00:36:07,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None 2024-05-02 00:36:07,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None 2024-05-02 00:36:08,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-05-02 00:36:08,929 [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-02 00:36:09,413 [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-02 00:36:09,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-05-02 00:36:10,322 [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-02 00:36:10,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-05-02 00:36:11,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None 2024-05-02 00:36:11,245 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' 2024-05-02 00:36:11,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None 2024-05-02 00:36:12,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None 2024-05-02 00:36:12,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-05-02 00:36:13,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-05-02 00:36:13,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None 2024-05-02 00:36:14,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/e335980be1e7197826687f6c322a60c61b4aa545?per_page=1 HTTP/1.1" 200 None 2024-05-02 00:36:14,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None 2024-05-02 00:36:14,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/status HTTP/1.1" 200 None 2024-05-02 00:36:14,993 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel' 2024-05-02 00:36:15,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None 2024-05-02 00:36:15,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None 2024-05-02 00:36:16,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-05-02 00:36:16,923 [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-02 00:36:17,376 [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-02 00:36:17,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-05-02 00:36:18,245 [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-02 00:36:18,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-05-02 00:36:19,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None 2024-05-02 00:36:19,109 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test' 2024-05-02 00:36:19,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None 2024-05-02 00:36:20,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None 2024-05-02 00:36:20,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None 2024-05-02 00:36:21,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-05-02 00:36:21,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None 2024-05-02 00:36:22,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/219d9e721304a4c46b4d73ef9ff3777549d69615?per_page=1 HTTP/1.1" 200 2 2024-05-02 00:36:22,012 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler' 2024-05-02 00:36:22,013 [ scc.repo] DEBUG ## Branches found: 2024-05-02 00:36:22,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-05-02 00:36:22,013 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:36:22,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:36:22,026 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-05-02 00:36:22,032 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-05-02 00:36:22,032 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-05-02 00:36:22,038 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-05-02 00:36:22,045 [ scc.git] DEBUG Already up to date. 2024-05-02 00:36:22,045 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head' 2024-05-02 00:36:22,564 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-05-02 00:36:22,564 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD 2024-05-02 00:36:22,572 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head' 2024-05-02 00:36:22,981 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-05-02 00:36:22,981 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD 2024-05-02 00:36:22,987 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head' 2024-05-02 00:36:23,399 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-05-02 00:36:23,399 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD 2024-05-02 00:36:23,404 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head' 2024-05-02 00:36:23,830 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-05-02 00:36:23,831 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD 2024-05-02 00:36:23,837 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head' 2024-05-02 00:36:24,844 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-05-02 00:36:24,845 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD 2024-05-02 00:36:24,851 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head' 2024-05-02 00:36:25,781 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-05-02 00:36:25,782 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD 2024-05-02 00:36:25,787 [ scc.git] DEBUG ## Unique users: [] 2024-05-02 00:36:25,787 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:36:25,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:36:25,794 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...219d9e721304a4c46b4d73ef9ff3777549d69615' 2024-05-02 00:36:25,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:36:25,823 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 219d9e721304a4c46b4d73ef9ff3777549d69615' 2024-05-02 00:36:25,925 [ scc.git] DEBUG Auto-merging test/unit/test_web.py 2024-05-02 00:36:25,926 [ scc.git] DEBUG CONFLICT (content): Merge conflict in test/unit/test_web.py 2024-05-02 00:36:25,927 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-05-02 00:36:25,928 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-05-02 00:36:25,937 [ scc.git] DEBUG Calling 'git reset --hard e1b1355ebd4f9de8b855dd2c55f59d86c061a81b' 2024-05-02 00:36:25,951 [ scc.git] DEBUG HEAD is now at e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request 2024-05-02 00:36:26,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:36:26,111 [ scc.git] DEBUG Calling 'git merge-base e1b1355ebd4f9de8b855dd2c55f59d86c061a81b 219d9e721304a4c46b4d73ef9ff3777549d69615' 2024-05-02 00:36:26,129 [ scc.git] DEBUG Calling 'git diff --name-only 632d14a9cab5319c6b1bd9190d441a95e457103b..e1b1355ebd4f9de8b855dd2c55f59d86c061a81b' 2024-05-02 00:36:26,250 [ scc.git] INFO - PR 168 stick 'Changes to nginx @maintenance handler' Conflicting PR. Removed from build [OMERO-python-superbuild-push#49](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/49/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/49/consoleText) for more details. Possible conflicts: - Upstream changes - test/unit/test_web.py --conflicts 2024-05-02 00:36:26,259 [ scc.config] DEBUG Found github.token 2024-05-02 00:36:26,259 [ scc.git] DEBUG Not adding comment to issue #168, already --conflicts. 2024-05-02 00:36:26,260 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767' 2024-05-02 00:36:26,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:36:26,274 [ 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-02 00:36:26,368 [ scc.git] DEBUG Auto-merging omeroweb/settings.py 2024-05-02 00:36:26,369 [ scc.git] DEBUG Auto-merging setup.py 2024-05-02 00:36:26,370 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:36:26,374 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++- 2024-05-02 00:36:26,374 [ scc.git] DEBUG setup.py | 1 + 2024-05-02 00:36:26,374 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-) 2024-05-02 00:36:26,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:36:26,528 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e335980be1e7197826687f6c322a60c61b4aa545' 2024-05-02 00:36:26,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:36:26,541 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) e335980be1e7197826687f6c322a60c61b4aa545' 2024-05-02 00:36:26,562 [ scc.git] DEBUG Auto-merging README.rst 2024-05-02 00:36:26,563 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:36:26,567 [ scc.git] DEBUG README.rst | 3 +-- 2024-05-02 00:36:26,567 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 2 deletions(-) 2024-05-02 00:36:26,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:36:26,938 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005' 2024-05-02 00:36:26,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:36:26,954 [ 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-02 00:36:27,033 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py 2024-05-02 00:36:27,034 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py 2024-05-02 00:36:27,035 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:36:27,040 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +- 2024-05-02 00:36:27,040 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++-- 2024-05-02 00:36:27,040 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-) 2024-05-02 00:36:27,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:36:27,368 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2' 2024-05-02 00:36:27,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:36:27,382 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2' 2024-05-02 00:36:27,574 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py 2024-05-02 00:36:27,575 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:36:27,583 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++------- 2024-05-02 00:36:27,583 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++---- 2024-05-02 00:36:27,583 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++ 2024-05-02 00:36:27,583 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++--- 2024-05-02 00:36:27,583 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++----- 2024-05-02 00:36:27,583 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +- 2024-05-02 00:36:27,583 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++-- 2024-05-02 00:36:27,583 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-) 2024-05-02 00:36:27,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:36:27,770 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4' 2024-05-02 00:36:27,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:36:27,783 [ 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-02 00:36:27,869 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html 2024-05-02 00:36:27,870 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-05-02 00:36:27,877 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++ 2024-05-02 00:36:27,877 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++----- 2024-05-02 00:36:27,877 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++--- 2024-05-02 00:36:27,877 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 + 2024-05-02 00:36:27,877 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +- 2024-05-02 00:36:27,877 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +- 2024-05-02 00:36:27,877 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 --------------------- 2024-05-02 00:36:27,877 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 - 2024-05-02 00:36:27,877 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++-- 2024-05-02 00:36:27,877 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-) 2024-05-02 00:36:27,878 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js 2024-05-02 00:36:28,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:36:28,175 [ scc.git] DEBUG Calling 'git submodule update' 2024-05-02 00:36:28,263 [ scc.git] DEBUG Get sha1 of %s 2024-05-02 00:36:28,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-05-02 00:36:28,268 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-02 00:36:28,314 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-02 00:36:28,329 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f678b04e910> has no local changes 2024-05-02 00:36:28,330 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-web Excluded PRs: - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot]) - PR 549 knabar 'Remove webgateway cache' (status: failure) - PR 535 will-moore 'Initial working browser history' (stage: draft) 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' Conflicting PRs (not included): - PR 168 stick 'Changes to nginx @maintenance handler' Generated by OMERO-python-superbuild-push#49 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/49/)' 2024-05-02 00:36:28,343 [ scc.git] DEBUG [detached HEAD c3f3f4d5c] merge master -Dorg -Ssuccess-only 2024-05-02 00:36:28,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:36:28,344 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-05-02 00:36:28,424 [ scc.config] DEBUG Found submodule.omero-dropbox.url 2024-05-02 00:36:28,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:36:28,603 [ scc.config] DEBUG Found submodule.omero-marshal.url 2024-05-02 00:36:29,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:36:29,022 [ scc.config] DEBUG Found submodule.omero-py.url 2024-05-02 00:36:29,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:36:29,436 [ scc.config] DEBUG Found submodule.omero-scripts.url 2024-05-02 00:36:29,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:36:29,859 [ scc.config] DEBUG Found submodule.omero-web.url 2024-05-02 00:36:30,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-05-02 00:36:30,257 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-05-02 00:36:30,293 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f678e4ab460> has local changes 2024-05-02 00:36:30,293 [ 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' - PR 23 sbesson 'Remove python-future compatibility code' 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) Updating 52d9a6f4..53a327b8 Previously merged: - PR 407 jburel 'Remove ref to ome channel for zeroc-ice' 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 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot]) - PR 549 knabar 'Remove webgateway cache' (status: failure) - PR 535 will-moore 'Initial working browser history' (stage: draft) 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' Conflicting PRs (not included): - PR 168 stick 'Changes to nginx @maintenance handler' Generated by OMERO-python-superbuild-push#49 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/49/)' 2024-05-02 00:36:30,304 [ scc.git] DEBUG [detached HEAD 386f429] merge master -Dorg -Ssuccess-only 2024-05-02 00:36:30,304 [ scc.merge] INFO Repository: ome/omero-python-superbuild 2024-05-02 00:36:30,304 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-) 2024-05-02 00:36:30,304 [ scc.merge] INFO Already up to date. 2024-05-02 00:36:30,305 [ scc.merge] INFO 2024-05-02 00:36:30,305 [ scc.merge] INFO 2024-05-02 00:36:30,305 [ scc.merge] INFO Repository: ome/omero-dropbox 2024-05-02 00:36:30,305 [ scc.merge] INFO Already up to date. 2024-05-02 00:36:30,305 [ scc.merge] INFO 2024-05-02 00:36:30,305 [ scc.merge] INFO Merged PRs: 2024-05-02 00:36:30,305 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist' 2024-05-02 00:36:30,305 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code' 2024-05-02 00:36:30,305 [ scc.merge] INFO 2024-05-02 00:36:30,305 [ scc.merge] INFO Repository: ome/omero-marshal 2024-05-02 00:36:30,305 [ scc.merge] INFO Excluded PRs: 2024-05-02 00:36:30,305 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment) 2024-05-02 00:36:30,305 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment) 2024-05-02 00:36:30,305 [ scc.merge] INFO Already up to date. 2024-05-02 00:36:30,305 [ scc.merge] INFO 2024-05-02 00:36:30,305 [ scc.merge] INFO Merged PRs: 2024-05-02 00:36:30,305 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None' 2024-05-02 00:36:30,305 [ scc.merge] INFO 2024-05-02 00:36:30,305 [ scc.merge] INFO Repository: ome/omero-py 2024-05-02 00:36:30,305 [ scc.merge] INFO Excluded PRs: 2024-05-02 00:36:30,305 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure) 2024-05-02 00:36:30,305 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude) 2024-05-02 00:36:30,305 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu) 2024-05-02 00:36:30,305 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn) 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft) 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment) 2024-05-02 00:36:30,306 [ scc.merge] INFO Updating 52d9a6f4..53a327b8 2024-05-02 00:36:30,306 [ scc.merge] INFO Previously merged: 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 407 jburel 'Remove ref to ome channel for zeroc-ice' 2024-05-02 00:36:30,306 [ scc.merge] INFO 2024-05-02 00:36:30,306 [ scc.merge] INFO Merged PRs: 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group' 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error' 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins' 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj' 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 332 jburel 'Build conda' 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs' 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command' 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method' 2024-05-02 00:36:30,306 [ scc.merge] INFO 2024-05-02 00:36:30,306 [ scc.merge] INFO Repository: ome/omero-scripts 2024-05-02 00:36:30,306 [ scc.merge] INFO Excluded PRs: 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT) 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier) 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn) 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment) 2024-05-02 00:36:30,306 [ scc.merge] INFO Already up to date. 2024-05-02 00:36:30,306 [ scc.merge] INFO 2024-05-02 00:36:30,306 [ scc.merge] INFO Conflicting PRs (not included): 2024-05-02 00:36:30,306 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-05-02 00:36:30,307 [ scc.merge] INFO 2024-05-02 00:36:30,307 [ scc.merge] INFO Repository: ome/omero-web 2024-05-02 00:36:30,307 [ scc.merge] INFO Excluded PRs: 2024-05-02 00:36:30,307 [ scc.merge] INFO - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot]) 2024-05-02 00:36:30,307 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache' (status: failure) 2024-05-02 00:36:30,307 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft) 2024-05-02 00:36:30,307 [ scc.merge] INFO Already up to date. 2024-05-02 00:36:30,307 [ scc.merge] INFO 2024-05-02 00:36:30,307 [ scc.merge] INFO Merged PRs: 2024-05-02 00:36:30,307 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test' 2024-05-02 00:36:30,307 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel' 2024-05-02 00:36:30,307 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' 2024-05-02 00:36:30,307 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display' 2024-05-02 00:36:30,307 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks' 2024-05-02 00:36:30,307 [ scc.merge] INFO 2024-05-02 00:36:30,307 [ scc.merge] INFO Conflicting PRs (not included): 2024-05-02 00:36:30,307 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' 2024-05-02 00:36:30,307 [ scc.merge] INFO 2024-05-02 00:36:30,307 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-05-02 00:36:30,307 [ scc.git] DEBUG Calling 'git remote' 2024-05-02 00:36:30,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-05-02 00:36:30,313 [ scc.git] DEBUG Calling 'git remote' 2024-05-02 00:36:30,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:36:30,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-05-02 00:36:30,318 [ scc.git] DEBUG Calling 'git remote' 2024-05-02 00:36:30,323 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:36:30,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-05-02 00:36:30,324 [ scc.git] DEBUG Calling 'git remote' 2024-05-02 00:36:30,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:36:30,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-05-02 00:36:30,329 [ scc.git] DEBUG Calling 'git remote' 2024-05-02 00:36:30,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-05-02 00:36:30,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-05-02 00:36:30,335 [ scc.git] DEBUG Calling 'git remote' 2024-05-02 00:36:30,340 [ 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 5863350 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 52d9a6f4 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 9308a59 nothing to commit, working tree clean 2024-05-02 00:37:00,982 [ 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