![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
Started by upstream project "Trigger" build number 51 originally caused by: Started by timer [Pipeline] Start of Pipeline [Pipeline] node Running on testintegration in /home/omero/workspace/OMERO-python-superbuild-push [Pipeline] { [Pipeline] library Loading library recursiveMerge@master Attempting to resolve master from remote references... > git --version # timeout=10 > git --version # 'git version 2.39.2' > git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Found match: refs/heads/master revision f061dff15033c5cd55249a383f52c15ca4a0e5cf The recommended git tool is: NONE No credentials specified > git rev-parse --resolve-git-dir /var/jenkins_home/jobs/OMERO-python-superbuild-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Fetching without tags Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git > git --version # timeout=10 > git --version # 'git version 2.39.2' > git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master) > git config core.sparsecheckout # timeout=10 > git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 Commit message: "Merge pull request #17 from jburel/python3" > git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 [Pipeline] checkout The recommended git tool is: NONE No credentials specified Fetching changes from the remote Git repository > git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-python-superbuild-push/.git # timeout=10 > git config remote.origin.url https://github.com/ome/omero-python-superbuild.git # timeout=10 Fetching upstream changes from https://github.com/ome/omero-python-superbuild.git > git --version # timeout=10 > git --version # 'git version 2.39.3' > git fetch --tags --force --progress -- https://github.com/ome/omero-python-superbuild.git +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision 2524209fa303040cb896adb393aa091fe485414d (refs/remotes/origin/master) > git rev-parse refs/remotes/origin/master^{commit} # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f 2524209fa303040cb896adb393aa091fe485414d # timeout=10 Commit message: "Merge pull request #272 from ome/dependabot/submodules/omero-web-0e4013c" > git rev-list --no-walk 2524209fa303040cb896adb393aa091fe485414d # 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 [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-build-push" build number 44 [Pipeline] sh + pushd build ~/workspace/OMERO-python-superbuild-push/build ~/workspace/OMERO-python-superbuild-push + curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz + tar -zxf - + popd ~/workspace/OMERO-python-superbuild-push + python3 -m venv build/venv > git submodule update --init --recursive omero-scripts # timeout=10 + . build/venv/bin/activate ++ deactivate nondestructive ++ '[' -n '' ']' ++ '[' -n '' ']' ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r ++ '[' -n '' ']' ++ unset VIRTUAL_ENV ++ '[' '!' nondestructive = nondestructive ']' ++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv ++ export VIRTUAL_ENV ++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ export PATH ++ '[' -n '' ']' ++ '[' -z '' ']' ++ _OLD_VIRTUAL_PS1= ++ PS1='(venv) ' ++ export PS1 ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r + python3 -m pip install -U pip Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3) Collecting pip Using cached pip-24.0-py3-none-any.whl (2.1 MB) Installing collected packages: pip Attempting uninstall: pip Found existing installation: pip 21.2.3 Uninstalling pip-21.2.3: Successfully uninstalled pip-21.2.3 Successfully installed pip-24.0 + python3 -m pip install scc Collecting scc Using cached scc-0.19.1-py3-none-any.whl.metadata (3.6 kB) Collecting PyGithub>=1.54 (from scc) Using cached PyGithub-2.3.0-py3-none-any.whl.metadata (3.8 kB) Collecting PyYAML>=5.1 (from scc) Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.1 kB) Collecting future (from scc) Using cached future-1.0.0-py3-none-any.whl.metadata (4.0 kB) Collecting ruamel.yaml (from scc) Using cached ruamel.yaml-0.18.6-py3-none-any.whl.metadata (23 kB) Collecting ruamel.yaml.jinja2 (from scc) Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl.metadata (2.9 kB) Collecting six (from scc) Using cached six-1.16.0-py2.py3-none-any.whl.metadata (1.8 kB) Collecting urllib3<2 (from scc) Using cached urllib3-1.26.18-py2.py3-none-any.whl.metadata (48 kB) Collecting yaclifw<0.3,>=0.2.0 (from scc) Using cached yaclifw-0.2.0-py3-none-any.whl Collecting pynacl>=1.4.0 (from PyGithub>=1.54->scc) Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl.metadata (8.6 kB) Collecting requests>=2.14.0 (from PyGithub>=1.54->scc) Using cached requests-2.31.0-py3-none-any.whl.metadata (4.6 kB) Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached PyJWT-2.8.0-py3-none-any.whl.metadata (4.2 kB) Collecting typing-extensions>=4.0.0 (from PyGithub>=1.54->scc) Using cached typing_extensions-4.11.0-py3-none-any.whl.metadata (3.0 kB) Collecting Deprecated (from PyGithub>=1.54->scc) Using cached Deprecated-1.2.14-py2.py3-none-any.whl.metadata (5.4 kB) Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc) Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl.metadata (2.2 kB) Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached cryptography-42.0.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-04-25 00:34:18,269 [ scc.config] DEBUG Found github.token 2024-04-25 00:34:18,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-25 00:34:18,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:34:18,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:34:19,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-25 00:34:19,331 [ scc.gh] DEBUG 4738 remaining from 5000 (Reset at 01:04 2024-04-25 00:34:19,332 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:34:19,337 [ scc.git] DEBUG Check current status 2024-04-25 00:34:19,338 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:34:19,342 [ scc.git] DEBUG 2524209 Merge pull request #272 from ome/dependabot/submodules/omero-web-0e4013c 2024-04-25 00:34:19,342 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:34:19,395 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350) 2024-04-25 00:34:19,399 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-04-25 00:34:19,402 [ scc.git] DEBUG d76e17aa58ca755d239e9e8005712cd78239c62e omero-py (v5.19.1-1-gd76e17aa) 2024-04-25 00:34:19,406 [ scc.git] DEBUG 2078ac72dbf11f2733e685000a274eff81c2ac2d omero-scripts (v5.8.0-1-g2078ac7) 2024-04-25 00:34:19,435 [ scc.git] DEBUG 0e4013c65acba6525cd5eabf869611c9e1311ba7 omero-web (v5.25.0-5-g0e4013c65) 2024-04-25 00:34:19,440 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:34:19,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None 2024-04-25 00:34:20,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:34:20,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:34:21,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:34:21,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:34:21,548 [ scc.git] DEBUG Resetting... 2024-04-25 00:34:21,548 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-25 00:34:21,555 [ scc.git] DEBUG HEAD is now at 2524209 Merge pull request #272 from ome/dependabot/submodules/omero-web-0e4013c 2024-04-25 00:34:21,555 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-25 00:34:21,604 [ scc.git] DEBUG Check current status 2024-04-25 00:34:21,604 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:34:21,609 [ scc.git] DEBUG 2524209 Merge pull request #272 from ome/dependabot/submodules/omero-web-0e4013c 2024-04-25 00:34:21,609 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:34:21,648 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350) 2024-04-25 00:34:21,651 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-04-25 00:34:21,654 [ scc.git] DEBUG d76e17aa58ca755d239e9e8005712cd78239c62e omero-py (v5.19.1-1-gd76e17aa) 2024-04-25 00:34:21,658 [ scc.git] DEBUG 2078ac72dbf11f2733e685000a274eff81c2ac2d omero-scripts (v5.8.0-1-g2078ac7) 2024-04-25 00:34:21,661 [ scc.git] DEBUG 0e4013c65acba6525cd5eabf869611c9e1311ba7 omero-web (v5.25.0-5-g0e4013c65) 2024-04-25 00:34:21,662 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-25 00:34:21,662 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-25 00:34:21,662 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-25 00:34:21,662 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-25 00:34:21,662 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-25 00:34:21,662 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:34:22,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None 2024-04-25 00:34:22,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/276 HTTP/1.1" 200 None 2024-04-25 00:34:22,549 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-25 00:34:22,549 [ scc.repo] DEBUG - PR 276 dependabot[bot] 'Bump omero-web from `0e4013c` to `e1b1355`' 2024-04-25 00:34:23,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/275 HTTP/1.1" 200 None 2024-04-25 00:34:23,012 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-25 00:34:23,012 [ scc.repo] DEBUG - PR 275 dependabot[bot] 'Bump omero-scripts from `2078ac7` to `5a90893`' 2024-04-25 00:34:23,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/274 HTTP/1.1" 200 None 2024-04-25 00:34:23,480 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-25 00:34:23,480 [ scc.repo] DEBUG - PR 274 dependabot[bot] 'Bump omero-py from `d76e17a` to `3eb47d1`' 2024-04-25 00:34:23,480 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:34:23,480 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:34:23,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:34:23,485 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:34:23,490 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:34:23,491 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:34:23,495 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:34:23,501 [ scc.git] DEBUG Already up to date. 2024-04-25 00:34:23,501 [ scc.git] DEBUG Calling 'git fetch origin pull/274/head' 2024-04-25 00:34:23,880 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild 2024-04-25 00:34:23,881 [ scc.git] DEBUG * branch refs/pull/274/head -> FETCH_HEAD 2024-04-25 00:34:23,886 [ scc.git] DEBUG Calling 'git fetch origin pull/275/head' 2024-04-25 00:34:24,267 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild 2024-04-25 00:34:24,267 [ scc.git] DEBUG * branch refs/pull/275/head -> FETCH_HEAD 2024-04-25 00:34:24,272 [ scc.git] DEBUG Calling 'git fetch origin pull/276/head' 2024-04-25 00:34:24,647 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild 2024-04-25 00:34:24,647 [ scc.git] DEBUG * branch refs/pull/276/head -> FETCH_HEAD 2024-04-25 00:34:24,652 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:34:24,652 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:34:24,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:34:24,656 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...662bf6882cfcfeaba47a732a9ebf3d43f651e686' 2024-04-25 00:34:24,661 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:34:24,666 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 274 (Bump omero-py from `d76e17a` to `3eb47d1`) 662bf6882cfcfeaba47a732a9ebf3d43f651e686' 2024-04-25 00:34:24,699 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:34:24,701 [ scc.git] DEBUG omero-py | 2 +- 2024-04-25 00:34:24,701 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:34:24,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:34:24,858 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bc295f92ff3a693baf53b3847ba5ad2bb101c4b0' 2024-04-25 00:34:24,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:34:24,874 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 275 (Bump omero-scripts from `2078ac7` to `5a90893`) bc295f92ff3a693baf53b3847ba5ad2bb101c4b0' 2024-04-25 00:34:24,883 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:34:24,885 [ scc.git] DEBUG omero-scripts | 2 +- 2024-04-25 00:34:24,885 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:34:25,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:34:25,299 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6035a5b5b83ba0f63cf179fe701326d9c94e267f' 2024-04-25 00:34:25,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:34:25,306 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 276 (Bump omero-web from `0e4013c` to `e1b1355`) 6035a5b5b83ba0f63cf179fe701326d9c94e267f' 2024-04-25 00:34:25,315 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:34:25,318 [ scc.git] DEBUG omero-web | 2 +- 2024-04-25 00:34:25,318 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:34:25,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:34:25,709 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:34:25,890 [ scc.git] DEBUG Submodule path 'omero-py': checked out '3eb47d17bd8ae6b56ea009d9cf3a1f62d7d33732' 2024-04-25 00:34:26,012 [ scc.git] DEBUG Submodule path 'omero-scripts': checked out '5a908933161233015332dd416c325c60c5b8bd3a' 2024-04-25 00:34:26,147 [ scc.git] DEBUG Submodule path 'omero-web': checked out 'e1b1355ebd4f9de8b855dd2c55f59d86c061a81b' 2024-04-25 00:34:26,147 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:34:26,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:34:26,151 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:34:26,360 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d9182ce80> has no local changes 2024-04-25 00:34:26,361 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone Repository: ome/omero-python-superbuild Already up to date. Merged PRs: - PR 274 dependabot[bot] 'Bump omero-py from `d76e17a` to `3eb47d1`' - PR 275 dependabot[bot] 'Bump omero-scripts from `2078ac7` to `5a90893`' - PR 276 dependabot[bot] 'Bump omero-web from `0e4013c` to `e1b1355`' Generated by OMERO-python-superbuild-push#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/42/)' 2024-04-25 00:34:26,386 [ scc.git] DEBUG [detached HEAD 944a470] merge master -Dorg -Snone 2024-04-25 00:34:26,386 [ scc.merge] INFO Repository: ome/omero-python-superbuild 2024-04-25 00:34:26,386 [ scc.merge] INFO Already up to date. 2024-04-25 00:34:26,386 [ scc.merge] INFO 2024-04-25 00:34:26,386 [ scc.merge] INFO Merged PRs: 2024-04-25 00:34:26,387 [ scc.merge] INFO - PR 274 dependabot[bot] 'Bump omero-py from `d76e17a` to `3eb47d1`' 2024-04-25 00:34:26,387 [ scc.merge] INFO - PR 275 dependabot[bot] 'Bump omero-scripts from `2078ac7` to `5a90893`' 2024-04-25 00:34:26,387 [ scc.merge] INFO - PR 276 dependabot[bot] 'Bump omero-web from `0e4013c` to `e1b1355`' 2024-04-25 00:34:26,387 [ scc.merge] INFO 2024-04-25 00:34:26,387 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-25 00:34:26,387 [ 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 3eb47d17..52d9a6f4 master -> origin/master * [new tag] v5.19.2 -> v5.19.2 Submodule path 'omero-py': checked out '52d9a6f42690aa033acaf808521612720dd50757' Merge all submodules using repository configuration: base-branch: master submodules: omero-scripts: base-branch: develop 2024-04-25 00:34:30,335 [ scc.config] DEBUG Found github.token 2024-04-25 00:34:30,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-25 00:34:30,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:34:30,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:34:31,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-25 00:34:31,399 [ scc.gh] DEBUG 4724 remaining from 5000 (Reset at 01:04 2024-04-25 00:34:31,400 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:34:31,404 [ scc.git] DEBUG Check current status 2024-04-25 00:34:31,405 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:34:31,408 [ scc.git] DEBUG 944a470 merge master -Dorg -Snone 2024-04-25 00:34:31,409 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:34:31,453 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350) 2024-04-25 00:34:31,456 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-04-25 00:34:31,459 [ scc.git] DEBUG +52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4) 2024-04-25 00:34:31,463 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893) 2024-04-25 00:34:31,466 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb) 2024-04-25 00:34:31,471 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:34:31,471 [ scc.git] DEBUG Reading repository configuration from repositories.yml 2024-04-25 00:34:31,473 [ scc.git] DEBUG Repository configuration: base-branch: master submodules: omero-scripts: base-branch: develop 2024-04-25 00:34:31,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None 2024-04-25 00:34:32,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:34:32,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:34:33,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:34:33,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:34:33,570 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:34:33,623 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-04-25 00:34:33,623 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:34:33,628 [ scc.git] DEBUG Check current status 2024-04-25 00:34:33,628 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:34:33,635 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311 2024-04-25 00:34:33,635 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:34:33,683 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:34:34,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None 2024-04-25 00:34:34,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:34:34,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:34:35,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:34:35,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:34:35,800 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:34:35,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:34:35,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-04-25 00:34:35,851 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:34:35,858 [ scc.git] DEBUG Check current status 2024-04-25 00:34:35,858 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:34:35,864 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312 2024-04-25 00:34:35,864 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:34:35,914 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:34:36,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None 2024-04-25 00:34:36,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:34:37,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:34:37,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:34:38,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:34:38,016 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:34:38,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:34:38,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-04-25 00:34:38,058 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:34:38,062 [ scc.git] DEBUG Check current status 2024-04-25 00:34:38,062 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:34:38,115 [ scc.git] DEBUG 52d9a6f4 Bump version: 5.19.2 → 5.19.3.dev0 2024-04-25 00:34:38,115 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:34:38,156 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:34:38,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None 2024-04-25 00:34:38,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:34:39,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:34:39,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:34:40,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:34:40,193 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:34:40,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:34:40,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-04-25 00:34:40,236 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:34:40,241 [ scc.git] DEBUG Check current status 2024-04-25 00:34:40,241 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:34:40,258 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0 2024-04-25 00:34:40,259 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:34:40,306 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:34:40,307 [ scc.git] DEBUG Repository configuration: base-branch: develop 2024-04-25 00:34:40,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None 2024-04-25 00:34:41,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:34:41,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:34:41,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:34:42,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:34:42,368 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:34:42,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:34:42,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-04-25 00:34:42,414 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:34:42,419 [ scc.git] DEBUG Check current status 2024-04-25 00:34:42,419 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:34:42,423 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request 2024-04-25 00:34:42,423 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:34:42,469 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:34:42,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None 2024-04-25 00:34:43,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:34:43,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:34:44,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:34:44,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:34:44,589 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:34:44,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:34:44,632 [ scc.git] DEBUG Resetting... 2024-04-25 00:34:44,632 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-25 00:34:44,638 [ scc.git] DEBUG HEAD is now at 944a470 merge master -Dorg -Snone 2024-04-25 00:34:44,638 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-25 00:34:44,719 [ scc.git] DEBUG Submodule path 'omero-py': checked out '3eb47d17bd8ae6b56ea009d9cf3a1f62d7d33732' 2024-04-25 00:34:44,728 [ scc.git] DEBUG Check current status 2024-04-25 00:34:44,729 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:34:44,733 [ scc.git] DEBUG 944a470 merge master -Dorg -Snone 2024-04-25 00:34:44,733 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:34:44,774 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350) 2024-04-25 00:34:44,776 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f) 2024-04-25 00:34:44,780 [ scc.git] DEBUG 3eb47d17bd8ae6b56ea009d9cf3a1f62d7d33732 omero-py (v5.19.1-3-g3eb47d17) 2024-04-25 00:34:44,784 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893) 2024-04-25 00:34:44,788 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb) 2024-04-25 00:34:44,789 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-25 00:34:44,789 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-25 00:34:44,789 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-25 00:34:44,789 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-25 00:34:44,789 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-25 00:34:44,789 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-04-25 00:34:44,789 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:34:45,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None 2024-04-25 00:34:45,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/276 HTTP/1.1" 200 None 2024-04-25 00:34:45,551 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-25 00:34:46,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6035a5b5b83ba0f63cf179fe701326d9c94e267f HTTP/1.1" 200 None 2024-04-25 00:34:46,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6035a5b5b83ba0f63cf179fe701326d9c94e267f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-25 00:34:47,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6035a5b5b83ba0f63cf179fe701326d9c94e267f HTTP/1.1" 200 None 2024-04-25 00:34:47,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/6035a5b5b83ba0f63cf179fe701326d9c94e267f?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:34:47,462 [ scc.repo] DEBUG - PR 276 dependabot[bot] 'Bump omero-web from `0e4013c` to `e1b1355`' 2024-04-25 00:34:47,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/275 HTTP/1.1" 200 None 2024-04-25 00:34:47,926 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-25 00:34:48,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/bc295f92ff3a693baf53b3847ba5ad2bb101c4b0 HTTP/1.1" 200 None 2024-04-25 00:34:48,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/bc295f92ff3a693baf53b3847ba5ad2bb101c4b0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-25 00:34:49,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/bc295f92ff3a693baf53b3847ba5ad2bb101c4b0 HTTP/1.1" 200 None 2024-04-25 00:34:49,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/bc295f92ff3a693baf53b3847ba5ad2bb101c4b0?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:34:49,753 [ scc.repo] DEBUG - PR 275 dependabot[bot] 'Bump omero-scripts from `2078ac7` to `5a90893`' 2024-04-25 00:34:50,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/274 HTTP/1.1" 200 None 2024-04-25 00:34:50,222 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-25 00:34:50,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/662bf6882cfcfeaba47a732a9ebf3d43f651e686 HTTP/1.1" 200 None 2024-04-25 00:34:51,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/662bf6882cfcfeaba47a732a9ebf3d43f651e686/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-25 00:34:51,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/662bf6882cfcfeaba47a732a9ebf3d43f651e686 HTTP/1.1" 200 None 2024-04-25 00:34:52,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/662bf6882cfcfeaba47a732a9ebf3d43f651e686?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:34:52,177 [ scc.repo] DEBUG - PR 274 dependabot[bot] 'Bump omero-py from `d76e17a` to `3eb47d1`' 2024-04-25 00:34:52,178 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:34:52,178 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:34:52,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:34:52,182 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:34:52,187 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:34:52,188 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:34:52,194 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:34:52,204 [ scc.git] DEBUG Already up to date. 2024-04-25 00:34:52,205 [ scc.git] DEBUG Calling 'git fetch origin pull/274/head' 2024-04-25 00:34:52,600 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild 2024-04-25 00:34:52,600 [ scc.git] DEBUG * branch refs/pull/274/head -> FETCH_HEAD 2024-04-25 00:34:52,604 [ scc.git] DEBUG Calling 'git fetch origin pull/275/head' 2024-04-25 00:34:52,961 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild 2024-04-25 00:34:52,962 [ scc.git] DEBUG * branch refs/pull/275/head -> FETCH_HEAD 2024-04-25 00:34:52,967 [ scc.git] DEBUG Calling 'git fetch origin pull/276/head' 2024-04-25 00:34:53,343 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild 2024-04-25 00:34:53,343 [ scc.git] DEBUG * branch refs/pull/276/head -> FETCH_HEAD 2024-04-25 00:34:53,350 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:34:53,350 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:34:53,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:34:53,355 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...662bf6882cfcfeaba47a732a9ebf3d43f651e686' 2024-04-25 00:34:53,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:34:53,365 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 274 (Bump omero-py from `d76e17a` to `3eb47d1`) 662bf6882cfcfeaba47a732a9ebf3d43f651e686' 2024-04-25 00:34:53,370 [ scc.git] DEBUG Already up to date. 2024-04-25 00:34:53,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:34:53,528 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bc295f92ff3a693baf53b3847ba5ad2bb101c4b0' 2024-04-25 00:34:53,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:34:53,537 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 275 (Bump omero-scripts from `2078ac7` to `5a90893`) bc295f92ff3a693baf53b3847ba5ad2bb101c4b0' 2024-04-25 00:34:53,541 [ scc.git] DEBUG Already up to date. 2024-04-25 00:34:53,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:34:53,947 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6035a5b5b83ba0f63cf179fe701326d9c94e267f' 2024-04-25 00:34:53,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:34:53,957 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 276 (Bump omero-web from `0e4013c` to `e1b1355`) 6035a5b5b83ba0f63cf179fe701326d9c94e267f' 2024-04-25 00:34:53,962 [ scc.git] DEBUG Already up to date. 2024-04-25 00:34:54,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:34:54,368 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:34:54,412 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:34:54,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:34:54,417 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:34:54,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None 2024-04-25 00:34:55,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None 2024-04-25 00:34:55,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None 2024-04-25 00:34:56,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None 2024-04-25 00:34:56,787 [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-04-25 00:34:57,268 [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-04-25 00:34:57,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None 2024-04-25 00:34:58,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:34:58,110 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code' 2024-04-25 00:34:58,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None 2024-04-25 00:34:59,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None 2024-04-25 00:34:59,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None 2024-04-25 00:35:00,053 [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-04-25 00:35:00,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None 2024-04-25 00:35:00,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:35:00,960 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist' 2024-04-25 00:35:00,960 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:35:00,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-04-25 00:35:00,960 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:35:00,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:00,965 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:35:00,970 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:35:00,971 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:35:00,977 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:35:00,985 [ scc.git] DEBUG Already up to date. 2024-04-25 00:35:00,985 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head' 2024-04-25 00:35:01,416 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox 2024-04-25 00:35:01,416 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD 2024-04-25 00:35:01,421 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head' 2024-04-25 00:35:01,810 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox 2024-04-25 00:35:01,811 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD 2024-04-25 00:35:01,816 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:35:01,816 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:35:01,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:01,821 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452' 2024-04-25 00:35:01,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:01,837 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452' 2024-04-25 00:35:01,948 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:35:01,952 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++--- 2024-04-25 00:35:01,952 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++-------------------- 2024-04-25 00:35:01,952 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++----------- 2024-04-25 00:35:01,952 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------ 2024-04-25 00:35:01,952 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++----- 2024-04-25 00:35:01,953 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++----------- 2024-04-25 00:35:01,953 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++----- 2024-04-25 00:35:01,954 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++---- 2024-04-25 00:35:01,955 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++--------- 2024-04-25 00:35:01,955 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-) 2024-04-25 00:35:02,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:35:02,114 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8' 2024-04-25 00:35:02,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:02,124 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8' 2024-04-25 00:35:02,268 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py 2024-04-25 00:35:02,269 [ scc.git] DEBUG Auto-merging src/fsDirectory.py 2024-04-25 00:35:02,269 [ scc.git] DEBUG Auto-merging src/fsDropBox.py 2024-04-25 00:35:02,269 [ scc.git] DEBUG Auto-merging src/fsLists.py 2024-04-25 00:35:02,269 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py 2024-04-25 00:35:02,269 [ scc.git] DEBUG Auto-merging src/fsMonitor.py 2024-04-25 00:35:02,269 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py 2024-04-25 00:35:02,269 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py 2024-04-25 00:35:02,269 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py 2024-04-25 00:35:02,269 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:35:02,275 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +- 2024-04-25 00:35:02,275 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++-- 2024-04-25 00:35:02,275 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++-- 2024-04-25 00:35:02,275 [ scc.git] DEBUG Dockerfile | 32 ---------------------- 2024-04-25 00:35:02,275 [ scc.git] DEBUG setup.py | 2 +- 2024-04-25 00:35:02,275 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 - 2024-04-25 00:35:02,275 [ scc.git] DEBUG src/fsDirectory.py | 8 +----- 2024-04-25 00:35:02,275 [ scc.git] DEBUG src/fsDropBox.py | 8 +----- 2024-04-25 00:35:02,275 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +------- 2024-04-25 00:35:02,276 [ scc.git] DEBUG src/fsFileServer.py | 12 ++------- 2024-04-25 00:35:02,276 [ scc.git] DEBUG src/fsLists.py | 2 -- 2024-04-25 00:35:02,276 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------ 2024-04-25 00:35:02,276 [ scc.git] DEBUG src/fsMonitor.py | 2 -- 2024-04-25 00:35:02,276 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++--- 2024-04-25 00:35:02,276 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 --- 2024-04-25 00:35:02,276 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++---------- 2024-04-25 00:35:02,276 [ scc.git] DEBUG src/fsUtil.py | 9 +++---- 2024-04-25 00:35:02,276 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +----- 2024-04-25 00:35:02,276 [ scc.git] DEBUG test/conftest.py | 2 -- 2024-04-25 00:35:02,276 [ scc.git] DEBUG test/drivers.py | 17 +++--------- 2024-04-25 00:35:02,276 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++---------------------- 2024-04-25 00:35:02,276 [ scc.git] DEBUG test/unit/test_monitor.py | 2 -- 2024-04-25 00:35:02,276 [ scc.git] DEBUG test/unit/test_replay.py | 8 +----- 2024-04-25 00:35:02,276 [ scc.git] DEBUG test/unit/test_state.py | 1 - 2024-04-25 00:35:02,276 [ scc.git] DEBUG tox.ini | 3 ++- 2024-04-25 00:35:02,276 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-) 2024-04-25 00:35:02,276 [ scc.git] DEBUG delete mode 100644 Dockerfile 2024-04-25 00:35:02,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:35:02,540 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:35:02,581 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:35:02,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:02,586 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:35:02,627 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:35:02,636 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda707a53d0> has no local changes 2024-04-25 00:35:02,637 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/42/)' 2024-04-25 00:35:02,697 [ scc.git] DEBUG [detached HEAD ab50be6] merge master -Dorg -Ssuccess-only 2024-04-25 00:35:02,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:35:02,698 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:35:03,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None 2024-04-25 00:35:03,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None 2024-04-25 00:35:04,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None 2024-04-25 00:35:04,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None 2024-04-25 00:35:05,037 [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-04-25 00:35:05,531 [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-04-25 00:35:06,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None 2024-04-25 00:35:06,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:35:06,483 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None' 2024-04-25 00:35:06,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None 2024-04-25 00:35:07,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None 2024-04-25 00:35:07,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None 2024-04-25 00:35:08,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None 2024-04-25 00:35:08,335 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:35:08,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-04-25 00:35:08,335 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:35:08,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:08,341 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:35:08,345 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:35:08,346 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:35:08,351 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:35:08,357 [ scc.git] DEBUG Already up to date. 2024-04-25 00:35:08,357 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-04-25 00:35:08,833 [ scc.git] DEBUG From https://github.com/ome/omero-marshal 2024-04-25 00:35:08,833 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-04-25 00:35:08,839 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:35:08,839 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:35:08,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:08,844 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca' 2024-04-25 00:35:08,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:08,853 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca' 2024-04-25 00:35:08,877 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py 2024-04-25 00:35:08,878 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:35:08,881 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++-- 2024-04-25 00:35:08,881 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++- 2024-04-25 00:35:08,882 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-) 2024-04-25 00:35:09,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:35:09,038 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:35:09,080 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:35:09,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:09,085 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:35:09,122 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:35:09,128 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda707968e0> has no local changes 2024-04-25 00:35:09,129 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/42/)' 2024-04-25 00:35:09,136 [ scc.git] DEBUG [detached HEAD 650b9f6] merge master -Dorg -Ssuccess-only 2024-04-25 00:35:09,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:35:09,136 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:35:09,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None 2024-04-25 00:35:10,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None 2024-04-25 00:35:10,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None 2024-04-25 00:35:11,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None 2024-04-25 00:35:11,674 [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-04-25 00:35:12,131 [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-04-25 00:35:12,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None 2024-04-25 00:35:13,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-04-25 00:35:13,592 [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-04-25 00:35:14,066 [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-04-25 00:35:14,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-04-25 00:35:14,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None 2024-04-25 00:35:15,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None 2024-04-25 00:35:15,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None 2024-04-25 00:35:15,784 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command' 2024-04-25 00:35:16,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None 2024-04-25 00:35:16,252 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-04-25 00:35:16,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None 2024-04-25 00:35:17,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None 2024-04-25 00:35:17,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None 2024-04-25 00:35:18,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None 2024-04-25 00:35:18,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None 2024-04-25 00:35:19,120 [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-04-25 00:35:19,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None 2024-04-25 00:35:19,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:35:19,997 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs' 2024-04-25 00:35:20,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None 2024-04-25 00:35:20,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None 2024-04-25 00:35:21,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-04-25 00:35:21,927 [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-04-25 00:35:22,418 [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-04-25 00:35:22,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-04-25 00:35:23,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None 2024-04-25 00:35:23,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None 2024-04-25 00:35:24,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None 2024-04-25 00:35:24,182 [ scc.repo] DEBUG - PR 332 jburel 'Build conda' 2024-04-25 00:35:24,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None 2024-04-25 00:35:25,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None 2024-04-25 00:35:25,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None 2024-04-25 00:35:26,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None 2024-04-25 00:35:26,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None 2024-04-25 00:35:26,995 [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-04-25 00:35:27,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None 2024-04-25 00:35:27,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:35:27,882 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj' 2024-04-25 00:35:28,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None 2024-04-25 00:35:28,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None 2024-04-25 00:35:29,293 [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-04-25 00:35:29,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None 2024-04-25 00:35:30,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:35:30,199 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins' 2024-04-25 00:35:30,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None 2024-04-25 00:35:31,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None 2024-04-25 00:35:31,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None 2024-04-25 00:35:32,135 [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-04-25 00:35:32,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None 2024-04-25 00:35:33,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:35:33,112 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error' 2024-04-25 00:35:33,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None 2024-04-25 00:35:34,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None 2024-04-25 00:35:34,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None 2024-04-25 00:35:34,998 [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-04-25 00:35:35,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None 2024-04-25 00:35:35,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:35:35,929 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group' 2024-04-25 00:35:36,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None 2024-04-25 00:35:36,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None 2024-04-25 00:35:37,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None 2024-04-25 00:35:37,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None 2024-04-25 00:35:37,822 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:35:37,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-04-25 00:35:37,823 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:35:37,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:37,828 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:35:37,834 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:35:37,834 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:35:37,841 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:35:37,867 [ scc.git] DEBUG Updating 3eb47d17..52d9a6f4 2024-04-25 00:35:38,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls/400 HTTP/1.1" 200 None 2024-04-25 00:35:39,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls/405 HTTP/1.1" 200 None 2024-04-25 00:35:39,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls/394 HTTP/1.1" 200 None 2024-04-25 00:35:40,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls/398 HTTP/1.1" 200 None 2024-04-25 00:35:41,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls/406 HTTP/1.1" 200 None 2024-04-25 00:35:41,152 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head' 2024-04-25 00:35:41,655 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-04-25 00:35:41,655 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD 2024-04-25 00:35:41,662 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head' 2024-04-25 00:35:42,111 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-04-25 00:35:42,112 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD 2024-04-25 00:35:42,120 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head' 2024-04-25 00:35:42,546 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-04-25 00:35:42,546 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD 2024-04-25 00:35:42,553 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head' 2024-04-25 00:35:42,982 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-04-25 00:35:42,982 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD 2024-04-25 00:35:42,988 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head' 2024-04-25 00:35:43,484 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-04-25 00:35:43,484 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD 2024-04-25 00:35:43,490 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head' 2024-04-25 00:35:43,873 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-04-25 00:35:43,873 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD 2024-04-25 00:35:43,879 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head' 2024-04-25 00:35:44,272 [ scc.git] DEBUG From https://github.com/ome/omero-py 2024-04-25 00:35:44,272 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD 2024-04-25 00:35:44,277 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:35:44,278 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:35:44,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:44,284 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec' 2024-04-25 00:35:44,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:44,301 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec' 2024-04-25 00:35:44,343 [ scc.git] DEBUG Auto-merging src/omero/cli.py 2024-04-25 00:35:44,343 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py 2024-04-25 00:35:44,343 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:35:44,348 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++ 2024-04-25 00:35:44,348 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++--- 2024-04-25 00:35:44,348 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-) 2024-04-25 00:35:44,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:35:44,506 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb' 2024-04-25 00:35:44,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:44,533 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb' 2024-04-25 00:35:44,616 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py 2024-04-25 00:35:44,616 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py 2024-04-25 00:35:44,617 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:35:44,625 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------ 2024-04-25 00:35:44,625 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++ 2024-04-25 00:35:44,625 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-) 2024-04-25 00:35:44,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:35:44,910 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f' 2024-04-25 00:35:44,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:44,928 [ 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-04-25 00:35:44,952 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py 2024-04-25 00:35:44,953 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:35:44,956 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++---- 2024-04-25 00:35:44,956 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-) 2024-04-25 00:35:45,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:35:45,319 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a' 2024-04-25 00:35:45,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:45,337 [ 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-04-25 00:35:45,373 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py 2024-04-25 00:35:45,373 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py 2024-04-25 00:35:45,374 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:35:45,378 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++- 2024-04-25 00:35:45,378 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +- 2024-04-25 00:35:45,378 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-) 2024-04-25 00:35:45,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:35:45,733 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc' 2024-04-25 00:35:45,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:45,753 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc' 2024-04-25 00:35:45,798 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:35:45,802 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++ 2024-04-25 00:35:45,802 [ scc.git] DEBUG connect.py | 11 +++++++++++ 2024-04-25 00:35:45,802 [ scc.git] DEBUG 2 files changed, 48 insertions(+) 2024-04-25 00:35:45,802 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml 2024-04-25 00:35:45,802 [ scc.git] DEBUG create mode 100644 connect.py 2024-04-25 00:35:46,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:35:46,146 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5' 2024-04-25 00:35:46,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:46,164 [ 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-04-25 00:35:46,245 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py 2024-04-25 00:35:46,247 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:35:46,250 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++ 2024-04-25 00:35:46,250 [ scc.git] DEBUG 1 file changed, 2 insertions(+) 2024-04-25 00:35:46,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:35:46,551 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023' 2024-04-25 00:35:46,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:46,569 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023' 2024-04-25 00:35:46,603 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py 2024-04-25 00:35:46,604 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:35:46,608 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++-- 2024-04-25 00:35:46,608 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-) 2024-04-25 00:35:46,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:35:46,970 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:35:47,026 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:35:47,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:47,034 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:35:47,080 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:35:47,089 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda6f6d1760> has no local changes 2024-04-25 00:35:47,089 [ 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 3eb47d17..52d9a6f4 Previously merged: - PR 400 jburel 'Session ID and constructor' - PR 405 will-moore 'FilesetWrapper lazy loads Images and UsedFiles' - PR 394 jo-mueller 'added `_repr_html_` method for `_ImageWrapper`' - PR 398 will-moore 'getGridSize() handles plates with no Wells' - PR 406 jburel 'update the build steps' 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' Generated by OMERO-python-superbuild-push#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/42/)' 2024-04-25 00:35:47,100 [ scc.git] DEBUG [detached HEAD de8f82e9] merge master -Dorg -Ssuccess-only 2024-04-25 00:35:47,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:35:47,100 [ scc.git] INFO Overriding base-branch from master to develop 2024-04-25 00:35:47,100 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:35:47,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None 2024-04-25 00:35:48,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None 2024-04-25 00:35:48,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None 2024-04-25 00:35:49,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None 2024-04-25 00:35:49,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None 2024-04-25 00:35:50,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None 2024-04-25 00:35:50,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None 2024-04-25 00:35:50,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-04-25 00:35:51,423 [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-04-25 00:35:51,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-04-25 00:35:52,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:35:52,329 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-04-25 00:35:52,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None 2024-04-25 00:35:53,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None 2024-04-25 00:35:53,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None 2024-04-25 00:35:54,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None 2024-04-25 00:35:54,295 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:35:54,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-04-25 00:35:54,295 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:35:54,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:54,301 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop' 2024-04-25 00:35:54,305 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:35:54,305 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop' 2024-04-25 00:35:54,310 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop' 2024-04-25 00:35:54,315 [ scc.git] DEBUG Already up to date. 2024-04-25 00:35:54,315 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head' 2024-04-25 00:35:54,859 [ scc.git] DEBUG From https://github.com/ome/omero-scripts 2024-04-25 00:35:54,859 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD 2024-04-25 00:35:54,864 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:35:54,864 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:35:54,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:54,870 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-04-25 00:35:54,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:54,883 [ 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-04-25 00:35:54,943 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py 2024-04-25 00:35:54,943 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py 2024-04-25 00:35:54,943 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-04-25 00:35:54,943 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-04-25 00:35:54,950 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a' 2024-04-25 00:35:54,956 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0 2024-04-25 00:35:55,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:35:55,113 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-04-25 00:35:55,121 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a' 2024-04-25 00:35:55,126 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' Conflicting PR. Removed from build [OMERO-python-superbuild-push#42](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/42/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/42/consoleText) for more details. Possible conflicts: - Upstream changes - omero/annotation_scripts/KeyVal_to_csv.py --conflicts 2024-04-25 00:35:55,129 [ scc.config] DEBUG Found github.token 2024-04-25 00:35:55,130 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts. 2024-04-25 00:35:55,130 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:35:55,167 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:35:55,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:35:55,172 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:35:55,214 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:35:55,221 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda6f6d8640> has no local changes 2024-04-25 00:35:55,221 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/42/)' 2024-04-25 00:35:55,231 [ scc.git] DEBUG [detached HEAD 212347e] merge master -Dorg -Ssuccess-only 2024-04-25 00:35:55,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:35:55,231 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:35:55,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None 2024-04-25 00:35:56,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None 2024-04-25 00:35:56,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None 2024-04-25 00:35:57,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712 HTTP/1.1" 200 None 2024-04-25 00:35:57,630 [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-04-25 00:35:58,104 [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-04-25 00:35:58,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None 2024-04-25 00:35:59,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None 2024-04-25 00:35:59,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None 2024-04-25 00:36:00,061 [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-04-25 00:36:00,543 [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-04-25 00:36:01,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None 2024-04-25 00:36:01,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4?per_page=1 HTTP/1.1" 200 None 2024-04-25 00:36:01,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None 2024-04-25 00:36:02,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None 2024-04-25 00:36:02,373 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks' 2024-04-25 00:36:02,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None 2024-04-25 00:36:03,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None 2024-04-25 00:36:03,355 [ scc.repo] DEBUG # ... Include label: include 2024-04-25 00:36:03,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None 2024-04-25 00:36:04,356 [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-04-25 00:36:04,848 [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-04-25 00:36:05,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None 2024-04-25 00:36:05,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/977f7b65169e6dee479197a9156993bbadd2d2e2?per_page=1 HTTP/1.1" 200 None 2024-04-25 00:36:06,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None 2024-04-25 00:36:06,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None 2024-04-25 00:36:06,658 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display' 2024-04-25 00:36:07,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536 HTTP/1.1" 200 None 2024-04-25 00:36:07,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536/comments HTTP/1.1" 200 None 2024-04-25 00:36:08,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None 2024-04-25 00:36:08,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-25 00:36:09,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-04-25 00:36:09,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None 2024-04-25 00:36:09,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/412fa66a52477fb77319a35147313a6f3cf481a2?per_page=1 HTTP/1.1" 200 None 2024-04-25 00:36:10,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None 2024-04-25 00:36:10,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/status HTTP/1.1" 200 None 2024-04-25 00:36:10,850 [ scc.repo] DEBUG - PR 536 will-moore 'imgData JSON with no stateful services' 2024-04-25 00:36:11,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None 2024-04-25 00:36:11,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None 2024-04-25 00:36:12,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None 2024-04-25 00:36:12,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-04-25 00:36:13,261 [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-04-25 00:36:13,769 [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-04-25 00:36:14,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-04-25 00:36:14,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None 2024-04-25 00:36:15,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None 2024-04-25 00:36:15,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None 2024-04-25 00:36:15,557 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' 2024-04-25 00:36:16,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None 2024-04-25 00:36:16,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None 2024-04-25 00:36:17,007 [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-04-25 00:36:17,465 [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-04-25 00:36:17,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None 2024-04-25 00:36:18,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/e335980be1e7197826687f6c322a60c61b4aa545?per_page=1 HTTP/1.1" 200 None 2024-04-25 00:36:18,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None 2024-04-25 00:36:19,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/status HTTP/1.1" 200 None 2024-04-25 00:36:19,306 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel' 2024-04-25 00:36:19,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None 2024-04-25 00:36:20,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None 2024-04-25 00:36:20,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-04-25 00:36:21,224 [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-04-25 00:36:21,716 [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-04-25 00:36:22,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-04-25 00:36:22,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None 2024-04-25 00:36:23,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None 2024-04-25 00:36:23,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None 2024-04-25 00:36:23,505 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test' 2024-04-25 00:36:23,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None 2024-04-25 00:36:24,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None 2024-04-25 00:36:25,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None 2024-04-25 00:36:25,446 [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-04-25 00:36:26,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None 2024-04-25 00:36:26,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/219d9e721304a4c46b4d73ef9ff3777549d69615?per_page=1 HTTP/1.1" 200 2 2024-04-25 00:36:26,432 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler' 2024-04-25 00:36:26,433 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:36:26,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-04-25 00:36:26,433 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:36:26,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:36:26,443 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:36:26,450 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:36:26,450 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:36:26,457 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:36:26,464 [ scc.git] DEBUG Already up to date. 2024-04-25 00:36:26,465 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head' 2024-04-25 00:36:27,265 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-04-25 00:36:27,266 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD 2024-04-25 00:36:27,272 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head' 2024-04-25 00:36:27,799 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-04-25 00:36:27,799 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD 2024-04-25 00:36:27,804 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head' 2024-04-25 00:36:28,216 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-04-25 00:36:28,216 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD 2024-04-25 00:36:28,221 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head' 2024-04-25 00:36:28,680 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-04-25 00:36:28,680 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD 2024-04-25 00:36:28,685 [ scc.git] DEBUG Calling 'git fetch origin pull/536/head' 2024-04-25 00:36:29,612 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-04-25 00:36:29,613 [ scc.git] DEBUG * branch refs/pull/536/head -> FETCH_HEAD 2024-04-25 00:36:29,619 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head' 2024-04-25 00:36:30,225 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-04-25 00:36:30,226 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD 2024-04-25 00:36:30,231 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head' 2024-04-25 00:36:31,054 [ scc.git] DEBUG From https://github.com/ome/omero-web 2024-04-25 00:36:31,055 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD 2024-04-25 00:36:31,063 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:36:31,063 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:36:31,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:36:31,072 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...219d9e721304a4c46b4d73ef9ff3777549d69615' 2024-04-25 00:36:31,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:36:31,093 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 219d9e721304a4c46b4d73ef9ff3777549d69615' 2024-04-25 00:36:31,169 [ scc.git] DEBUG Auto-merging test/unit/test_web.py 2024-04-25 00:36:31,169 [ scc.git] DEBUG CONFLICT (content): Merge conflict in test/unit/test_web.py 2024-04-25 00:36:31,169 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-04-25 00:36:31,170 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-04-25 00:36:31,178 [ scc.git] DEBUG Calling 'git reset --hard e1b1355ebd4f9de8b855dd2c55f59d86c061a81b' 2024-04-25 00:36:31,192 [ scc.git] DEBUG HEAD is now at e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request 2024-04-25 00:36:31,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:36:31,358 [ scc.git] DEBUG Calling 'git merge-base e1b1355ebd4f9de8b855dd2c55f59d86c061a81b 219d9e721304a4c46b4d73ef9ff3777549d69615' 2024-04-25 00:36:31,375 [ scc.git] DEBUG Calling 'git diff --name-only 632d14a9cab5319c6b1bd9190d441a95e457103b..e1b1355ebd4f9de8b855dd2c55f59d86c061a81b' 2024-04-25 00:36:31,468 [ scc.git] INFO - PR 168 stick 'Changes to nginx @maintenance handler' Conflicting PR. Removed from build [OMERO-python-superbuild-push#42](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/42/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/42/consoleText) for more details. Possible conflicts: - Upstream changes - test/unit/test_web.py --conflicts 2024-04-25 00:36:31,473 [ scc.config] DEBUG Found github.token 2024-04-25 00:36:31,473 [ scc.git] DEBUG Not adding comment to issue #168, already --conflicts. 2024-04-25 00:36:31,474 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767' 2024-04-25 00:36:31,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:36:31,487 [ 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-04-25 00:36:31,526 [ scc.git] DEBUG Auto-merging omeroweb/settings.py 2024-04-25 00:36:31,526 [ scc.git] DEBUG Auto-merging setup.py 2024-04-25 00:36:31,527 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:36:31,531 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++- 2024-04-25 00:36:31,531 [ scc.git] DEBUG setup.py | 1 + 2024-04-25 00:36:31,531 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-) 2024-04-25 00:36:31,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:36:31,773 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e335980be1e7197826687f6c322a60c61b4aa545' 2024-04-25 00:36:31,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:36:31,785 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) e335980be1e7197826687f6c322a60c61b4aa545' 2024-04-25 00:36:31,802 [ scc.git] DEBUG Auto-merging README.rst 2024-04-25 00:36:31,804 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:36:31,807 [ scc.git] DEBUG README.rst | 3 +-- 2024-04-25 00:36:31,807 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 2 deletions(-) 2024-04-25 00:36:32,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:36:32,189 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005' 2024-04-25 00:36:32,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:36:32,202 [ 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-04-25 00:36:32,265 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py 2024-04-25 00:36:32,265 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py 2024-04-25 00:36:32,266 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:36:32,270 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +- 2024-04-25 00:36:32,270 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++-- 2024-04-25 00:36:32,270 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-) 2024-04-25 00:36:32,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:36:32,606 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...412fa66a52477fb77319a35147313a6f3cf481a2' 2024-04-25 00:36:32,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:36:32,619 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 536 (imgData JSON with no stateful services) 412fa66a52477fb77319a35147313a6f3cf481a2' 2024-04-25 00:36:32,732 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py 2024-04-25 00:36:32,733 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py 2024-04-25 00:36:32,734 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:36:32,740 [ scc.git] DEBUG omeroweb/webclient/views.py | 4 +- 2024-04-25 00:36:32,741 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 135 ++++++++++++++++++++++++++++++++++++++--- 2024-04-25 00:36:32,741 [ scc.git] DEBUG omeroweb/webgateway/util.py | 38 ++++++++++++ 2024-04-25 00:36:32,741 [ scc.git] DEBUG 3 files changed, 166 insertions(+), 11 deletions(-) 2024-04-25 00:36:33,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:36:33,019 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2' 2024-04-25 00:36:33,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:36:33,032 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2' 2024-04-25 00:36:33,161 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py 2024-04-25 00:36:33,163 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:36:33,173 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++------- 2024-04-25 00:36:33,173 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++---- 2024-04-25 00:36:33,173 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++ 2024-04-25 00:36:33,173 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++--- 2024-04-25 00:36:33,173 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++----- 2024-04-25 00:36:33,173 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +- 2024-04-25 00:36:33,173 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++-- 2024-04-25 00:36:33,173 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-) 2024-04-25 00:36:33,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:36:33,424 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4' 2024-04-25 00:36:33,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:36:33,438 [ 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-04-25 00:36:33,550 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html 2024-04-25 00:36:33,551 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:36:33,557 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++ 2024-04-25 00:36:33,557 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++----- 2024-04-25 00:36:33,557 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++--- 2024-04-25 00:36:33,557 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 + 2024-04-25 00:36:33,557 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +- 2024-04-25 00:36:33,557 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +- 2024-04-25 00:36:33,557 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 --------------------- 2024-04-25 00:36:33,557 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 - 2024-04-25 00:36:33,557 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++-- 2024-04-25 00:36:33,557 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-) 2024-04-25 00:36:33,558 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js 2024-04-25 00:36:33,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:36:33,838 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:36:33,879 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:36:33,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:36:33,885 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:36:33,932 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:36:33,944 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda6f6f2910> has no local changes 2024-04-25 00:36:33,945 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-web Excluded PRs: - 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 536 will-moore 'imgData JSON with no stateful services' - 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/42/)' 2024-04-25 00:36:33,961 [ scc.git] DEBUG [detached HEAD 12519e402] merge master -Dorg -Ssuccess-only 2024-04-25 00:36:33,961 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:36:33,962 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:36:34,013 [ scc.config] DEBUG Found submodule.omero-dropbox.url 2024-04-25 00:36:34,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:36:34,254 [ scc.config] DEBUG Found submodule.omero-marshal.url 2024-04-25 00:36:34,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:36:34,674 [ scc.config] DEBUG Found submodule.omero-py.url 2024-04-25 00:36:35,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:36:35,112 [ scc.config] DEBUG Found submodule.omero-scripts.url 2024-04-25 00:36:35,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:36:35,528 [ scc.config] DEBUG Found submodule.omero-web.url 2024-04-25 00:36:35,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:36:35,922 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:36:35,956 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda70839e80> has local changes 2024-04-25 00:36:35,957 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-python-superbuild Already up to date. Merged PRs: - PR 274 dependabot[bot] 'Bump omero-py from `d76e17a` to `3eb47d1`' - PR 275 dependabot[bot] 'Bump omero-scripts from `2078ac7` to `5a90893`' - PR 276 dependabot[bot] 'Bump omero-web from `0e4013c` to `e1b1355`' 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 3eb47d17..52d9a6f4 Previously merged: - PR 400 jburel 'Session ID and constructor' - PR 405 will-moore 'FilesetWrapper lazy loads Images and UsedFiles' - PR 394 jo-mueller 'added `_repr_html_` method for `_ImageWrapper`' - PR 398 will-moore 'getGridSize() handles plates with no Wells' - PR 406 jburel 'update the build steps' 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' 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 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 536 will-moore 'imgData JSON with no stateful services' - 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/42/)' 2024-04-25 00:36:35,968 [ scc.git] DEBUG [detached HEAD e3ee53c] merge master -Dorg -Ssuccess-only 2024-04-25 00:36:35,969 [ scc.merge] INFO Repository: ome/omero-python-superbuild 2024-04-25 00:36:35,969 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-) 2024-04-25 00:36:35,969 [ scc.merge] INFO Already up to date. 2024-04-25 00:36:35,969 [ scc.merge] INFO 2024-04-25 00:36:35,969 [ scc.merge] INFO Merged PRs: 2024-04-25 00:36:35,969 [ scc.merge] INFO - PR 274 dependabot[bot] 'Bump omero-py from `d76e17a` to `3eb47d1`' 2024-04-25 00:36:35,969 [ scc.merge] INFO - PR 275 dependabot[bot] 'Bump omero-scripts from `2078ac7` to `5a90893`' 2024-04-25 00:36:35,969 [ scc.merge] INFO - PR 276 dependabot[bot] 'Bump omero-web from `0e4013c` to `e1b1355`' 2024-04-25 00:36:35,969 [ scc.merge] INFO 2024-04-25 00:36:35,969 [ scc.merge] INFO Repository: ome/omero-dropbox 2024-04-25 00:36:35,969 [ scc.merge] INFO Already up to date. 2024-04-25 00:36:35,969 [ scc.merge] INFO 2024-04-25 00:36:35,969 [ scc.merge] INFO Merged PRs: 2024-04-25 00:36:35,969 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist' 2024-04-25 00:36:35,969 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code' 2024-04-25 00:36:35,969 [ scc.merge] INFO 2024-04-25 00:36:35,969 [ scc.merge] INFO Repository: ome/omero-marshal 2024-04-25 00:36:35,969 [ scc.merge] INFO Excluded PRs: 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment) 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment) 2024-04-25 00:36:35,970 [ scc.merge] INFO Already up to date. 2024-04-25 00:36:35,970 [ scc.merge] INFO 2024-04-25 00:36:35,970 [ scc.merge] INFO Merged PRs: 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None' 2024-04-25 00:36:35,970 [ scc.merge] INFO 2024-04-25 00:36:35,970 [ scc.merge] INFO Repository: ome/omero-py 2024-04-25 00:36:35,970 [ scc.merge] INFO Excluded PRs: 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure) 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude) 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu) 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn) 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft) 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment) 2024-04-25 00:36:35,970 [ scc.merge] INFO Updating 3eb47d17..52d9a6f4 2024-04-25 00:36:35,970 [ scc.merge] INFO Previously merged: 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 400 jburel 'Session ID and constructor' 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 405 will-moore 'FilesetWrapper lazy loads Images and UsedFiles' 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 394 jo-mueller 'added `_repr_html_` method for `_ImageWrapper`' 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 398 will-moore 'getGridSize() handles plates with no Wells' 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 406 jburel 'update the build steps' 2024-04-25 00:36:35,970 [ scc.merge] INFO 2024-04-25 00:36:35,970 [ scc.merge] INFO Merged PRs: 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group' 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error' 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins' 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj' 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 332 jburel 'Build conda' 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs' 2024-04-25 00:36:35,970 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command' 2024-04-25 00:36:35,971 [ scc.merge] INFO 2024-04-25 00:36:35,971 [ scc.merge] INFO Repository: ome/omero-scripts 2024-04-25 00:36:35,971 [ scc.merge] INFO Excluded PRs: 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT) 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier) 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn) 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment) 2024-04-25 00:36:35,971 [ scc.merge] INFO Already up to date. 2024-04-25 00:36:35,971 [ scc.merge] INFO 2024-04-25 00:36:35,971 [ scc.merge] INFO Conflicting PRs (not included): 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-04-25 00:36:35,971 [ scc.merge] INFO 2024-04-25 00:36:35,971 [ scc.merge] INFO Repository: ome/omero-web 2024-04-25 00:36:35,971 [ scc.merge] INFO Excluded PRs: 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache' (status: failure) 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft) 2024-04-25 00:36:35,971 [ scc.merge] INFO Already up to date. 2024-04-25 00:36:35,971 [ scc.merge] INFO 2024-04-25 00:36:35,971 [ scc.merge] INFO Merged PRs: 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test' 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel' 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly' 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 536 will-moore 'imgData JSON with no stateful services' 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display' 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks' 2024-04-25 00:36:35,971 [ scc.merge] INFO 2024-04-25 00:36:35,971 [ scc.merge] INFO Conflicting PRs (not included): 2024-04-25 00:36:35,971 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' 2024-04-25 00:36:35,971 [ scc.merge] INFO 2024-04-25 00:36:35,972 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-25 00:36:35,972 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:36:35,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox 2024-04-25 00:36:35,978 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:36:35,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:36:35,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal 2024-04-25 00:36:35,984 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:36:35,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:36:35,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py 2024-04-25 00:36:35,989 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:36:35,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:36:35,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts 2024-04-25 00:36:35,994 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:36:35,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push 2024-04-25 00:36:35,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web 2024-04-25 00:36:35,999 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:36:36,004 [ 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 3eb47d17 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 2524209 nothing to commit, working tree clean 2024-04-25 00:37:06,956 [ 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