Started by upstream project "Trigger" build number 134 originally caused by: Started by timer [Pipeline] Start of Pipeline [Pipeline] node Running on testintegration in /home/omero/workspace/OMERO-plugins-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-plugins-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Fetching without tags Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git > git --version # timeout=10 > git --version # 'git version 2.39.2' > git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master) > git config core.sparsecheckout # timeout=10 > git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 Commit message: "Merge pull request #17 from jburel/python3" > git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 [Pipeline] checkout The recommended git tool is: NONE No credentials specified Fetching changes from the remote Git repository Checking out Revision 3ae760e47042efe970407286ec1c6f5fd98f0bc3 (refs/remotes/origin/master) > git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-plugins-push/.git # timeout=10 > git config remote.origin.url https://github.com/ome/omero-plugins.git # timeout=10 Fetching upstream changes from https://github.com/ome/omero-plugins.git > git --version # timeout=10 > git --version # 'git version 2.39.3' > git fetch --tags --force --progress -- https://github.com/ome/omero-plugins.git +refs/heads/*:refs/remotes/origin/* # timeout=10 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f 3ae760e47042efe970407286ec1c6f5fd98f0bc3 # timeout=10 Commit message: "Merge pull request #380 from ome/dependabot/submodules/omero-figure-6456608" > git rev-list --no-walk 3ae760e47042efe970407286ec1c6f5fd98f0bc3 # 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-figure.url # timeout=10 > git config -f .gitmodules --get submodule.omero-figure.path # timeout=10 > git config --get submodule.minimal-omero-client.url # timeout=10 > git config -f .gitmodules --get submodule.minimal-omero-client.path # timeout=10 > git config --get submodule.scripts.url # timeout=10 > git config -f .gitmodules --get submodule.scripts.path # timeout=10 > git config --get submodule.omero-test-infra.url # timeout=10 > git config -f .gitmodules --get submodule.omero-test-infra.path # timeout=10 > git config --get submodule.omero-prometheus-tools.url # timeout=10 > git config -f .gitmodules --get submodule.omero-prometheus-tools.path # timeout=10 > git config --get submodule.omero-parade.url # timeout=10 > git config -f .gitmodules --get submodule.omero-parade.path # timeout=10 > git config --get submodule.omero-mapr.url # timeout=10 > git config -f .gitmodules --get submodule.omero-mapr.path # timeout=10 > git config --get submodule.omero-fpbioimage.url # timeout=10 > git config -f .gitmodules --get submodule.omero-fpbioimage.path # timeout=10 > git config --get submodule.omero-iviewer.url # timeout=10 > git config -f .gitmodules --get submodule.omero-iviewer.path # timeout=10 > git config --get submodule.omero-gallery.url # timeout=10 > git config -f .gitmodules --get submodule.omero-gallery.path # timeout=10 > git config --get submodule.rOMERO-gateway.url # timeout=10 > git config -f .gitmodules --get submodule.rOMERO-gateway.path # timeout=10 > git config --get submodule.omero-weberror.url # timeout=10 > git config -f .gitmodules --get submodule.omero-weberror.path # timeout=10 > git config --get submodule.omero-cli-render.url # timeout=10 > git config -f .gitmodules --get submodule.omero-cli-render.path # timeout=10 > git config --get submodule.omero-cli-duplicate.url # timeout=10 > git config -f .gitmodules --get submodule.omero-cli-duplicate.path # timeout=10 > git config --get submodule.omero-metadata.url # timeout=10 > git config -f .gitmodules --get submodule.omero-metadata.path # timeout=10 > git config --get submodule.omero-webtest.url # timeout=10 > git config -f .gitmodules --get submodule.omero-webtest.path # timeout=10 > git config --get submodule.omero-upload.url # timeout=10 > git config -f .gitmodules --get submodule.omero-upload.path # timeout=10 > git config --get submodule.omero-virtual-microscope.url # timeout=10 > git config -f .gitmodules --get submodule.omero-virtual-microscope.path # timeout=10 > git config --get submodule.omero-rois.url # timeout=10 > git config -f .gitmodules --get submodule.omero-rois.path # timeout=10 > git config --get submodule.omero-signup.url # timeout=10 > git config -f .gitmodules --get submodule.omero-signup.path # timeout=10 > git config --get submodule.omero-web-zarr.url # timeout=10 > git config -f .gitmodules --get submodule.omero-web-zarr.path # timeout=10 > git config --get submodule.omero-cli-zarr.url # timeout=10 > git config -f .gitmodules --get submodule.omero-cli-zarr.path # timeout=10 > git submodule update --init --recursive omero-figure # timeout=10 > git submodule update --init --recursive minimal-omero-client # timeout=10 > git submodule update --init --recursive scripts # timeout=10 > git submodule update --init --recursive omero-test-infra # timeout=10 > git submodule update --init --recursive omero-prometheus-tools # timeout=10 > git submodule update --init --recursive omero-parade # timeout=10 > git submodule update --init --recursive omero-mapr # timeout=10 > git submodule update --init --recursive omero-fpbioimage # timeout=10 > git submodule update --init --recursive omero-iviewer # timeout=10 > git submodule update --init --recursive omero-gallery # timeout=10 > git submodule update --init --recursive rOMERO-gateway # timeout=10 > git submodule update --init --recursive omero-weberror # timeout=10 > git submodule update --init --recursive omero-cli-render # timeout=10 > git submodule update --init --recursive omero-cli-duplicate # timeout=10 [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-build-push" build number 116 [Pipeline] sh + pushd build ~/workspace/OMERO-plugins-push/build ~/workspace/OMERO-plugins-push + curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz + tar -zxf - > git submodule update --init --recursive omero-metadata # timeout=10 > git submodule update --init --recursive omero-webtest # timeout=10 > git submodule update --init --recursive omero-upload # timeout=10 > git submodule update --init --recursive omero-virtual-microscope # timeout=10 > git submodule update --init --recursive omero-rois # timeout=10 > git submodule update --init --recursive omero-signup # timeout=10 > git submodule update --init --recursive omero-web-zarr # timeout=10 > git submodule update --init --recursive omero-cli-zarr # timeout=10 + popd ~/workspace/OMERO-plugins-push + python3 -m venv build/venv + . build/venv/bin/activate ++ deactivate nondestructive ++ '[' -n '' ']' ++ '[' -n '' ']' ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r ++ '[' -n '' ']' ++ unset VIRTUAL_ENV ++ '[' '!' nondestructive = nondestructive ']' ++ VIRTUAL_ENV=/home/omero/workspace/OMERO-plugins-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-plugins-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.1.2-py3-none-any.whl (1.8 MB) Installing collected packages: pip Attempting uninstall: pip Found existing installation: pip 21.2.3 Uninstalling pip-21.2.3: Successfully uninstalled pip-21.2.3 Successfully installed pip-24.1.2 + python3 -m pip install scc Collecting scc Using cached scc-0.20.0-py3-none-any.whl.metadata (3.6 kB) Collecting PyGithub>=1.54 (from scc) Using cached PyGithub-2.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.19-py2.py3-none-any.whl.metadata (49 kB) Collecting yaclifw<0.3,>=0.2.0 (from scc) Using cached yaclifw-0.2.0-py3-none-any.whl Collecting pynacl>=1.4.0 (from PyGithub>=1.54->scc) Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl.metadata (8.6 kB) Collecting requests>=2.14.0 (from PyGithub>=1.54->scc) Using cached requests-2.32.3-py3-none-any.whl.metadata (4.6 kB) Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached PyJWT-2.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.12.2-py3-none-any.whl.metadata (3.0 kB) Collecting Deprecated (from PyGithub>=1.54->scc) Using cached Deprecated-1.2.14-py2.py3-none-any.whl.metadata (5.4 kB) Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc) Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl.metadata (2.2 kB) Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached cryptography-42.0.8-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.7.4-py3-none-any.whl.metadata (2.2 kB) Collecting wrapt<2,>=1.10 (from Deprecated->PyGithub>=1.54->scc) Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (6.6 kB) Collecting pycparser (from cffi>=1.4.1->pynacl>=1.4.0->PyGithub>=1.54->scc) Using cached pycparser-2.22-py3-none-any.whl.metadata (943 bytes) Using cached scc-0.20.0-py3-none-any.whl (48 kB) Using cached PyGithub-2.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.19-py2.py3-none-any.whl (143 kB) Using cached future-1.0.0-py3-none-any.whl (491 kB) Using cached ruamel.yaml-0.18.6-py3-none-any.whl (117 kB) Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB) Using cached six-1.16.0-py2.py3-none-any.whl (11 kB) Using cached PyJWT-2.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.32.3-py3-none-any.whl (64 kB) Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl (562 kB) Using cached typing_extensions-4.12.2-py3-none-any.whl (37 kB) Using cached Deprecated-1.2.14-py2.py3-none-any.whl (9.6 kB) Using cached certifi-2024.7.4-py3-none-any.whl (162 kB) Using cached cffi-1.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.8-cp39-abi3-manylinux_2_28_x86_64.whl (3.9 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.7.4 cffi-1.16.0 charset-normalizer-3.3.2 cryptography-42.0.8 future-1.0.0 idna-3.7 pycparser-2.22 pyjwt-2.8.0 pynacl-1.5.0 requests-2.32.3 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.8 ruamel.yaml.jinja2-0.2.7 scc-0.20.0 six-1.16.0 typing-extensions-4.12.2 urllib3-1.26.19 wrapt-1.16.0 yaclifw-0.2.0 [Pipeline] sh + export BASE_REPO=omero-plugins.git + BASE_REPO=omero-plugins.git + export BASE_BRANCH=master + BASE_BRANCH=master + export VERSION_LOG=/home/omero/workspace/OMERO-plugins-push/build/version.tsv + VERSION_LOG=/home/omero/workspace/OMERO-plugins-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-plugins-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-plugins-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-07-11 00:45:05,615 [ scc.config] DEBUG Found github.token 2024-07-11 00:45:05,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-07-11 00:45:05,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:45:06,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:45:06,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-07-11 00:45:06,712 [ scc.gh] DEBUG 4874 remaining from 5000 (Reset at 01:07 2024-07-11 00:45:06,713 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:06,718 [ scc.git] DEBUG Check current status 2024-07-11 00:45:06,718 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:06,722 [ scc.git] DEBUG 3ae760e Merge pull request #380 from ome/dependabot/submodules/omero-figure-6456608 2024-07-11 00:45:06,723 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:06,773 [ scc.git] DEBUG 4628e82a32d8af458d9fa621303b24a0a860378f minimal-omero-client (remotes/origin/HEAD) 2024-07-11 00:45:06,776 [ scc.git] DEBUG 027b3e695d5b225955918c53ef8c81e0d5bc6bf4 omero-cli-duplicate (v0.4.0-12-g027b3e6) 2024-07-11 00:45:06,779 [ scc.git] DEBUG 53e3f420999e2cc5992711f49baa3779cf2c4d3a omero-cli-render (v0.8.0-9-g53e3f42) 2024-07-11 00:45:06,783 [ scc.git] DEBUG 9b73dd9dbdeb36dbdb675b02661d253052fca0f0 omero-cli-zarr (v0.5.5-7-g9b73dd9) 2024-07-11 00:45:07,870 [ scc.git] DEBUG 64566080f813fb5d70a77c3cd1a141bf30eaddba omero-figure (v7.0.0-7-g64566080) 2024-07-11 00:45:07,874 [ scc.git] DEBUG e5b3ca3a5aba41c950d2427b1a05ee0ced55670e omero-fpbioimage (v0.4.1-1-ge5b3ca3) 2024-07-11 00:45:07,877 [ scc.git] DEBUG 56f443528edd3b7127635933cb573b528b57acda omero-gallery (v3.4.3-1-g56f4435) 2024-07-11 00:45:07,894 [ scc.git] DEBUG a8f380fabfd839b946e5a5f613f1fce07abb3815 omero-iviewer (v0.14.0-3-ga8f380f) 2024-07-11 00:45:07,897 [ scc.git] DEBUG 9631b155c44fcec9986b03315dd9f5c5c64aa7eb omero-mapr (v0.5.2-7-g9631b15) 2024-07-11 00:45:07,901 [ scc.git] DEBUG e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c omero-metadata (v0.12.0-15-ge2fc5ec) 2024-07-11 00:45:07,904 [ scc.git] DEBUG 5d441c250912a98d8a87771f78dde8b54c8e12d6 omero-parade (v0.2.4-1-g5d441c2) 2024-07-11 00:45:07,907 [ scc.git] DEBUG 18bccb69f16cfeee98628ff2ae14ab829b87a23c omero-prometheus-tools (v0.2.3-4-g18bccb6) 2024-07-11 00:45:07,911 [ scc.git] DEBUG 5c752d5c25fee07c1835036d6a90bd97faeb0720 omero-rois (v0.2.0-63-g5c752d5) 2024-07-11 00:45:07,914 [ scc.git] DEBUG c8610dba25f39870a09fa5401c735fb3be85a319 omero-signup (v0.3.3-1-gc8610db) 2024-07-11 00:45:07,929 [ scc.git] DEBUG cda3ec65052d6933052c8683d080677c6c33dc73 omero-test-infra (v0.6.3-60-gcda3ec6) 2024-07-11 00:45:07,935 [ scc.git] DEBUG aca9e9cad82a08e2e3d37d71cb374b37c90e4693 omero-upload (v0.4.0-8-gaca9e9c) 2024-07-11 00:45:07,941 [ scc.git] DEBUG deab81790f403bef598915b89b5300258b44a743 omero-virtual-microscope (v1.1.1-5-gdeab817) 2024-07-11 00:45:07,946 [ scc.git] DEBUG 67bb245b8b08709e04a8bf52b02de2298a029a94 omero-web-zarr (v0.1.1-1-g67bb245) 2024-07-11 00:45:07,949 [ scc.git] DEBUG adfa132f23a1b12ca2d2ec53ebba54c760fe2d07 omero-weberror (v0.4.1-1-gadfa132) 2024-07-11 00:45:07,952 [ scc.git] DEBUG 8da48e116184f1ebb28aa9629748afdfb0282ae5 omero-webtest (v0.4.2-1-g8da48e1) 2024-07-11 00:45:07,955 [ scc.git] DEBUG 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 rOMERO-gateway (v0.4.11-14-g7b5d64d) 2024-07-11 00:45:07,959 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 scripts (v5.8.2-3-gc20d273) 2024-07-11 00:45:07,964 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:08,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-plugins HTTP/1.1" 200 None 2024-07-11 00:45:08,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:09,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:09,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:09,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:09,916 [ scc.git] DEBUG Resetting... 2024-07-11 00:45:09,916 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-07-11 00:45:09,927 [ scc.git] DEBUG HEAD is now at 3ae760e Merge pull request #380 from ome/dependabot/submodules/omero-figure-6456608 2024-07-11 00:45:09,927 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-07-11 00:45:10,033 [ scc.git] DEBUG Check current status 2024-07-11 00:45:10,033 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:10,038 [ scc.git] DEBUG 3ae760e Merge pull request #380 from ome/dependabot/submodules/omero-figure-6456608 2024-07-11 00:45:10,038 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:10,086 [ scc.git] DEBUG 4628e82a32d8af458d9fa621303b24a0a860378f minimal-omero-client (remotes/origin/HEAD) 2024-07-11 00:45:10,089 [ scc.git] DEBUG 027b3e695d5b225955918c53ef8c81e0d5bc6bf4 omero-cli-duplicate (v0.4.0-12-g027b3e6) 2024-07-11 00:45:10,091 [ scc.git] DEBUG 53e3f420999e2cc5992711f49baa3779cf2c4d3a omero-cli-render (v0.8.0-9-g53e3f42) 2024-07-11 00:45:10,094 [ scc.git] DEBUG 9b73dd9dbdeb36dbdb675b02661d253052fca0f0 omero-cli-zarr (v0.5.5-7-g9b73dd9) 2024-07-11 00:45:10,102 [ scc.git] DEBUG 64566080f813fb5d70a77c3cd1a141bf30eaddba omero-figure (v7.0.0-7-g64566080) 2024-07-11 00:45:10,105 [ scc.git] DEBUG e5b3ca3a5aba41c950d2427b1a05ee0ced55670e omero-fpbioimage (v0.4.1-1-ge5b3ca3) 2024-07-11 00:45:10,107 [ scc.git] DEBUG 56f443528edd3b7127635933cb573b528b57acda omero-gallery (v3.4.3-1-g56f4435) 2024-07-11 00:45:10,110 [ scc.git] DEBUG a8f380fabfd839b946e5a5f613f1fce07abb3815 omero-iviewer (v0.14.0-3-ga8f380f) 2024-07-11 00:45:10,113 [ scc.git] DEBUG 9631b155c44fcec9986b03315dd9f5c5c64aa7eb omero-mapr (v0.5.2-7-g9631b15) 2024-07-11 00:45:10,116 [ scc.git] DEBUG e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c omero-metadata (v0.12.0-15-ge2fc5ec) 2024-07-11 00:45:10,119 [ scc.git] DEBUG 5d441c250912a98d8a87771f78dde8b54c8e12d6 omero-parade (v0.2.4-1-g5d441c2) 2024-07-11 00:45:10,122 [ scc.git] DEBUG 18bccb69f16cfeee98628ff2ae14ab829b87a23c omero-prometheus-tools (v0.2.3-4-g18bccb6) 2024-07-11 00:45:10,130 [ scc.git] DEBUG 5c752d5c25fee07c1835036d6a90bd97faeb0720 omero-rois (v0.2.0-63-g5c752d5) 2024-07-11 00:45:10,133 [ scc.git] DEBUG c8610dba25f39870a09fa5401c735fb3be85a319 omero-signup (v0.3.3-1-gc8610db) 2024-07-11 00:45:10,136 [ scc.git] DEBUG cda3ec65052d6933052c8683d080677c6c33dc73 omero-test-infra (v0.6.3-60-gcda3ec6) 2024-07-11 00:45:10,140 [ scc.git] DEBUG aca9e9cad82a08e2e3d37d71cb374b37c90e4693 omero-upload (v0.4.0-8-gaca9e9c) 2024-07-11 00:45:10,142 [ scc.git] DEBUG deab81790f403bef598915b89b5300258b44a743 omero-virtual-microscope (v1.1.1-5-gdeab817) 2024-07-11 00:45:10,145 [ scc.git] DEBUG 67bb245b8b08709e04a8bf52b02de2298a029a94 omero-web-zarr (v0.1.1-1-g67bb245) 2024-07-11 00:45:10,148 [ scc.git] DEBUG adfa132f23a1b12ca2d2ec53ebba54c760fe2d07 omero-weberror (v0.4.1-1-gadfa132) 2024-07-11 00:45:10,151 [ scc.git] DEBUG 8da48e116184f1ebb28aa9629748afdfb0282ae5 omero-webtest (v0.4.2-1-g8da48e1) 2024-07-11 00:45:10,154 [ scc.git] DEBUG 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 rOMERO-gateway (v0.4.11-14-g7b5d64d) 2024-07-11 00:45:10,157 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 scripts (v5.8.2-3-gc20d273) 2024-07-11 00:45:10,158 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-07-11 00:45:10,158 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-07-11 00:45:10,159 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-07-11 00:45:10,159 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-07-11 00:45:10,159 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-07-11 00:45:10,159 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:45:10,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-plugins/pulls HTTP/1.1" 200 2 2024-07-11 00:45:10,350 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:45:10,350 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:45:10,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:45:10,355 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:45:10,359 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:45:10,360 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:45:10,364 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:45:10,369 [ scc.git] DEBUG Already up to date. 2024-07-11 00:45:10,369 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:45:10,369 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:45:10,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:45:10,373 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:45:10,431 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:45:10,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:45:10,437 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:45:11,372 [ scc.git] DEBUG has no local changes 2024-07-11 00:45:11,372 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone Repository: ome/omero-plugins Already up to date. Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:45:11,454 [ scc.git] DEBUG [detached HEAD 76e4cf5] merge master -Dorg -Snone 2024-07-11 00:45:11,455 [ scc.merge] INFO Repository: ome/omero-plugins 2024-07-11 00:45:11,455 [ scc.merge] INFO Already up to date. 2024-07-11 00:45:11,455 [ scc.merge] INFO 2024-07-11 00:45:11,455 [ scc.merge] INFO 2024-07-11 00:45:11,455 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-07-11 00:45:11,455 [ scc.git] DEBUG Calling 'git remote' Synchronizing submodule url for 'minimal-omero-client' Synchronizing submodule url for 'omero-cli-duplicate' Synchronizing submodule url for 'omero-cli-render' Synchronizing submodule url for 'omero-cli-zarr' Synchronizing submodule url for 'omero-figure' Synchronizing submodule url for 'omero-fpbioimage' Synchronizing submodule url for 'omero-gallery' Synchronizing submodule url for 'omero-iviewer' Synchronizing submodule url for 'omero-mapr' Synchronizing submodule url for 'omero-metadata' Synchronizing submodule url for 'omero-parade' Synchronizing submodule url for 'omero-prometheus-tools' Synchronizing submodule url for 'omero-rois' Synchronizing submodule url for 'omero-signup' Synchronizing submodule url for 'omero-test-infra' Synchronizing submodule url for 'omero-upload' Synchronizing submodule url for 'omero-virtual-microscope' Synchronizing submodule url for 'omero-web-zarr' Synchronizing submodule url for 'omero-weberror' Synchronizing submodule url for 'omero-webtest' Synchronizing submodule url for 'rOMERO-gateway' Synchronizing submodule url for 'scripts' Merge all submodules using repository configuration: base-branch: master submodules: scripts: base-branch: develop omero-web-zarr: base-branch: main 2024-07-11 00:45:20,969 [ scc.config] DEBUG Found github.token 2024-07-11 00:45:20,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-07-11 00:45:21,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:45:21,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:45:22,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-07-11 00:45:22,229 [ scc.gh] DEBUG 4866 remaining from 5000 (Reset at 01:07 2024-07-11 00:45:22,230 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:22,234 [ scc.git] DEBUG Check current status 2024-07-11 00:45:22,234 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:22,238 [ scc.git] DEBUG 76e4cf5 merge master -Dorg -Snone 2024-07-11 00:45:22,238 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:22,285 [ scc.git] DEBUG 4628e82a32d8af458d9fa621303b24a0a860378f minimal-omero-client (remotes/origin/HEAD) 2024-07-11 00:45:22,287 [ scc.git] DEBUG 027b3e695d5b225955918c53ef8c81e0d5bc6bf4 omero-cli-duplicate (v0.4.0-12-g027b3e6) 2024-07-11 00:45:22,290 [ scc.git] DEBUG 53e3f420999e2cc5992711f49baa3779cf2c4d3a omero-cli-render (v0.8.0-9-g53e3f42) 2024-07-11 00:45:22,293 [ scc.git] DEBUG 9b73dd9dbdeb36dbdb675b02661d253052fca0f0 omero-cli-zarr (v0.5.5-7-g9b73dd9) 2024-07-11 00:45:22,301 [ scc.git] DEBUG 64566080f813fb5d70a77c3cd1a141bf30eaddba omero-figure (v7.0.0-7-g64566080) 2024-07-11 00:45:22,304 [ scc.git] DEBUG e5b3ca3a5aba41c950d2427b1a05ee0ced55670e omero-fpbioimage (v0.4.1-1-ge5b3ca3) 2024-07-11 00:45:22,307 [ scc.git] DEBUG 56f443528edd3b7127635933cb573b528b57acda omero-gallery (v3.4.3-1-g56f4435) 2024-07-11 00:45:22,311 [ scc.git] DEBUG a8f380fabfd839b946e5a5f613f1fce07abb3815 omero-iviewer (v0.14.0-3-ga8f380f) 2024-07-11 00:45:22,314 [ scc.git] DEBUG 9631b155c44fcec9986b03315dd9f5c5c64aa7eb omero-mapr (v0.5.2-7-g9631b15) 2024-07-11 00:45:22,317 [ scc.git] DEBUG e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c omero-metadata (v0.12.0-15-ge2fc5ec) 2024-07-11 00:45:22,319 [ scc.git] DEBUG 5d441c250912a98d8a87771f78dde8b54c8e12d6 omero-parade (v0.2.4-1-g5d441c2) 2024-07-11 00:45:22,322 [ scc.git] DEBUG 18bccb69f16cfeee98628ff2ae14ab829b87a23c omero-prometheus-tools (v0.2.3-4-g18bccb6) 2024-07-11 00:45:22,326 [ scc.git] DEBUG 5c752d5c25fee07c1835036d6a90bd97faeb0720 omero-rois (v0.2.0-63-g5c752d5) 2024-07-11 00:45:22,329 [ scc.git] DEBUG c8610dba25f39870a09fa5401c735fb3be85a319 omero-signup (v0.3.3-1-gc8610db) 2024-07-11 00:45:22,332 [ scc.git] DEBUG cda3ec65052d6933052c8683d080677c6c33dc73 omero-test-infra (v0.6.3-60-gcda3ec6) 2024-07-11 00:45:22,335 [ scc.git] DEBUG aca9e9cad82a08e2e3d37d71cb374b37c90e4693 omero-upload (v0.4.0-8-gaca9e9c) 2024-07-11 00:45:22,338 [ scc.git] DEBUG deab81790f403bef598915b89b5300258b44a743 omero-virtual-microscope (v1.1.1-5-gdeab817) 2024-07-11 00:45:22,340 [ scc.git] DEBUG 67bb245b8b08709e04a8bf52b02de2298a029a94 omero-web-zarr (v0.1.1-1-g67bb245) 2024-07-11 00:45:22,343 [ scc.git] DEBUG adfa132f23a1b12ca2d2ec53ebba54c760fe2d07 omero-weberror (v0.4.1-1-gadfa132) 2024-07-11 00:45:22,346 [ scc.git] DEBUG 8da48e116184f1ebb28aa9629748afdfb0282ae5 omero-webtest (v0.4.2-1-g8da48e1) 2024-07-11 00:45:22,348 [ scc.git] DEBUG 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 rOMERO-gateway (v0.4.11-14-g7b5d64d) 2024-07-11 00:45:22,352 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 scripts (v5.8.2-3-gc20d273) 2024-07-11 00:45:22,357 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:22,357 [ scc.git] DEBUG Reading repository configuration from repositories.yml 2024-07-11 00:45:22,359 [ scc.git] DEBUG Repository configuration: base-branch: master submodules: omero-web-zarr: base-branch: main scripts: base-branch: develop 2024-07-11 00:45:22,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-plugins HTTP/1.1" 200 None 2024-07-11 00:45:23,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:23,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:24,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:24,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:24,732 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:24,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client 2024-07-11 00:45:24,803 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:24,807 [ scc.git] DEBUG Check current status 2024-07-11 00:45:24,807 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:24,811 [ scc.git] DEBUG 4628e82 Merge pull request #65 from jburel/gateway_5_9_1 2024-07-11 00:45:24,811 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:24,851 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:25,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/minimal-omero-client HTTP/1.1" 200 None 2024-07-11 00:45:25,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:26,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:26,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:27,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:27,091 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:27,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:27,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate 2024-07-11 00:45:27,133 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:27,136 [ scc.git] DEBUG Check current status 2024-07-11 00:45:27,136 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:27,140 [ scc.git] DEBUG 027b3e6 Merge pull request #24 from sbesson/future_pytest 2024-07-11 00:45:27,140 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:27,186 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:27,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-duplicate HTTP/1.1" 200 None 2024-07-11 00:45:28,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:28,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:28,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:29,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:29,321 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:29,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:29,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render 2024-07-11 00:45:29,361 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:29,364 [ scc.git] DEBUG Check current status 2024-07-11 00:45:29,365 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:29,368 [ scc.git] DEBUG 53e3f42 Merge pull request #61 from sbesson/pytest 2024-07-11 00:45:29,368 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:29,408 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:29,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render HTTP/1.1" 200 None 2024-07-11 00:45:30,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:30,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:31,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:31,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:31,590 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:31,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:31,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr 2024-07-11 00:45:31,629 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:31,634 [ scc.git] DEBUG Check current status 2024-07-11 00:45:31,634 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:31,638 [ scc.git] DEBUG 9b73dd9 Merge pull request #161 from ome/pre-commit-ci-update-config 2024-07-11 00:45:31,638 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:31,681 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:32,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr HTTP/1.1" 200 None 2024-07-11 00:45:32,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:32,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:33,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:33,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:33,799 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:33,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:33,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure 2024-07-11 00:45:33,841 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:33,846 [ scc.git] DEBUG Check current status 2024-07-11 00:45:33,847 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:33,860 [ scc.git] DEBUG 64566080 Merge pull request #574 from Tom-TBT/viterefresh 2024-07-11 00:45:33,861 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:33,904 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:34,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure HTTP/1.1" 200 None 2024-07-11 00:45:34,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:35,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:35,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:36,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:36,095 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:36,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:36,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage 2024-07-11 00:45:36,140 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:36,145 [ scc.git] DEBUG Check current status 2024-07-11 00:45:36,145 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:36,149 [ scc.git] DEBUG e5b3ca3 Bump version: 0.4.1 → 0.4.2.dev0 2024-07-11 00:45:36,149 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:36,192 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:36,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage HTTP/1.1" 200 None 2024-07-11 00:45:37,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:37,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:37,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:38,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:38,392 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:38,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:38,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery 2024-07-11 00:45:38,435 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:38,439 [ scc.git] DEBUG Check current status 2024-07-11 00:45:38,439 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:38,444 [ scc.git] DEBUG 56f4435 Bump version: 3.4.3 → 3.4.4.dev0 2024-07-11 00:45:38,444 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:38,489 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:38,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery HTTP/1.1" 200 None 2024-07-11 00:45:39,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:39,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:40,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:40,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:40,878 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:40,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:40,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer 2024-07-11 00:45:40,916 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:40,920 [ scc.git] DEBUG Check current status 2024-07-11 00:45:40,920 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:40,924 [ scc.git] DEBUG a8f380f Merge pull request #476 from ome/dependabot/npm_and_yarn/braces-3.0.3 2024-07-11 00:45:40,924 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:40,964 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:41,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer HTTP/1.1" 200 None 2024-07-11 00:45:41,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:42,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:42,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:43,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:43,289 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:43,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:43,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr 2024-07-11 00:45:43,336 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:43,340 [ scc.git] DEBUG Check current status 2024-07-11 00:45:43,341 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:43,346 [ scc.git] DEBUG 9631b15 Merge pull request #82 from JensWendt/master 2024-07-11 00:45:43,346 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:43,407 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:43,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr HTTP/1.1" 200 None 2024-07-11 00:45:44,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:44,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:45,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:45,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:45,736 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:45,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:45,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata 2024-07-11 00:45:45,787 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:45,792 [ scc.git] DEBUG Check current status 2024-07-11 00:45:45,793 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:45,801 [ scc.git] DEBUG e2fc5ec Merge pull request #85 from sbesson/pytest_logging 2024-07-11 00:45:45,801 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:45,862 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:46,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata HTTP/1.1" 200 None 2024-07-11 00:45:46,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:47,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:47,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:48,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:48,251 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:48,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:48,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade 2024-07-11 00:45:48,298 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:48,304 [ scc.git] DEBUG Check current status 2024-07-11 00:45:48,305 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:48,311 [ scc.git] DEBUG 5d441c2 Bump version: 0.2.4 → 0.2.5.dev0 2024-07-11 00:45:48,311 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:48,397 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:48,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade HTTP/1.1" 200 None 2024-07-11 00:45:49,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:49,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:50,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:50,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:50,614 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:50,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:50,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools 2024-07-11 00:45:50,660 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:50,664 [ scc.git] DEBUG Check current status 2024-07-11 00:45:50,664 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:50,669 [ scc.git] DEBUG 18bccb6 Update actions to v3 and v4 2024-07-11 00:45:50,669 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:50,718 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:51,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools HTTP/1.1" 200 None 2024-07-11 00:45:51,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:52,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:52,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:53,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:53,023 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:53,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:53,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois 2024-07-11 00:45:53,072 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:53,077 [ scc.git] DEBUG Check current status 2024-07-11 00:45:53,077 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:53,082 [ scc.git] DEBUG 5c752d5 Merge pull request #27 from ome/pre-commit-ci-update-config 2024-07-11 00:45:53,083 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:53,133 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:53,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois HTTP/1.1" 200 None 2024-07-11 00:45:54,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:54,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:54,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:55,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:55,313 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:55,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:55,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup 2024-07-11 00:45:55,354 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:55,359 [ scc.git] DEBUG Check current status 2024-07-11 00:45:55,359 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:55,364 [ scc.git] DEBUG c8610db Bump version: 0.3.3 → 0.3.4.dev0 2024-07-11 00:45:55,364 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:55,407 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:55,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup HTTP/1.1" 200 None 2024-07-11 00:45:56,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:56,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:45:57,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:45:57,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:45:57,686 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:45:57,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:45:57,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra 2024-07-11 00:45:57,731 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:45:57,736 [ scc.git] DEBUG Check current status 2024-07-11 00:45:57,737 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:45:57,741 [ scc.git] DEBUG cda3ec6 Merge pull request #70 from jburel/toml_support 2024-07-11 00:45:57,741 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:45:57,786 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:45:58,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/openmicroscopy/omero-test-infra HTTP/1.1" 301 198 Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919 2024-07-11 00:45:58,564 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919 2024-07-11 00:45:58,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/111908919 HTTP/1.1" 200 None 2024-07-11 00:45:59,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:45:59,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:46:00,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:46:00,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:46:00,727 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:46:00,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:46:00,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload 2024-07-11 00:46:00,799 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:46:00,805 [ scc.git] DEBUG Check current status 2024-07-11 00:46:00,805 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:46:00,811 [ scc.git] DEBUG aca9e9c Merge pull request #12 from sbesson/pytest 2024-07-11 00:46:00,811 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:46:00,863 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:46:01,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload HTTP/1.1" 200 None 2024-07-11 00:46:01,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:46:02,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:46:02,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:46:03,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:46:03,113 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:46:03,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:46:03,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope 2024-07-11 00:46:03,159 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:46:03,165 [ scc.git] DEBUG Check current status 2024-07-11 00:46:03,165 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:46:03,171 [ scc.git] DEBUG deab817 update setup-python to v4 2024-07-11 00:46:03,171 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:46:03,221 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:46:03,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope HTTP/1.1" 200 None 2024-07-11 00:46:04,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:46:04,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:46:05,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:46:05,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:46:05,435 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:46:05,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:46:05,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr 2024-07-11 00:46:05,476 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:46:05,481 [ scc.git] DEBUG Check current status 2024-07-11 00:46:05,481 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:46:05,486 [ scc.git] DEBUG 67bb245 Bump version: 0.1.1 → 0.1.2.dev0 2024-07-11 00:46:05,486 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:46:05,534 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:46:05,535 [ scc.git] DEBUG Repository configuration: base-branch: main 2024-07-11 00:46:05,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr HTTP/1.1" 200 None 2024-07-11 00:46:06,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:46:06,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:46:07,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:46:07,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:46:07,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:46:07,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:46:07,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror 2024-07-11 00:46:07,892 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:46:07,898 [ scc.git] DEBUG Check current status 2024-07-11 00:46:07,899 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:46:07,904 [ scc.git] DEBUG adfa132 Bump version: 0.4.1 → 0.4.2.dev0 2024-07-11 00:46:07,904 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:46:07,951 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:46:08,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/openmicroscopy/omero-weberror HTTP/1.1" 301 197 Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425 2024-07-11 00:46:08,330 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425 2024-07-11 00:46:08,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/38373425 HTTP/1.1" 200 None 2024-07-11 00:46:09,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:46:09,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:46:10,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:46:10,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:46:10,478 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:46:10,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:46:10,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest 2024-07-11 00:46:10,519 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:46:10,523 [ scc.git] DEBUG Check current status 2024-07-11 00:46:10,524 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:46:10,528 [ scc.git] DEBUG 8da48e1 Bump version: 0.4.2 → 0.4.3.dev0 2024-07-11 00:46:10,528 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:46:10,570 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:46:10,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/openmicroscopy/omero-webtest HTTP/1.1" 301 197 Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383 2024-07-11 00:46:10,938 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383 2024-07-11 00:46:11,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/25970383 HTTP/1.1" 200 None 2024-07-11 00:46:11,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:46:12,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:46:12,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:46:13,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:46:13,113 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:46:13,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:46:13,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway 2024-07-11 00:46:13,154 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:46:13,159 [ scc.git] DEBUG Check current status 2024-07-11 00:46:13,159 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:46:13,163 [ scc.git] DEBUG 7b5d64d Merge pull request #106 from dominikl/add_examples_2 2024-07-11 00:46:13,163 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:46:13,211 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:46:13,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway HTTP/1.1" 200 None 2024-07-11 00:46:14,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:46:14,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:46:15,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:46:15,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:46:15,497 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:46:15,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:46:15,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts 2024-07-11 00:46:15,543 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-07-11 00:46:15,550 [ scc.git] DEBUG Check current status 2024-07-11 00:46:15,550 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:46:15,567 [ scc.git] DEBUG c20d273 Merge pull request #221 from imcf/fix-typechecking 2024-07-11 00:46:15,567 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:46:15,621 [ scc.config] DEBUG Found remote.origin.url 2024-07-11 00:46:15,622 [ scc.git] DEBUG Repository configuration: base-branch: develop 2024-07-11 00:46:15,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/scripts HTTP/1.1" 301 196 Following Github server redirection from /repos/ome/scripts to /repositories/4865545 2024-07-11 00:46:15,993 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545 2024-07-11 00:46:16,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545 HTTP/1.1" 200 None 2024-07-11 00:46:16,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-07-11 00:46:17,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-07-11 00:46:17,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-07-11 00:46:18,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-07-11 00:46:18,055 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:46:18,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:46:18,097 [ scc.git] DEBUG Resetting... 2024-07-11 00:46:18,097 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-07-11 00:46:18,109 [ scc.git] DEBUG HEAD is now at 76e4cf5 merge master -Dorg -Snone 2024-07-11 00:46:18,109 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-07-11 00:46:18,212 [ scc.git] DEBUG Check current status 2024-07-11 00:46:18,213 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-07-11 00:46:18,219 [ scc.git] DEBUG 76e4cf5 merge master -Dorg -Snone 2024-07-11 00:46:18,220 [ scc.git] DEBUG Calling 'git submodule status' 2024-07-11 00:46:18,273 [ scc.git] DEBUG 4628e82a32d8af458d9fa621303b24a0a860378f minimal-omero-client (remotes/origin/HEAD) 2024-07-11 00:46:18,277 [ scc.git] DEBUG 027b3e695d5b225955918c53ef8c81e0d5bc6bf4 omero-cli-duplicate (v0.4.0-12-g027b3e6) 2024-07-11 00:46:18,280 [ scc.git] DEBUG 53e3f420999e2cc5992711f49baa3779cf2c4d3a omero-cli-render (v0.8.0-9-g53e3f42) 2024-07-11 00:46:18,283 [ scc.git] DEBUG 9b73dd9dbdeb36dbdb675b02661d253052fca0f0 omero-cli-zarr (v0.5.5-7-g9b73dd9) 2024-07-11 00:46:18,291 [ scc.git] DEBUG 64566080f813fb5d70a77c3cd1a141bf30eaddba omero-figure (v7.0.0-7-g64566080) 2024-07-11 00:46:18,295 [ scc.git] DEBUG e5b3ca3a5aba41c950d2427b1a05ee0ced55670e omero-fpbioimage (v0.4.1-1-ge5b3ca3) 2024-07-11 00:46:18,298 [ scc.git] DEBUG 56f443528edd3b7127635933cb573b528b57acda omero-gallery (v3.4.3-1-g56f4435) 2024-07-11 00:46:18,302 [ scc.git] DEBUG a8f380fabfd839b946e5a5f613f1fce07abb3815 omero-iviewer (v0.14.0-3-ga8f380f) 2024-07-11 00:46:18,305 [ scc.git] DEBUG 9631b155c44fcec9986b03315dd9f5c5c64aa7eb omero-mapr (v0.5.2-7-g9631b15) 2024-07-11 00:46:18,311 [ scc.git] DEBUG e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c omero-metadata (v0.12.0-15-ge2fc5ec) 2024-07-11 00:46:18,315 [ scc.git] DEBUG 5d441c250912a98d8a87771f78dde8b54c8e12d6 omero-parade (v0.2.4-1-g5d441c2) 2024-07-11 00:46:18,318 [ scc.git] DEBUG 18bccb69f16cfeee98628ff2ae14ab829b87a23c omero-prometheus-tools (v0.2.3-4-g18bccb6) 2024-07-11 00:46:18,322 [ scc.git] DEBUG 5c752d5c25fee07c1835036d6a90bd97faeb0720 omero-rois (v0.2.0-63-g5c752d5) 2024-07-11 00:46:18,325 [ scc.git] DEBUG c8610dba25f39870a09fa5401c735fb3be85a319 omero-signup (v0.3.3-1-gc8610db) 2024-07-11 00:46:18,329 [ scc.git] DEBUG cda3ec65052d6933052c8683d080677c6c33dc73 omero-test-infra (v0.6.3-60-gcda3ec6) 2024-07-11 00:46:18,332 [ scc.git] DEBUG aca9e9cad82a08e2e3d37d71cb374b37c90e4693 omero-upload (v0.4.0-8-gaca9e9c) 2024-07-11 00:46:18,335 [ scc.git] DEBUG deab81790f403bef598915b89b5300258b44a743 omero-virtual-microscope (v1.1.1-5-gdeab817) 2024-07-11 00:46:18,337 [ scc.git] DEBUG 67bb245b8b08709e04a8bf52b02de2298a029a94 omero-web-zarr (v0.1.1-1-g67bb245) 2024-07-11 00:46:18,340 [ scc.git] DEBUG adfa132f23a1b12ca2d2ec53ebba54c760fe2d07 omero-weberror (v0.4.1-1-gadfa132) 2024-07-11 00:46:18,344 [ scc.git] DEBUG 8da48e116184f1ebb28aa9629748afdfb0282ae5 omero-webtest (v0.4.2-1-g8da48e1) 2024-07-11 00:46:18,347 [ scc.git] DEBUG 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 rOMERO-gateway (v0.4.11-14-g7b5d64d) 2024-07-11 00:46:18,350 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 scripts (v5.8.2-3-gc20d273) 2024-07-11 00:46:18,352 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-07-11 00:46:18,352 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-07-11 00:46:18,352 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-07-11 00:46:18,352 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-07-11 00:46:18,352 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-07-11 00:46:18,352 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-07-11 00:46:18,352 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:46:18,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-plugins/pulls HTTP/1.1" 200 2 2024-07-11 00:46:18,595 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:46:18,595 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:18,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:18,602 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:46:18,607 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:46:18,608 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:46:18,614 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:46:18,621 [ scc.git] DEBUG Already up to date. 2024-07-11 00:46:18,621 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:46:18,621 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:18,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:18,627 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:46:18,687 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:18,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:18,694 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:46:19,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/minimal-omero-client/pulls HTTP/1.1" 200 2 2024-07-11 00:46:19,108 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:46:19,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client 2024-07-11 00:46:19,108 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:19,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:19,114 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:46:19,119 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:46:19,120 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:46:19,126 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:46:19,131 [ scc.git] DEBUG Already up to date. 2024-07-11 00:46:19,131 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:46:19,132 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:19,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:19,137 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:46:19,180 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:19,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:19,185 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:46:19,227 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:46:19,233 [ scc.git] DEBUG has no local changes 2024-07-11 00:46:19,234 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/minimal-omero-client Already up to date. Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:46:19,243 [ scc.git] DEBUG [detached HEAD 8e2f7fb] merge master -Dorg -Ssuccess-only 2024-07-11 00:46:19,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:46:19,244 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:46:19,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-duplicate/pulls HTTP/1.1" 200 None 2024-07-11 00:46:20,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-duplicate/issues/25 HTTP/1.1" 200 None 2024-07-11 00:46:20,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-duplicate/issues/25/comments HTTP/1.1" 200 None 2024-07-11 00:46:21,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-duplicate/commits/ba066707734718b3c2f034d21873d2fcecd9cd48 HTTP/1.1" 200 None 2024-07-11 00:46:21,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-duplicate/commits/ba066707734718b3c2f034d21873d2fcecd9cd48/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:46:22,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-duplicate/commits/ba066707734718b3c2f034d21873d2fcecd9cd48/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:46:22,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-duplicate/commits/ba066707734718b3c2f034d21873d2fcecd9cd48 HTTP/1.1" 200 None 2024-07-11 00:46:23,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-duplicate/statuses/ba066707734718b3c2f034d21873d2fcecd9cd48?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:46:23,506 [ scc.repo] DEBUG - PR 25 jburel 'review message' 2024-07-11 00:46:24,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-duplicate/issues/18 HTTP/1.1" 200 None 2024-07-11 00:46:24,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-duplicate/issues/18/comments HTTP/1.1" 200 None 2024-07-11 00:46:24,512 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:46:24,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate 2024-07-11 00:46:24,513 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:24,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:24,518 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:46:24,524 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:46:24,525 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:46:24,531 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:46:24,537 [ scc.git] DEBUG Already up to date. 2024-07-11 00:46:24,538 [ scc.git] DEBUG Calling 'git fetch origin pull/25/head' 2024-07-11 00:46:24,982 [ scc.git] DEBUG From https://github.com/ome/omero-cli-duplicate 2024-07-11 00:46:24,983 [ scc.git] DEBUG * branch refs/pull/25/head -> FETCH_HEAD 2024-07-11 00:46:24,988 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:46:24,988 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:24,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:24,994 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ba066707734718b3c2f034d21873d2fcecd9cd48' 2024-07-11 00:46:25,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:25,005 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 25 (review message) ba066707734718b3c2f034d21873d2fcecd9cd48' 2024-07-11 00:46:25,030 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:46:25,033 [ scc.git] DEBUG src/omero/plugins/duplicate.py | 7 +++---- 2024-07-11 00:46:25,033 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 4 deletions(-) 2024-07-11 00:46:25,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:46:25,262 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:46:25,308 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:25,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:25,315 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:46:25,367 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:46:25,375 [ scc.git] DEBUG has no local changes 2024-07-11 00:46:25,375 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-cli-duplicate Excluded PRs: - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment) Already up to date. Merged PRs: - PR 25 jburel 'review message' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:46:25,385 [ scc.git] DEBUG [detached HEAD 6d13a4b] merge master -Dorg -Ssuccess-only 2024-07-11 00:46:25,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:46:25,385 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:46:25,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/pulls HTTP/1.1" 200 None 2024-07-11 00:46:26,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/issues/64 HTTP/1.1" 200 None 2024-07-11 00:46:26,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/issues/64/comments HTTP/1.1" 200 None 2024-07-11 00:46:27,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/commits/6dffdfe0e7ed620e791de943fad823e440b40639 HTTP/1.1" 200 None 2024-07-11 00:46:27,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/commits/6dffdfe0e7ed620e791de943fad823e440b40639/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:46:28,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/commits/6dffdfe0e7ed620e791de943fad823e440b40639 HTTP/1.1" 200 None 2024-07-11 00:46:29,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/statuses/6dffdfe0e7ed620e791de943fad823e440b40639?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:46:29,087 [ scc.repo] DEBUG - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition' 2024-07-11 00:46:29,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/issues/63 HTTP/1.1" 200 None 2024-07-11 00:46:30,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/commits/f093c7c9c7ea4a71c2e5dbe4f6558ee5ea2b30ae HTTP/1.1" 200 None 2024-07-11 00:46:30,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/commits/f093c7c9c7ea4a71c2e5dbe4f6558ee5ea2b30ae/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:46:31,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/commits/f093c7c9c7ea4a71c2e5dbe4f6558ee5ea2b30ae HTTP/1.1" 200 None 2024-07-11 00:46:31,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/statuses/f093c7c9c7ea4a71c2e5dbe4f6558ee5ea2b30ae?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:46:31,603 [ scc.repo] DEBUG - PR 63 sbesson 'Remove python-future dependency' 2024-07-11 00:46:32,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/issues/62 HTTP/1.1" 200 None 2024-07-11 00:46:32,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/issues/62/comments HTTP/1.1" 200 None 2024-07-11 00:46:33,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/issues/59 HTTP/1.1" 200 None 2024-07-11 00:46:33,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/issues/59/comments HTTP/1.1" 200 None 2024-07-11 00:46:34,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/commits/b8fba620a2b882050c1858f3a7d8bee8c8efdede HTTP/1.1" 200 None 2024-07-11 00:46:34,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/commits/b8fba620a2b882050c1858f3a7d8bee8c8efdede/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:46:35,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/commits/b8fba620a2b882050c1858f3a7d8bee8c8efdede HTTP/1.1" 200 None 2024-07-11 00:46:35,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/statuses/b8fba620a2b882050c1858f3a7d8bee8c8efdede?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:46:35,482 [ scc.repo] DEBUG - PR 59 will-moore 'Apply settings to Plate' 2024-07-11 00:46:35,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/issues/54 HTTP/1.1" 200 None 2024-07-11 00:46:36,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/issues/52 HTTP/1.1" 200 None 2024-07-11 00:46:37,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/issues/52/comments HTTP/1.1" 200 None 2024-07-11 00:46:37,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/issues/48 HTTP/1.1" 200 None 2024-07-11 00:46:38,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-render/issues/48/comments HTTP/1.1" 200 None 2024-07-11 00:46:38,049 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:46:38,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render 2024-07-11 00:46:38,049 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:38,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:38,055 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:46:38,062 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:46:38,063 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:46:38,071 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:46:38,079 [ scc.git] DEBUG Already up to date. 2024-07-11 00:46:38,080 [ scc.git] DEBUG Calling 'git fetch origin pull/59/head' 2024-07-11 00:46:38,576 [ scc.git] DEBUG From https://github.com/ome/omero-cli-render 2024-07-11 00:46:38,576 [ scc.git] DEBUG * branch refs/pull/59/head -> FETCH_HEAD 2024-07-11 00:46:38,584 [ scc.git] DEBUG Calling 'git fetch origin pull/63/head' 2024-07-11 00:46:39,060 [ scc.git] DEBUG From https://github.com/ome/omero-cli-render 2024-07-11 00:46:39,060 [ scc.git] DEBUG * branch refs/pull/63/head -> FETCH_HEAD 2024-07-11 00:46:39,068 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head' 2024-07-11 00:46:39,588 [ scc.git] DEBUG From https://github.com/ome/omero-cli-render 2024-07-11 00:46:39,589 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD 2024-07-11 00:46:39,594 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:46:39,595 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:39,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:39,602 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b8fba620a2b882050c1858f3a7d8bee8c8efdede' 2024-07-11 00:46:39,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:39,620 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 59 (Apply settings to Plate) b8fba620a2b882050c1858f3a7d8bee8c8efdede' 2024-07-11 00:46:39,644 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:46:39,647 [ scc.git] DEBUG src/omero_cli_render.py | 49 ++++++++++++++++++++++++++++++++----------------- 2024-07-11 00:46:39,647 [ scc.git] DEBUG 1 file changed, 32 insertions(+), 17 deletions(-) 2024-07-11 00:46:39,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:46:39,873 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f093c7c9c7ea4a71c2e5dbe4f6558ee5ea2b30ae' 2024-07-11 00:46:39,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:39,887 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 63 (Remove python-future dependency) f093c7c9c7ea4a71c2e5dbe4f6558ee5ea2b30ae' 2024-07-11 00:46:39,951 [ scc.git] DEBUG Auto-merging src/omero_cli_render.py 2024-07-11 00:46:39,952 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:46:39,956 [ scc.git] DEBUG setup.py | 3 +-- 2024-07-11 00:46:39,956 [ scc.git] DEBUG src/omero_cli_render.py | 9 ++------- 2024-07-11 00:46:39,956 [ scc.git] DEBUG test/integration/clitest/test_render.py | 6 +----- 2024-07-11 00:46:39,956 [ scc.git] DEBUG 3 files changed, 4 insertions(+), 14 deletions(-) 2024-07-11 00:46:40,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:46:40,315 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6dffdfe0e7ed620e791de943fad823e440b40639' 2024-07-11 00:46:40,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:40,327 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Fix thumbnail generation with missing rendering definition) 6dffdfe0e7ed620e791de943fad823e440b40639' 2024-07-11 00:46:40,391 [ scc.git] DEBUG Auto-merging src/omero_cli_render.py 2024-07-11 00:46:40,391 [ scc.git] DEBUG Auto-merging test/integration/clitest/test_render.py 2024-07-11 00:46:40,391 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:46:40,395 [ scc.git] DEBUG src/omero_cli_render.py | 14 ++++++++++++-- 2024-07-11 00:46:40,395 [ scc.git] DEBUG test/integration/clitest/test_render.py | 12 ++++++++++++ 2024-07-11 00:46:40,395 [ scc.git] DEBUG 2 files changed, 24 insertions(+), 2 deletions(-) 2024-07-11 00:46:40,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:46:40,731 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:46:40,775 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:40,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:40,781 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:46:40,826 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:46:40,835 [ scc.git] DEBUG has no local changes 2024-07-11 00:46:40,835 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-cli-render Excluded PRs: - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft) - PR 54 dominikl 'Change rendering settings spec' (stage: draft) - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft) - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft) Already up to date. Merged PRs: - PR 59 will-moore 'Apply settings to Plate' - PR 63 sbesson 'Remove python-future dependency' - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:46:40,846 [ scc.git] DEBUG [detached HEAD 82f75f9] merge master -Dorg -Ssuccess-only 2024-07-11 00:46:40,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:46:40,846 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:46:41,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/pulls HTTP/1.1" 200 None 2024-07-11 00:46:41,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/issues/147 HTTP/1.1" 200 None 2024-07-11 00:46:42,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/issues/147/comments HTTP/1.1" 200 None 2024-07-11 00:46:42,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/commits/a14f62a940f4974a305b3f5858049ee493b898ef HTTP/1.1" 200 None 2024-07-11 00:46:43,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/commits/a14f62a940f4974a305b3f5858049ee493b898ef/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:46:43,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/commits/a14f62a940f4974a305b3f5858049ee493b898ef/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:46:44,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/commits/a14f62a940f4974a305b3f5858049ee493b898ef HTTP/1.1" 200 None 2024-07-11 00:46:44,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/statuses/a14f62a940f4974a305b3f5858049ee493b898ef?per_page=1 HTTP/1.1" 200 None 2024-07-11 00:46:45,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/commits/a14f62a940f4974a305b3f5858049ee493b898ef HTTP/1.1" 200 None 2024-07-11 00:46:45,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/commits/a14f62a940f4974a305b3f5858049ee493b898ef/status HTTP/1.1" 200 None 2024-07-11 00:46:45,881 [ scc.repo] DEBUG - PR 147 will-moore 'Name option' 2024-07-11 00:46:46,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/issues/123 HTTP/1.1" 200 None 2024-07-11 00:46:46,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/issues/123/comments HTTP/1.1" 200 None 2024-07-11 00:46:47,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/256245946/issues/123/comments?page=2 HTTP/1.1" 200 None 2024-07-11 00:46:47,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/commits/553b35f498764274f8dc882fb54c7e0a30fb6737 HTTP/1.1" 200 None 2024-07-11 00:46:48,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/commits/553b35f498764274f8dc882fb54c7e0a30fb6737/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:46:48,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/commits/553b35f498764274f8dc882fb54c7e0a30fb6737 HTTP/1.1" 200 None 2024-07-11 00:46:49,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/statuses/553b35f498764274f8dc882fb54c7e0a30fb6737?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:46:49,472 [ scc.repo] DEBUG - PR 123 will-moore 'Support export of Fileset:ID' 2024-07-11 00:46:49,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/issues/118 HTTP/1.1" 200 None 2024-07-11 00:46:50,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/issues/102 HTTP/1.1" 200 None 2024-07-11 00:46:51,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/issues/102/comments HTTP/1.1" 200 None 2024-07-11 00:46:51,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/commits/f22d4074b7c458ad24320cf5a6f8adb9e686aa44 HTTP/1.1" 200 None 2024-07-11 00:46:52,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/commits/f22d4074b7c458ad24320cf5a6f8adb9e686aa44/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:46:52,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/commits/f22d4074b7c458ad24320cf5a6f8adb9e686aa44 HTTP/1.1" 200 None 2024-07-11 00:46:53,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/statuses/f22d4074b7c458ad24320cf5a6f8adb9e686aa44?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:46:53,222 [ scc.repo] DEBUG - PR 102 will-moore 'Zarr export tests' 2024-07-11 00:46:53,222 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:46:53,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr 2024-07-11 00:46:53,223 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:53,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:53,229 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:46:53,235 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:46:53,235 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:46:53,241 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:46:53,247 [ scc.git] DEBUG Already up to date. 2024-07-11 00:46:53,247 [ scc.git] DEBUG Calling 'git fetch origin pull/102/head' 2024-07-11 00:46:53,669 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr 2024-07-11 00:46:53,669 [ scc.git] DEBUG * branch refs/pull/102/head -> FETCH_HEAD 2024-07-11 00:46:53,674 [ scc.git] DEBUG Calling 'git fetch origin pull/123/head' 2024-07-11 00:46:54,072 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr 2024-07-11 00:46:54,072 [ scc.git] DEBUG * branch refs/pull/123/head -> FETCH_HEAD 2024-07-11 00:46:54,078 [ scc.git] DEBUG Calling 'git fetch origin pull/147/head' 2024-07-11 00:46:54,589 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr 2024-07-11 00:46:54,589 [ scc.git] DEBUG * branch refs/pull/147/head -> FETCH_HEAD 2024-07-11 00:46:54,594 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:46:54,594 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:54,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:54,600 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f22d4074b7c458ad24320cf5a6f8adb9e686aa44' 2024-07-11 00:46:54,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:54,614 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 102 (Zarr export tests) f22d4074b7c458ad24320cf5a6f8adb9e686aa44' 2024-07-11 00:46:54,706 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py 2024-07-11 00:46:54,706 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py 2024-07-11 00:46:54,707 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py 2024-07-11 00:46:54,707 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-07-11 00:46:54,707 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-07-11 00:46:54,714 [ scc.git] DEBUG Calling 'git reset --hard 9b73dd9dbdeb36dbdb675b02661d253052fca0f0' 2024-07-11 00:46:54,721 [ scc.git] DEBUG HEAD is now at 9b73dd9 Merge pull request #161 from ome/pre-commit-ci-update-config 2024-07-11 00:46:54,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:46:54,909 [ scc.git] DEBUG Calling 'git merge-base 9b73dd9dbdeb36dbdb675b02661d253052fca0f0 f22d4074b7c458ad24320cf5a6f8adb9e686aa44' 2024-07-11 00:46:54,917 [ scc.git] DEBUG Calling 'git diff --name-only 782a1cd0077bcc2871f21e9f0acdc25ae7745243..9b73dd9dbdeb36dbdb675b02661d253052fca0f0' 2024-07-11 00:46:54,924 [ scc.git] INFO - PR 102 will-moore 'Zarr export tests' Conflicting PR. Removed from build [OMERO-plugins-push#118](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/consoleText) for more details. Possible conflicts: - Upstream changes - src/omero_zarr/raw_pixels.py --conflicts 2024-07-11 00:46:54,929 [ scc.config] DEBUG Found github.token 2024-07-11 00:46:54,930 [ scc.git] DEBUG Not adding comment to issue #102, already --conflicts. 2024-07-11 00:46:54,930 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...553b35f498764274f8dc882fb54c7e0a30fb6737' 2024-07-11 00:46:54,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:54,943 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 123 (Support export of Fileset:ID) 553b35f498764274f8dc882fb54c7e0a30fb6737' 2024-07-11 00:46:54,965 [ scc.git] DEBUG Auto-merging .isort.cfg 2024-07-11 00:46:54,965 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg 2024-07-11 00:46:54,965 [ scc.git] DEBUG Auto-merging setup.py 2024-07-11 00:46:54,965 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py 2024-07-11 00:46:54,965 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py 2024-07-11 00:46:54,965 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py 2024-07-11 00:46:54,965 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py 2024-07-11 00:46:54,966 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-07-11 00:46:54,966 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-07-11 00:46:54,972 [ scc.git] DEBUG Calling 'git reset --hard 9b73dd9dbdeb36dbdb675b02661d253052fca0f0' 2024-07-11 00:46:54,980 [ scc.git] DEBUG HEAD is now at 9b73dd9 Merge pull request #161 from ome/pre-commit-ci-update-config 2024-07-11 00:46:55,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:46:55,349 [ scc.git] DEBUG Calling 'git merge-base 9b73dd9dbdeb36dbdb675b02661d253052fca0f0 553b35f498764274f8dc882fb54c7e0a30fb6737' 2024-07-11 00:46:55,356 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..9b73dd9dbdeb36dbdb675b02661d253052fca0f0' 2024-07-11 00:46:55,363 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID' Conflicting PR. Removed from build [OMERO-plugins-push#118](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/consoleText) for more details. Possible conflicts: - PR #102 will-moore 'Zarr export tests' - src/omero_zarr/raw_pixels.py - Upstream changes - .isort.cfg - src/omero_zarr/raw_pixels.py --conflicts 2024-07-11 00:46:55,369 [ scc.config] DEBUG Found github.token 2024-07-11 00:46:55,369 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts. 2024-07-11 00:46:55,369 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef' 2024-07-11 00:46:55,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:55,382 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef' 2024-07-11 00:46:55,396 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py 2024-07-11 00:46:55,396 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py 2024-07-11 00:46:55,396 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:46:55,400 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------ 2024-07-11 00:46:55,400 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++ 2024-07-11 00:46:55,400 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++-- 2024-07-11 00:46:55,400 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++----- 2024-07-11 00:46:55,400 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +- 2024-07-11 00:46:55,400 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-) 2024-07-11 00:46:55,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:46:55,838 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:46:55,881 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:46:55,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:46:55,887 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:46:55,931 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:46:55,939 [ scc.git] DEBUG has no local changes 2024-07-11 00:46:55,939 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-cli-zarr Excluded PRs: - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft) Already up to date. Merged PRs: - PR 147 will-moore 'Name option' Conflicting PRs (not included): - PR 102 will-moore 'Zarr export tests' - PR 123 will-moore 'Support export of Fileset:ID' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:46:55,949 [ scc.git] DEBUG [detached HEAD d336303] merge master -Dorg -Ssuccess-only 2024-07-11 00:46:55,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:46:55,950 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:46:56,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None 2024-07-11 00:46:56,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/577 HTTP/1.1" 200 None 2024-07-11 00:46:57,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/577/comments HTTP/1.1" 200 None 2024-07-11 00:46:57,464 [ scc.repo] DEBUG # ... Include label: include 2024-07-11 00:46:58,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0fb5f26b7f84a31750e205918960bde5776a4aa5 HTTP/1.1" 200 None 2024-07-11 00:46:58,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0fb5f26b7f84a31750e205918960bde5776a4aa5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:46:59,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0fb5f26b7f84a31750e205918960bde5776a4aa5/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:46:59,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0fb5f26b7f84a31750e205918960bde5776a4aa5 HTTP/1.1" 200 None 2024-07-11 00:47:00,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/0fb5f26b7f84a31750e205918960bde5776a4aa5?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:00,021 [ scc.repo] DEBUG - PR 577 Rdornier 'Fill rois' 2024-07-11 00:47:00,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/576 HTTP/1.1" 200 None 2024-07-11 00:47:00,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/576/comments HTTP/1.1" 200 None 2024-07-11 00:47:00,996 [ scc.repo] DEBUG # ... Include label: include 2024-07-11 00:47:01,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f4b9c3912e5f22ce4ca023e06a5863f5c577598e HTTP/1.1" 200 None 2024-07-11 00:47:02,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f4b9c3912e5f22ce4ca023e06a5863f5c577598e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:02,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f4b9c3912e5f22ce4ca023e06a5863f5c577598e/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:47:02,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f4b9c3912e5f22ce4ca023e06a5863f5c577598e HTTP/1.1" 200 None 2024-07-11 00:47:03,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f4b9c3912e5f22ce4ca023e06a5863f5c577598e?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:03,396 [ scc.repo] DEBUG - PR 576 Rdornier 'Color picker - popup update' 2024-07-11 00:47:03,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/575 HTTP/1.1" 200 None 2024-07-11 00:47:04,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568 HTTP/1.1" 200 None 2024-07-11 00:47:04,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568/comments HTTP/1.1" 200 None 2024-07-11 00:47:05,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None 2024-07-11 00:47:05,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:06,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:47:06,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None 2024-07-11 00:47:07,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:07,364 [ scc.repo] DEBUG - PR 568 will-moore 'Remove numpy from tests_require in setup.py' 2024-07-11 00:47:07,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None 2024-07-11 00:47:08,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None 2024-07-11 00:47:08,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b000e028f28537162bf329e0cb3e4fbf7e7bede4 HTTP/1.1" 200 None 2024-07-11 00:47:09,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b000e028f28537162bf329e0cb3e4fbf7e7bede4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:10,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b000e028f28537162bf329e0cb3e4fbf7e7bede4/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:47:10,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b000e028f28537162bf329e0cb3e4fbf7e7bede4 HTTP/1.1" 200 None 2024-07-11 00:47:11,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/b000e028f28537162bf329e0cb3e4fbf7e7bede4?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:11,093 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes' 2024-07-11 00:47:11,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None 2024-07-11 00:47:12,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None 2024-07-11 00:47:12,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None 2024-07-11 00:47:13,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:13,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:47:14,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None 2024-07-11 00:47:14,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:14,868 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor' 2024-07-11 00:47:15,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None 2024-07-11 00:47:15,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549/comments HTTP/1.1" 200 None 2024-07-11 00:47:16,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None 2024-07-11 00:47:17,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:17,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:47:18,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None 2024-07-11 00:47:18,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f7d26b972bfe9a7105c4f94776748446f2395c77?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:18,661 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature' 2024-07-11 00:47:18,662 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:47:18,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure 2024-07-11 00:47:18,662 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:18,662 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:18,668 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:47:18,673 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:47:18,673 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:47:18,679 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:47:18,686 [ scc.git] DEBUG Already up to date. 2024-07-11 00:47:18,686 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head' 2024-07-11 00:47:19,112 [ scc.git] DEBUG From https://github.com/ome/omero-figure 2024-07-11 00:47:19,113 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD 2024-07-11 00:47:19,118 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head' 2024-07-11 00:47:19,908 [ scc.git] DEBUG From https://github.com/ome/omero-figure 2024-07-11 00:47:19,908 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD 2024-07-11 00:47:19,915 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head' 2024-07-11 00:47:20,922 [ scc.git] DEBUG From https://github.com/ome/omero-figure 2024-07-11 00:47:20,923 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD 2024-07-11 00:47:20,928 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head' 2024-07-11 00:47:21,310 [ scc.git] DEBUG From https://github.com/ome/omero-figure 2024-07-11 00:47:21,311 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD 2024-07-11 00:47:21,316 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head' 2024-07-11 00:47:21,847 [ scc.git] DEBUG From https://github.com/ome/omero-figure 2024-07-11 00:47:21,847 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD 2024-07-11 00:47:21,850 [ scc.git] DEBUG Calling 'git fetch origin pull/577/head' 2024-07-11 00:47:22,477 [ scc.git] DEBUG From https://github.com/ome/omero-figure 2024-07-11 00:47:22,478 [ scc.git] DEBUG * branch refs/pull/577/head -> FETCH_HEAD 2024-07-11 00:47:22,480 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:47:22,481 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:22,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:22,486 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77' 2024-07-11 00:47:22,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:22,501 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77' 2024-07-11 00:47:22,585 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:22,591 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++- 2024-07-11 00:47:22,591 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++ 2024-07-11 00:47:22,591 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++ 2024-07-11 00:47:22,591 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++- 2024-07-11 00:47:22,591 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 + 2024-07-11 00:47:22,591 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++- 2024-07-11 00:47:22,591 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++- 2024-07-11 00:47:22,591 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++ 2024-07-11 00:47:22,591 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++ 2024-07-11 00:47:22,591 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-) 2024-07-11 00:47:22,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:22,800 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab' 2024-07-11 00:47:22,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:22,820 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab' 2024-07-11 00:47:23,032 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js 2024-07-11 00:47:23,032 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js 2024-07-11 00:47:23,032 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js 2024-07-11 00:47:23,033 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:23,039 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +- 2024-07-11 00:47:23,039 [ scc.git] DEBUG src/css/figure.css | 4 + 2024-07-11 00:47:23,039 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes 2024-07-11 00:47:23,039 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +- 2024-07-11 00:47:23,039 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 + 2024-07-11 00:47:23,039 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++- 2024-07-11 00:47:23,039 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +- 2024-07-11 00:47:23,039 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 + 2024-07-11 00:47:23,039 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +- 2024-07-11 00:47:23,039 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 + 2024-07-11 00:47:23,039 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-) 2024-07-11 00:47:23,040 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png 2024-07-11 00:47:23,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:23,283 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b000e028f28537162bf329e0cb3e4fbf7e7bede4' 2024-07-11 00:47:23,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:23,300 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b000e028f28537162bf329e0cb3e4fbf7e7bede4' 2024-07-11 00:47:23,631 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py 2024-07-11 00:47:23,632 [ scc.git] DEBUG Auto-merging src/css/figure.css 2024-07-11 00:47:23,632 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js 2024-07-11 00:47:23,632 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js 2024-07-11 00:47:23,632 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js 2024-07-11 00:47:23,632 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:23,642 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++-- 2024-07-11 00:47:23,642 [ scc.git] DEBUG omero_figure/urls.py | 8 +++ 2024-07-11 00:47:23,642 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++ 2024-07-11 00:47:23,642 [ scc.git] DEBUG src/css/figure.css | 5 -- 2024-07-11 00:47:23,642 [ scc.git] DEBUG src/index.html | 1 + 2024-07-11 00:47:23,642 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++- 2024-07-11 00:47:23,642 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++- 2024-07-11 00:47:23,644 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +- 2024-07-11 00:47:23,645 [ scc.git] DEBUG src/js/views/modal_views.js | 2 + 2024-07-11 00:47:23,645 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +- 2024-07-11 00:47:23,645 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++ 2024-07-11 00:47:23,645 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +- 2024-07-11 00:47:23,645 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +- 2024-07-11 00:47:23,645 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 + 2024-07-11 00:47:23,645 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-) 2024-07-11 00:47:23,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:23,851 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6' 2024-07-11 00:47:23,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:23,866 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6' 2024-07-11 00:47:23,899 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:23,902 [ scc.git] DEBUG setup.py | 2 +- 2024-07-11 00:47:23,903 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-07-11 00:47:24,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:24,302 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f4b9c3912e5f22ce4ca023e06a5863f5c577598e' 2024-07-11 00:47:24,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:24,318 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) f4b9c3912e5f22ce4ca023e06a5863f5c577598e' 2024-07-11 00:47:24,337 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:24,340 [ scc.git] DEBUG src/js/views/colorpicker.js | 5 +++-- 2024-07-11 00:47:24,340 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-) 2024-07-11 00:47:24,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:24,806 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0fb5f26b7f84a31750e205918960bde5776a4aa5' 2024-07-11 00:47:24,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:24,823 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 577 (Fill rois) 0fb5f26b7f84a31750e205918960bde5776a4aa5' 2024-07-11 00:47:24,850 [ scc.git] DEBUG Auto-merging src/css/figure.css 2024-07-11 00:47:24,851 [ scc.git] DEBUG Auto-merging src/js/shape_editor/ellipse.js 2024-07-11 00:47:24,851 [ scc.git] DEBUG Auto-merging src/js/shape_editor/rect.js 2024-07-11 00:47:24,851 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/js/shape_editor/rect.js 2024-07-11 00:47:24,851 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js 2024-07-11 00:47:24,851 [ scc.git] DEBUG Auto-merging src/templates/shapes/shape_toolbar.template.html 2024-07-11 00:47:24,851 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-07-11 00:47:24,851 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-07-11 00:47:24,862 [ scc.git] DEBUG Calling 'git reset --hard de5d3a7dce7efc0fc476085790e875d339b20c87' 2024-07-11 00:47:24,874 [ scc.git] DEBUG HEAD is now at de5d3a7d merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 2024-07-11 00:47:25,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:25,311 [ scc.git] DEBUG Calling 'git merge-base 64566080f813fb5d70a77c3cd1a141bf30eaddba 0fb5f26b7f84a31750e205918960bde5776a4aa5' 2024-07-11 00:47:25,320 [ scc.git] DEBUG Calling 'git diff --name-only 9ffbc8b7af1f8539c21b5ef24cfc71166e16dfc3..64566080f813fb5d70a77c3cd1a141bf30eaddba' 2024-07-11 00:47:25,328 [ scc.git] INFO - PR 577 Rdornier 'Fill rois' Conflicting PR. Removed from build [OMERO-plugins-push#118](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/consoleText) for more details. Possible conflicts: - PR #549 will-moore 'Inset feature' - src/js/shape_editor/rect.js --conflicts 2024-07-11 00:47:25,334 [ scc.config] DEBUG Found github.token 2024-07-11 00:47:25,334 [ scc.git] DEBUG Adding comment to issue #577. 2024-07-11 00:47:26,136 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/577/comments HTTP/1.1" 201 1984 2024-07-11 00:47:26,138 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:47:26,190 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:26,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:26,197 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:47:26,241 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:47:26,250 [ scc.git] DEBUG has no local changes 2024-07-11 00:47:26,251 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-figure Excluded PRs: - PR 575 Tom-TBT 'Label sorting with drag and drop' (user: Tom-TBT) - PR 543 will-moore 'Plate well labels' (exclude comment) Already up to date. Merged PRs: - PR 549 will-moore 'Inset feature' - PR 555 will-moore 'Points in shape editor' - PR 560 will-moore 'Max projection bytes' - PR 568 will-moore 'Remove numpy from tests_require in setup.py' - PR 576 Rdornier 'Color picker - popup update' Conflicting PRs (not included): - PR 577 Rdornier 'Fill rois' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:47:26,262 [ scc.git] DEBUG [detached HEAD 87e3230f] merge master -Dorg -Ssuccess-only 2024-07-11 00:47:26,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:47:26,263 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:47:26,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None 2024-07-11 00:47:27,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None 2024-07-11 00:47:27,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None 2024-07-11 00:47:28,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None 2024-07-11 00:47:28,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:29,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None 2024-07-11 00:47:29,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:29,590 [ scc.repo] DEBUG - PR 18 jburel 'default size z value' 2024-07-11 00:47:29,591 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:47:29,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage 2024-07-11 00:47:29,591 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:29,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:29,600 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:47:29,616 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:47:29,617 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:47:29,628 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:47:29,638 [ scc.git] DEBUG Already up to date. 2024-07-11 00:47:29,638 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head' 2024-07-11 00:47:30,150 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage 2024-07-11 00:47:30,150 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD 2024-07-11 00:47:30,156 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:47:30,156 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:30,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:30,165 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337' 2024-07-11 00:47:30,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:30,187 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337' 2024-07-11 00:47:30,222 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py 2024-07-11 00:47:30,223 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:30,226 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++ 2024-07-11 00:47:30,226 [ scc.git] DEBUG 1 file changed, 2 insertions(+) 2024-07-11 00:47:30,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:30,398 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:47:30,460 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:30,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:30,469 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:47:30,521 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:47:30,533 [ scc.git] DEBUG has no local changes 2024-07-11 00:47:30,533 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-fpbioimage Already up to date. Merged PRs: - PR 18 jburel 'default size z value' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:47:30,546 [ scc.git] DEBUG [detached HEAD 8cf80dd] merge master -Dorg -Ssuccess-only 2024-07-11 00:47:30,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:47:30,547 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:47:30,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None 2024-07-11 00:47:31,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None 2024-07-11 00:47:31,485 [ scc.repo] DEBUG # ... Include label: dependencies 2024-07-11 00:47:32,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None 2024-07-11 00:47:32,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:33,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:47:33,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None 2024-07-11 00:47:34,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:34,212 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2' 2024-07-11 00:47:34,212 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:47:34,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery 2024-07-11 00:47:34,212 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:34,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:34,219 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:47:34,226 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:47:34,226 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:47:34,234 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:47:34,241 [ scc.git] DEBUG Already up to date. 2024-07-11 00:47:34,242 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head' 2024-07-11 00:47:34,622 [ scc.git] DEBUG From https://github.com/ome/omero-gallery 2024-07-11 00:47:34,623 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD 2024-07-11 00:47:34,628 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:47:34,628 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:34,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:34,635 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893' 2024-07-11 00:47:34,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:34,650 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893' 2024-07-11 00:47:34,665 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:34,669 [ scc.git] DEBUG package-lock.json | 18 ++++++------------ 2024-07-11 00:47:34,670 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-) 2024-07-11 00:47:34,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:34,911 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:47:34,956 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:34,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:34,963 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:47:35,008 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:47:35,018 [ scc.git] DEBUG has no local changes 2024-07-11 00:47:35,018 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-gallery Already up to date. Merged PRs: - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:47:35,029 [ scc.git] DEBUG [detached HEAD 049edf1] merge master -Dorg -Ssuccess-only 2024-07-11 00:47:35,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:47:35,029 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:47:35,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None 2024-07-11 00:47:35,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None 2024-07-11 00:47:35,964 [ scc.repo] DEBUG # ... Include label: dependencies 2024-07-11 00:47:36,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None 2024-07-11 00:47:37,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:37,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:47:38,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None 2024-07-11 00:47:38,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:38,530 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5' 2024-07-11 00:47:38,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None 2024-07-11 00:47:38,987 [ scc.repo] DEBUG # ... Include label: dependencies 2024-07-11 00:47:39,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None 2024-07-11 00:47:40,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:40,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:47:40,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None 2024-07-11 00:47:41,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:41,397 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io' 2024-07-11 00:47:41,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None 2024-07-11 00:47:42,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None 2024-07-11 00:47:42,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None 2024-07-11 00:47:43,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:43,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:47:44,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None 2024-07-11 00:47:44,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:44,665 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip' 2024-07-11 00:47:45,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None 2024-07-11 00:47:45,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None 2024-07-11 00:47:46,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None 2024-07-11 00:47:46,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:47,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:47:47,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None 2024-07-11 00:47:47,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:47,995 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure' 2024-07-11 00:47:48,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None 2024-07-11 00:47:48,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None 2024-07-11 00:47:49,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None 2024-07-11 00:47:49,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:50,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None 2024-07-11 00:47:50,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:50,781 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix' 2024-07-11 00:47:50,782 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:47:50,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer 2024-07-11 00:47:50,782 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:50,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:50,788 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:47:50,794 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:47:50,794 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:47:50,837 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:47:50,844 [ scc.git] DEBUG Already up to date. 2024-07-11 00:47:50,845 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head' 2024-07-11 00:47:51,350 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer 2024-07-11 00:47:51,350 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD 2024-07-11 00:47:51,355 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head' 2024-07-11 00:47:52,430 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer 2024-07-11 00:47:52,430 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD 2024-07-11 00:47:52,435 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head' 2024-07-11 00:47:52,873 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer 2024-07-11 00:47:52,874 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD 2024-07-11 00:47:52,879 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head' 2024-07-11 00:47:53,247 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer 2024-07-11 00:47:53,247 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD 2024-07-11 00:47:53,252 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head' 2024-07-11 00:47:53,629 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer 2024-07-11 00:47:53,629 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD 2024-07-11 00:47:53,634 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:47:53,634 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:53,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:53,640 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30' 2024-07-11 00:47:53,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:53,652 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30' 2024-07-11 00:47:53,701 [ scc.git] DEBUG Auto-merging src/model/image_info.js 2024-07-11 00:47:53,702 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:53,706 [ scc.git] DEBUG src/model/image_info.js | 7 ++++--- 2024-07-11 00:47:53,706 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++- 2024-07-11 00:47:53,706 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-) 2024-07-11 00:47:53,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:53,880 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd' 2024-07-11 00:47:53,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:53,898 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd' 2024-07-11 00:47:53,989 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py 2024-07-11 00:47:53,990 [ scc.git] DEBUG Auto-merging src/app/context.js 2024-07-11 00:47:53,990 [ scc.git] DEBUG Auto-merging src/utils/constants.js 2024-07-11 00:47:53,990 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js 2024-07-11 00:47:53,990 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:53,997 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++- 2024-07-11 00:47:53,997 [ scc.git] DEBUG src/app/context.js | 6 +- 2024-07-11 00:47:53,997 [ scc.git] DEBUG src/app/header.html | 5 + 2024-07-11 00:47:53,997 [ scc.git] DEBUG src/app/header.js | 45 ++++++++- 2024-07-11 00:47:53,997 [ scc.git] DEBUG src/utils/constants.js | 6 ++ 2024-07-11 00:47:53,997 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++ 2024-07-11 00:47:53,997 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-) 2024-07-11 00:47:53,997 [ scc.git] DEBUG create mode 100644 src/utils/figure.js 2024-07-11 00:47:54,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:54,304 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9' 2024-07-11 00:47:54,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:54,318 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9' 2024-07-11 00:47:54,383 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js 2024-07-11 00:47:54,383 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:54,387 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +- 2024-07-11 00:47:54,387 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++ 2024-07-11 00:47:54,387 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-) 2024-07-11 00:47:54,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:54,715 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5' 2024-07-11 00:47:54,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:54,740 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5' 2024-07-11 00:47:54,787 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:54,796 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++-------------------- 2024-07-11 00:47:54,796 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-) 2024-07-11 00:47:55,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:55,126 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11' 2024-07-11 00:47:55,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:55,154 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11' 2024-07-11 00:47:55,257 [ scc.git] DEBUG Auto-merging package-lock.json 2024-07-11 00:47:55,258 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:55,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:47:55,541 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:47:55,588 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:55,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:55,595 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:47:55,640 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:47:55,648 [ scc.git] DEBUG has no local changes 2024-07-11 00:47:55,648 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-iviewer Excluded PRs: - PR 420 will-moore 'Add release process to README' (exclude comment) - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment) Already up to date. Merged PRs: - PR 460 will-moore 'Channel min spinner fix' - PR 465 will-moore 'Save as Figure' - PR 471 will-moore 'Z projection disabled tooltip' - PR 477 dependabot[bot] 'Bump ws and socket.io' - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:47:55,659 [ scc.git] DEBUG [detached HEAD c4d493e] merge master -Dorg -Ssuccess-only 2024-07-11 00:47:55,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:47:55,660 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:47:56,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None 2024-07-11 00:47:56,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None 2024-07-11 00:47:57,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None 2024-07-11 00:47:57,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None 2024-07-11 00:47:58,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:47:58,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:47:58,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None 2024-07-11 00:47:59,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:47:59,374 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient' 2024-07-11 00:47:59,374 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:47:59,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr 2024-07-11 00:47:59,375 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:59,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:59,382 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:47:59,389 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:47:59,389 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:47:59,396 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:47:59,405 [ scc.git] DEBUG Already up to date. 2024-07-11 00:47:59,406 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head' 2024-07-11 00:47:59,854 [ scc.git] DEBUG From https://github.com/ome/omero-mapr 2024-07-11 00:47:59,854 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD 2024-07-11 00:47:59,860 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:47:59,860 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:47:59,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:59,867 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322' 2024-07-11 00:47:59,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:47:59,883 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322' 2024-07-11 00:47:59,899 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:47:59,903 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++ 2024-07-11 00:47:59,903 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 --------------------- 2024-07-11 00:47:59,903 [ scc.git] DEBUG requirements.txt | 2 +- 2024-07-11 00:47:59,903 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-) 2024-07-11 00:47:59,903 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html 2024-07-11 00:47:59,903 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html 2024-07-11 00:48:00,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:48:00,055 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:00,098 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:00,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:00,107 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:00,153 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:00,161 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:00,161 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-mapr Excluded PRs: - PR 79 will-moore 'Right panel title' (exclude comment) Already up to date. Merged PRs: - PR 74 will-moore 'mapr extension of webclient' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:00,172 [ scc.git] DEBUG [detached HEAD 8568c94] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:00,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:00,172 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:00,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None 2024-07-11 00:48:01,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None 2024-07-11 00:48:01,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None 2024-07-11 00:48:02,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None 2024-07-11 00:48:02,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:48:03,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None 2024-07-11 00:48:03,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:48:03,631 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate' 2024-07-11 00:48:04,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None 2024-07-11 00:48:04,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None 2024-07-11 00:48:05,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None 2024-07-11 00:48:05,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:48:06,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None 2024-07-11 00:48:06,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:48:06,584 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names' 2024-07-11 00:48:06,584 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:48:06,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata 2024-07-11 00:48:06,585 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:06,585 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:06,592 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:48:06,599 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:48:06,599 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:48:06,607 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:48:06,615 [ scc.git] DEBUG Already up to date. 2024-07-11 00:48:06,616 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head' 2024-07-11 00:48:07,116 [ scc.git] DEBUG From https://github.com/ome/omero-metadata 2024-07-11 00:48:07,117 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD 2024-07-11 00:48:07,123 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head' 2024-07-11 00:48:07,616 [ scc.git] DEBUG From https://github.com/ome/omero-metadata 2024-07-11 00:48:07,617 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD 2024-07-11 00:48:07,623 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:48:07,623 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:07,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:07,631 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102' 2024-07-11 00:48:07,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:07,652 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102' 2024-07-11 00:48:07,703 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py 2024-07-11 00:48:07,703 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py 2024-07-11 00:48:07,703 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py 2024-07-11 00:48:07,703 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py 2024-07-11 00:48:07,703 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-07-11 00:48:07,704 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-07-11 00:48:07,716 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c' 2024-07-11 00:48:07,726 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging 2024-07-11 00:48:07,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:48:07,898 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102' 2024-07-11 00:48:07,908 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c' 2024-07-11 00:48:07,915 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names' Conflicting PR. Removed from build [OMERO-plugins-push#118](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/consoleText) for more details. Possible conflicts: - Upstream changes - src/omero_metadata/populate.py - src/omero_metadata/cli.py --conflicts 2024-07-11 00:48:07,922 [ scc.config] DEBUG Found github.token 2024-07-11 00:48:07,922 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts. 2024-07-11 00:48:07,923 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7' 2024-07-11 00:48:07,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:07,940 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7' 2024-07-11 00:48:07,962 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py 2024-07-11 00:48:07,962 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py 2024-07-11 00:48:07,962 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py 2024-07-11 00:48:07,962 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-07-11 00:48:07,962 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-07-11 00:48:07,971 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c' 2024-07-11 00:48:07,984 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging 2024-07-11 00:48:08,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:48:08,338 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7' 2024-07-11 00:48:08,346 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c' 2024-07-11 00:48:08,355 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate' Conflicting PR. Removed from build [OMERO-plugins-push#118](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/consoleText) for more details. Possible conflicts: - PR #55 kkoz 'Prevent users from creating columns with python keyword names' - src/omero_metadata/populate.py - Upstream changes - src/omero_metadata/populate.py --conflicts 2024-07-11 00:48:08,362 [ scc.config] DEBUG Found github.token 2024-07-11 00:48:08,362 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts. 2024-07-11 00:48:08,362 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:08,411 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:08,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:08,418 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:08,467 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:08,480 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:08,480 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-metadata Already up to date. Conflicting PRs (not included): - PR 55 kkoz 'Prevent users from creating columns with python keyword names' - PR 64 will-moore 'Support images_by_name for Screen and Plate' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:08,490 [ scc.git] DEBUG [detached HEAD 61931aa] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:08,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:08,491 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:08,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None 2024-07-11 00:48:09,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None 2024-07-11 00:48:09,395 [ scc.repo] DEBUG # ... Include label: dependencies 2024-07-11 00:48:09,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None 2024-07-11 00:48:10,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:48:10,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:48:11,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None 2024-07-11 00:48:11,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:48:11,948 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0' 2024-07-11 00:48:12,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None 2024-07-11 00:48:12,418 [ scc.repo] DEBUG # ... Include label: dependencies 2024-07-11 00:48:13,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None 2024-07-11 00:48:13,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:48:13,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:48:14,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None 2024-07-11 00:48:14,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:48:14,925 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2' 2024-07-11 00:48:15,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None 2024-07-11 00:48:15,389 [ scc.repo] DEBUG # ... Include label: dependencies 2024-07-11 00:48:15,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None 2024-07-11 00:48:16,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:48:16,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:48:17,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None 2024-07-11 00:48:17,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:48:17,958 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31' 2024-07-11 00:48:18,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None 2024-07-11 00:48:18,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None 2024-07-11 00:48:19,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None 2024-07-11 00:48:20,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None 2024-07-11 00:48:20,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None 2024-07-11 00:48:21,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None 2024-07-11 00:48:21,116 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:48:21,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade 2024-07-11 00:48:21,116 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:21,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:21,123 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:48:21,129 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:48:21,129 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:48:21,136 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:48:21,144 [ scc.git] DEBUG Already up to date. 2024-07-11 00:48:21,144 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head' 2024-07-11 00:48:21,521 [ scc.git] DEBUG From https://github.com/ome/omero-parade 2024-07-11 00:48:21,521 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD 2024-07-11 00:48:21,527 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head' 2024-07-11 00:48:21,942 [ scc.git] DEBUG From https://github.com/ome/omero-parade 2024-07-11 00:48:21,943 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD 2024-07-11 00:48:21,947 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head' 2024-07-11 00:48:22,337 [ scc.git] DEBUG From https://github.com/ome/omero-parade 2024-07-11 00:48:22,337 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD 2024-07-11 00:48:22,343 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:48:22,344 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:22,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:22,350 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680' 2024-07-11 00:48:22,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:22,362 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680' 2024-07-11 00:48:22,372 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:48:22,375 [ scc.git] DEBUG package-lock.json | 12 ++++++++---- 2024-07-11 00:48:22,375 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-) 2024-07-11 00:48:22,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:48:22,606 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec' 2024-07-11 00:48:22,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:22,621 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec' 2024-07-11 00:48:22,688 [ scc.git] DEBUG Auto-merging package-lock.json 2024-07-11 00:48:22,688 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:48:22,691 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++--------------------------- 2024-07-11 00:48:22,691 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-) 2024-07-11 00:48:23,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:48:23,067 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f' 2024-07-11 00:48:23,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:23,079 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f' 2024-07-11 00:48:23,108 [ scc.git] DEBUG Auto-merging package-lock.json 2024-07-11 00:48:23,109 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:48:23,112 [ scc.git] DEBUG package-lock.json | 8 ++++---- 2024-07-11 00:48:23,112 [ scc.git] DEBUG package.json | 2 +- 2024-07-11 00:48:23,112 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-) 2024-07-11 00:48:23,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:48:23,532 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:23,579 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:23,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:23,586 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:23,633 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:23,641 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:23,641 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-parade Excluded PRs: - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment) - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment) - PR 39 chris-allan 'Expand all for Screens' (exclude comment) Already up to date. Merged PRs: - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31' - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2' - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:23,652 [ scc.git] DEBUG [detached HEAD fedc3f2] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:23,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:23,653 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:24,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None 2024-07-11 00:48:24,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None 2024-07-11 00:48:25,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None 2024-07-11 00:48:25,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:48:26,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None 2024-07-11 00:48:26,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:48:26,694 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel' 2024-07-11 00:48:26,694 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:48:26,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools 2024-07-11 00:48:26,694 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:26,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:26,700 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:48:26,705 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:48:26,705 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:48:26,711 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:48:26,717 [ scc.git] DEBUG Already up to date. 2024-07-11 00:48:26,717 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head' 2024-07-11 00:48:27,087 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools 2024-07-11 00:48:27,087 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD 2024-07-11 00:48:27,092 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:48:27,092 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:27,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:27,098 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e' 2024-07-11 00:48:27,104 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:27,109 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e' 2024-07-11 00:48:27,120 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:48:27,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:48:27,318 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:27,366 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:27,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:27,380 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:27,427 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:27,436 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:27,436 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-prometheus-tools Already up to date. Merged PRs: - PR 14 jburel 'use conda-forge channel' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:27,447 [ scc.git] DEBUG [detached HEAD 240dece] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:27,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:27,448 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:27,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None 2024-07-11 00:48:28,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None 2024-07-11 00:48:28,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None 2024-07-11 00:48:29,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None 2024-07-11 00:48:30,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None 2024-07-11 00:48:30,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:48:31,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None 2024-07-11 00:48:31,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:48:31,609 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id' 2024-07-11 00:48:31,610 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:48:31,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois 2024-07-11 00:48:31,610 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:31,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:31,616 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:48:31,622 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:48:31,623 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:48:31,629 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:48:31,636 [ scc.git] DEBUG Already up to date. 2024-07-11 00:48:31,636 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head' 2024-07-11 00:48:32,169 [ scc.git] DEBUG From https://github.com/ome/omero-rois 2024-07-11 00:48:32,169 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD 2024-07-11 00:48:32,175 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:48:32,175 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:32,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:32,181 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61' 2024-07-11 00:48:32,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:32,194 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61' 2024-07-11 00:48:32,206 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py 2024-07-11 00:48:32,206 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:48:32,209 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++ 2024-07-11 00:48:32,209 [ scc.git] DEBUG 1 file changed, 33 insertions(+) 2024-07-11 00:48:32,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:48:32,406 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:32,450 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:32,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:32,456 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:32,498 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:32,506 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:32,506 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-rois Excluded PRs: - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot]) Already up to date. Merged PRs: - PR 6 dominikl 'Add method to create masks grouped by label id' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:32,517 [ scc.git] DEBUG [detached HEAD 9e97966] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:32,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:32,518 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:32,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None 2024-07-11 00:48:33,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None 2024-07-11 00:48:34,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None 2024-07-11 00:48:34,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None 2024-07-11 00:48:35,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:48:35,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None 2024-07-11 00:48:36,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:48:36,294 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)' 2024-07-11 00:48:36,294 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:48:36,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup 2024-07-11 00:48:36,295 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:36,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:36,301 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:48:36,308 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:48:36,309 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:48:36,316 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:48:36,324 [ scc.git] DEBUG Already up to date. 2024-07-11 00:48:36,324 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head' 2024-07-11 00:48:36,712 [ scc.git] DEBUG From https://github.com/ome/omero-signup 2024-07-11 00:48:36,712 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD 2024-07-11 00:48:36,717 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:48:36,717 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:36,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:36,724 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d' 2024-07-11 00:48:36,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:36,737 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d' 2024-07-11 00:48:36,779 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py 2024-07-11 00:48:36,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py 2024-07-11 00:48:36,779 [ scc.git] DEBUG Auto-merging omero_signup/urls.py 2024-07-11 00:48:36,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py 2024-07-11 00:48:36,779 [ scc.git] DEBUG Auto-merging omero_signup/views.py 2024-07-11 00:48:36,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py 2024-07-11 00:48:36,779 [ scc.git] DEBUG Auto-merging setup.py 2024-07-11 00:48:36,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py 2024-07-11 00:48:36,779 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-07-11 00:48:36,780 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-07-11 00:48:36,789 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319' 2024-07-11 00:48:36,799 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0 2024-07-11 00:48:37,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:48:37,026 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d' 2024-07-11 00:48:37,034 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319' 2024-07-11 00:48:37,042 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)' Conflicting PR. Removed from build [OMERO-plugins-push#118](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/consoleText) for more details. Possible conflicts: - Upstream changes - omero_signup/signup_settings.py - omero_signup/urls.py - omero_signup/views.py - setup.py --conflicts 2024-07-11 00:48:37,049 [ scc.config] DEBUG Found github.token 2024-07-11 00:48:37,049 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts. 2024-07-11 00:48:37,049 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:37,093 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:37,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:37,100 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:37,142 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:37,149 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:37,149 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-signup Already up to date. Conflicting PRs (not included): - PR 14 manics 'Add pre-commit (black, flake8)' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:37,158 [ scc.git] DEBUG [detached HEAD 30aad92] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:37,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:37,159 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:37,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None 2024-07-11 00:48:38,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None 2024-07-11 00:48:38,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None 2024-07-11 00:48:39,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None 2024-07-11 00:48:39,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:48:40,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None 2024-07-11 00:48:40,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:48:40,766 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra' 2024-07-11 00:48:40,766 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:48:40,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra 2024-07-11 00:48:40,766 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:40,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:40,772 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:48:40,778 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:48:40,778 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:48:40,784 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:48:40,790 [ scc.git] DEBUG Already up to date. 2024-07-11 00:48:40,791 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head' 2024-07-11 00:48:41,293 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra 2024-07-11 00:48:41,293 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD 2024-07-11 00:48:41,298 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:48:41,298 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:41,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:41,304 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928' 2024-07-11 00:48:41,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:41,317 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928' 2024-07-11 00:48:41,350 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-07-11 00:48:41,353 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++ 2024-07-11 00:48:41,353 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++ 2024-07-11 00:48:41,353 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++ 2024-07-11 00:48:41,353 [ scc.git] DEBUG idr/70-reset-password.sh | 1 + 2024-07-11 00:48:41,353 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 + 2024-07-11 00:48:41,353 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 + 2024-07-11 00:48:41,355 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/omero/Dockerfile | 3 + 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++ 2024-07-11 00:48:41,356 [ scc.git] DEBUG 22 files changed, 824 insertions(+) 2024-07-11 00:48:41,356 [ scc.git] DEBUG create mode 100644 idr-compose.yml 2024-07-11 00:48:41,356 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile 2024-07-11 00:48:41,357 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml 2024-07-11 00:48:41,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:48:41,585 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:41,624 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:41,624 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:41,630 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:41,668 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:41,676 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:41,676 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: openmicroscopy/omero-test-infra Already up to date. Merged PRs: - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:41,685 [ scc.git] DEBUG [detached HEAD ba6e13e] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:41,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:41,686 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:42,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2 2024-07-11 00:48:42,093 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:48:42,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload 2024-07-11 00:48:42,093 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:42,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:42,099 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:48:42,104 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:48:42,104 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:48:42,109 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:48:42,114 [ scc.git] DEBUG Already up to date. 2024-07-11 00:48:42,115 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:48:42,115 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:42,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:42,120 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:42,159 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:42,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:42,164 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:42,203 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:42,210 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:42,211 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-upload Already up to date. Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:42,219 [ scc.git] DEBUG [detached HEAD 87b82a3] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:42,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:42,220 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:42,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2 2024-07-11 00:48:42,588 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:48:42,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope 2024-07-11 00:48:42,588 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:42,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:42,594 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:48:42,600 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:48:42,600 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:48:42,606 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:48:42,612 [ scc.git] DEBUG Already up to date. 2024-07-11 00:48:42,612 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:48:42,612 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:42,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:42,617 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:42,656 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:42,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:42,662 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:42,700 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:42,707 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:42,707 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-virtual-microscope Already up to date. Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:42,719 [ scc.git] DEBUG [detached HEAD 17681b9] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:42,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:42,720 [ scc.git] INFO Overriding base-branch from master to main 2024-07-11 00:48:42,720 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:43,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None 2024-07-11 00:48:43,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None 2024-07-11 00:48:44,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None 2024-07-11 00:48:44,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None 2024-07-11 00:48:45,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None 2024-07-11 00:48:45,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:48:46,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-07-11 00:48:46,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None 2024-07-11 00:48:47,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:48:47,358 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer' 2024-07-11 00:48:47,359 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:48:47,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr 2024-07-11 00:48:47,359 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:47,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:47,365 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main' 2024-07-11 00:48:47,372 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:48:47,372 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main' 2024-07-11 00:48:47,379 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main' 2024-07-11 00:48:47,387 [ scc.git] DEBUG Already up to date. 2024-07-11 00:48:47,387 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head' 2024-07-11 00:48:47,774 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr 2024-07-11 00:48:47,774 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD 2024-07-11 00:48:47,779 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:48:47,779 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:47,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:47,787 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8' 2024-07-11 00:48:47,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:47,802 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8' 2024-07-11 00:48:47,823 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py 2024-07-11 00:48:47,823 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py 2024-07-11 00:48:47,824 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-07-11 00:48:47,824 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-07-11 00:48:47,832 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94' 2024-07-11 00:48:47,840 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0 2024-07-11 00:48:48,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:48:48,078 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8' 2024-07-11 00:48:48,085 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94' 2024-07-11 00:48:48,092 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer' Conflicting PR. Removed from build [OMERO-plugins-push#118](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/consoleText) for more details. Possible conflicts: - Upstream changes - omero_web_zarr/urls.py --conflicts 2024-07-11 00:48:48,099 [ scc.config] DEBUG Found github.token 2024-07-11 00:48:48,099 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts. 2024-07-11 00:48:48,100 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:48,142 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:48,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:48,149 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:48,191 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:48,198 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:48,199 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-web-zarr Excluded PRs: - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft) Already up to date. Conflicting PRs (not included): - PR 10 will-moore 'Add Openwith -> itk-vtk viewer' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:48,208 [ scc.git] DEBUG [detached HEAD 58829a6] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:48,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:48,209 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:48,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2 2024-07-11 00:48:48,575 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:48:48,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror 2024-07-11 00:48:48,575 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:48,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:48,583 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:48:48,590 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:48:48,590 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:48:48,598 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:48:48,606 [ scc.git] DEBUG Already up to date. 2024-07-11 00:48:48,606 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:48:48,607 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:48,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:48,614 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:48,656 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:48,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:48,663 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:48,705 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:48,714 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:48,714 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: openmicroscopy/omero-weberror Already up to date. Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:48,725 [ scc.git] DEBUG [detached HEAD 18c0dc7] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:48,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:48,726 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:49,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2 2024-07-11 00:48:49,063 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:48:49,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest 2024-07-11 00:48:49,063 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:49,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:49,070 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:48:49,077 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:48:49,077 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:48:49,083 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:48:49,090 [ scc.git] DEBUG Already up to date. 2024-07-11 00:48:49,090 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:48:49,091 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:49,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:49,097 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:49,138 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:49,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:49,145 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:49,185 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:49,192 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:49,192 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: openmicroscopy/omero-webtest Already up to date. Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:49,202 [ scc.git] DEBUG [detached HEAD 5460667] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:49,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:49,203 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:49,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None 2024-07-11 00:48:50,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None 2024-07-11 00:48:50,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None 2024-07-11 00:48:51,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None 2024-07-11 00:48:51,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-07-11 00:48:52,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None 2024-07-11 00:48:52,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:48:52,864 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly' 2024-07-11 00:48:52,864 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:48:52,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway 2024-07-11 00:48:52,864 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:52,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:52,873 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-07-11 00:48:52,880 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:48:52,881 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-07-11 00:48:52,888 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-07-11 00:48:52,896 [ scc.git] DEBUG Already up to date. 2024-07-11 00:48:52,897 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head' 2024-07-11 00:48:53,372 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway 2024-07-11 00:48:53,373 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD 2024-07-11 00:48:53,378 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:48:53,378 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:53,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:53,385 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7' 2024-07-11 00:48:53,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:53,409 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7' 2024-07-11 00:48:53,448 [ scc.git] DEBUG Auto-merging Dockerfile 2024-07-11 00:48:53,448 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile 2024-07-11 00:48:53,449 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-07-11 00:48:53,449 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-07-11 00:48:53,456 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9' 2024-07-11 00:48:53,463 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2 2024-07-11 00:48:53,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:48:53,688 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7' 2024-07-11 00:48:53,695 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9' 2024-07-11 00:48:53,701 [ scc.git] INFO - PR 100 dominikl 'Run tests properly' Conflicting PR. Removed from build [OMERO-plugins-push#118](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/consoleText) for more details. Possible conflicts: - Upstream changes - Dockerfile --conflicts 2024-07-11 00:48:53,708 [ scc.config] DEBUG Found github.token 2024-07-11 00:48:53,708 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts. 2024-07-11 00:48:53,708 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:48:53,747 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:48:53,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:48:53,753 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:48:53,793 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:48:53,801 [ scc.git] DEBUG has no local changes 2024-07-11 00:48:53,801 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/rOMERO-gateway Already up to date. Conflicting PRs (not included): - PR 100 dominikl 'Run tests properly' Generated by OMERO-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:48:53,811 [ scc.git] DEBUG [detached HEAD aa39adc] merge master -Dorg -Ssuccess-only 2024-07-11 00:48:53,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:48:53,812 [ scc.git] INFO Overriding base-branch from master to develop 2024-07-11 00:48:53,812 [ scc.repo] DEBUG ## PRs found: 2024-07-11 00:48:54,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None 2024-07-11 00:48:54,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None 2024-07-11 00:48:55,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None 2024-07-11 00:48:55,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None 2024-07-11 00:48:56,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None 2024-07-11 00:48:56,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None 2024-07-11 00:48:57,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None 2024-07-11 00:48:58,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-07-11 00:48:58,588 [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-07-11 00:48:59,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None 2024-07-11 00:48:59,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2 2024-07-11 00:48:59,681 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-07-11 00:49:00,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None 2024-07-11 00:49:00,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None 2024-07-11 00:49:01,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None 2024-07-11 00:49:01,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None 2024-07-11 00:49:01,993 [ scc.repo] DEBUG ## Branches found: 2024-07-11 00:49:01,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts 2024-07-11 00:49:01,994 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:49:01,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:49:02,000 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop' 2024-07-11 00:49:02,005 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-07-11 00:49:02,005 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop' 2024-07-11 00:49:02,011 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop' 2024-07-11 00:49:02,018 [ scc.git] DEBUG Already up to date. 2024-07-11 00:49:02,018 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head' 2024-07-11 00:49:02,453 [ scc.git] DEBUG From https://github.com/ome/scripts 2024-07-11 00:49:02,453 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD 2024-07-11 00:49:02,458 [ scc.git] DEBUG ## Unique users: [] 2024-07-11 00:49:02,458 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:49:02,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:49:02,464 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-07-11 00:49:02,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:49:02,477 [ 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-07-11 00:49:02,548 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py 2024-07-11 00:49:02,548 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py 2024-07-11 00:49:02,548 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-07-11 00:49:02,549 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-07-11 00:49:02,555 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636' 2024-07-11 00:49:02,562 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking 2024-07-11 00:49:02,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:02,798 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19' 2024-07-11 00:49:02,805 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636' 2024-07-11 00:49:02,813 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' Conflicting PR. Removed from build [OMERO-plugins-push#118](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/consoleText) for more details. Possible conflicts: - Upstream changes - omero/annotation_scripts/KeyVal_to_csv.py --conflicts 2024-07-11 00:49:02,819 [ scc.config] DEBUG Found github.token 2024-07-11 00:49:02,819 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts. 2024-07-11 00:49:02,819 [ scc.git] DEBUG Calling 'git submodule update' 2024-07-11 00:49:02,861 [ scc.git] DEBUG Get sha1 of %s 2024-07-11 00:49:02,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-07-11 00:49:02,868 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:49:02,908 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:49:02,917 [ scc.git] DEBUG has no local changes 2024-07-11 00:49:02,918 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/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-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:49:02,929 [ scc.git] DEBUG [detached HEAD 91407ad] merge master -Dorg -Ssuccess-only 2024-07-11 00:49:02,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:02,930 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-07-11 00:49:03,008 [ scc.config] DEBUG Found submodule.minimal-omero-client.url 2024-07-11 00:49:03,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:03,224 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch 2024-07-11 00:49:03,229 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url 2024-07-11 00:49:03,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:03,715 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch 2024-07-11 00:49:03,720 [ scc.config] DEBUG Found submodule.omero-cli-render.url 2024-07-11 00:49:04,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:04,205 [ scc.config] DEBUG Found submodule.omero-cli-render.branch 2024-07-11 00:49:04,210 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url 2024-07-11 00:49:04,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:04,695 [ scc.config] DEBUG Found submodule.omero-figure.url 2024-07-11 00:49:05,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:05,178 [ scc.config] DEBUG Found submodule.omero-figure.branch 2024-07-11 00:49:05,187 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url 2024-07-11 00:49:05,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:05,633 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch 2024-07-11 00:49:05,639 [ scc.config] DEBUG Found submodule.omero-gallery.url 2024-07-11 00:49:06,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:06,112 [ scc.config] DEBUG Found submodule.omero-gallery.branch 2024-07-11 00:49:06,118 [ scc.config] DEBUG Found submodule.omero-iviewer.url 2024-07-11 00:49:06,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:06,608 [ scc.config] DEBUG Found submodule.omero-iviewer.branch 2024-07-11 00:49:06,615 [ scc.config] DEBUG Found submodule.omero-mapr.url 2024-07-11 00:49:07,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:07,095 [ scc.config] DEBUG Found submodule.omero-mapr.branch 2024-07-11 00:49:07,101 [ scc.config] DEBUG Found submodule.omero-metadata.url 2024-07-11 00:49:07,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:07,556 [ scc.config] DEBUG Found submodule.omero-metadata.branch 2024-07-11 00:49:07,562 [ scc.config] DEBUG Found submodule.omero-parade.url 2024-07-11 00:49:08,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:08,014 [ scc.config] DEBUG Found submodule.omero-parade.branch 2024-07-11 00:49:08,019 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url 2024-07-11 00:49:08,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:08,492 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch 2024-07-11 00:49:08,499 [ scc.config] DEBUG Found submodule.omero-rois.url 2024-07-11 00:49:09,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:09,067 [ scc.config] DEBUG Found submodule.omero-signup.url 2024-07-11 00:49:09,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:09,530 [ scc.config] DEBUG Found submodule.omero-test-infra.url 2024-07-11 00:49:09,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:09,994 [ scc.config] DEBUG Found submodule.omero-test-infra.branch 2024-07-11 00:49:09,998 [ scc.config] DEBUG Found submodule.omero-upload.url 2024-07-11 00:49:10,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:10,484 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url 2024-07-11 00:49:10,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:10,968 [ scc.config] DEBUG Found submodule.omero-web-zarr.url 2024-07-11 00:49:11,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:11,441 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch 2024-07-11 00:49:11,448 [ scc.config] DEBUG Found submodule.omero-weberror.url 2024-07-11 00:49:11,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:11,914 [ scc.config] DEBUG Found submodule.omero-weberror.branch 2024-07-11 00:49:11,920 [ scc.config] DEBUG Found submodule.omero-webtest.url 2024-07-11 00:49:12,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:12,385 [ scc.config] DEBUG Found submodule.omero-webtest.branch 2024-07-11 00:49:12,390 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url 2024-07-11 00:49:12,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:12,865 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch 2024-07-11 00:49:12,870 [ scc.config] DEBUG Found submodule.scripts.url 2024-07-11 00:49:13,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-07-11 00:49:13,344 [ scc.config] DEBUG Found submodule.scripts.branch 2024-07-11 00:49:13,345 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-07-11 00:49:13,434 [ scc.git] DEBUG has local changes 2024-07-11 00:49:13,434 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-plugins Already up to date. Repository: ome/minimal-omero-client Already up to date. Repository: ome/omero-cli-duplicate Excluded PRs: - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment) Already up to date. Merged PRs: - PR 25 jburel 'review message' Repository: ome/omero-cli-render Excluded PRs: - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft) - PR 54 dominikl 'Change rendering settings spec' (stage: draft) - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft) - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft) Already up to date. Merged PRs: - PR 59 will-moore 'Apply settings to Plate' - PR 63 sbesson 'Remove python-future dependency' - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition' Repository: ome/omero-cli-zarr Excluded PRs: - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft) Already up to date. Merged PRs: - PR 147 will-moore 'Name option' Conflicting PRs (not included): - PR 102 will-moore 'Zarr export tests' - PR 123 will-moore 'Support export of Fileset:ID' Repository: ome/omero-figure Excluded PRs: - PR 575 Tom-TBT 'Label sorting with drag and drop' (user: Tom-TBT) - PR 543 will-moore 'Plate well labels' (exclude comment) Already up to date. Merged PRs: - PR 549 will-moore 'Inset feature' - PR 555 will-moore 'Points in shape editor' - PR 560 will-moore 'Max projection bytes' - PR 568 will-moore 'Remove numpy from tests_require in setup.py' - PR 576 Rdornier 'Color picker - popup update' Conflicting PRs (not included): - PR 577 Rdornier 'Fill rois' Repository: ome/omero-fpbioimage Already up to date. Merged PRs: - PR 18 jburel 'default size z value' Repository: ome/omero-gallery Already up to date. Merged PRs: - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2' Repository: ome/omero-iviewer Excluded PRs: - PR 420 will-moore 'Add release process to README' (exclude comment) - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment) Already up to date. Merged PRs: - PR 460 will-moore 'Channel min spinner fix' - PR 465 will-moore 'Save as Figure' - PR 471 will-moore 'Z projection disabled tooltip' - PR 477 dependabot[bot] 'Bump ws and socket.io' - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5' Repository: ome/omero-mapr Excluded PRs: - PR 79 will-moore 'Right panel title' (exclude comment) Already up to date. Merged PRs: - PR 74 will-moore 'mapr extension of webclient' Repository: ome/omero-metadata Already up to date. Conflicting PRs (not included): - PR 55 kkoz 'Prevent users from creating columns with python keyword names' - PR 64 will-moore 'Support images_by_name for Screen and Plate' Repository: ome/omero-parade Excluded PRs: - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment) - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment) - PR 39 chris-allan 'Expand all for Screens' (exclude comment) Already up to date. Merged PRs: - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31' - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2' - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0' Repository: ome/omero-prometheus-tools Already up to date. Merged PRs: - PR 14 jburel 'use conda-forge channel' Repository: ome/omero-rois Excluded PRs: - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot]) Already up to date. Merged PRs: - PR 6 dominikl 'Add method to create masks grouped by label id' Repository: ome/omero-signup Already up to date. Conflicting PRs (not included): - PR 14 manics 'Add pre-commit (black, flake8)' Repository: openmicroscopy/omero-test-infra Already up to date. Merged PRs: - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra' Repository: ome/omero-upload Already up to date. Repository: ome/omero-virtual-microscope Already up to date. Repository: ome/omero-web-zarr Excluded PRs: - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft) Already up to date. Conflicting PRs (not included): - PR 10 will-moore 'Add Openwith -> itk-vtk viewer' Repository: openmicroscopy/omero-weberror Already up to date. Repository: openmicroscopy/omero-webtest Already up to date. Repository: ome/rOMERO-gateway Already up to date. Conflicting PRs (not included): - PR 100 dominikl 'Run tests properly' Repository: ome/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-plugins-push#118 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/118/)' 2024-07-11 00:49:13,451 [ scc.git] DEBUG [detached HEAD 5699771] merge master -Dorg -Ssuccess-only 2024-07-11 00:49:13,452 [ scc.merge] INFO Repository: ome/omero-plugins 2024-07-11 00:49:13,452 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-) 2024-07-11 00:49:13,452 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,452 [ scc.merge] INFO 2024-07-11 00:49:13,452 [ scc.merge] INFO 2024-07-11 00:49:13,452 [ scc.merge] INFO Repository: ome/minimal-omero-client 2024-07-11 00:49:13,452 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,452 [ scc.merge] INFO 2024-07-11 00:49:13,452 [ scc.merge] INFO 2024-07-11 00:49:13,452 [ scc.merge] INFO Repository: ome/omero-cli-duplicate 2024-07-11 00:49:13,452 [ scc.merge] INFO Excluded PRs: 2024-07-11 00:49:13,452 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment) 2024-07-11 00:49:13,452 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,452 [ scc.merge] INFO 2024-07-11 00:49:13,452 [ scc.merge] INFO Merged PRs: 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 25 jburel 'review message' 2024-07-11 00:49:13,453 [ scc.merge] INFO 2024-07-11 00:49:13,453 [ scc.merge] INFO Repository: ome/omero-cli-render 2024-07-11 00:49:13,453 [ scc.merge] INFO Excluded PRs: 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft) 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft) 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft) 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft) 2024-07-11 00:49:13,453 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,453 [ scc.merge] INFO 2024-07-11 00:49:13,453 [ scc.merge] INFO Merged PRs: 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate' 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency' 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition' 2024-07-11 00:49:13,453 [ scc.merge] INFO 2024-07-11 00:49:13,453 [ scc.merge] INFO Repository: ome/omero-cli-zarr 2024-07-11 00:49:13,453 [ scc.merge] INFO Excluded PRs: 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft) 2024-07-11 00:49:13,453 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,453 [ scc.merge] INFO 2024-07-11 00:49:13,453 [ scc.merge] INFO Merged PRs: 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 147 will-moore 'Name option' 2024-07-11 00:49:13,453 [ scc.merge] INFO 2024-07-11 00:49:13,453 [ scc.merge] INFO Conflicting PRs (not included): 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests' 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' 2024-07-11 00:49:13,453 [ scc.merge] INFO 2024-07-11 00:49:13,453 [ scc.merge] INFO Repository: ome/omero-figure 2024-07-11 00:49:13,453 [ scc.merge] INFO Excluded PRs: 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 575 Tom-TBT 'Label sorting with drag and drop' (user: Tom-TBT) 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment) 2024-07-11 00:49:13,453 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,453 [ scc.merge] INFO 2024-07-11 00:49:13,453 [ scc.merge] INFO Merged PRs: 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor' 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py' 2024-07-11 00:49:13,453 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update' 2024-07-11 00:49:13,454 [ scc.merge] INFO 2024-07-11 00:49:13,454 [ scc.merge] INFO Conflicting PRs (not included): 2024-07-11 00:49:13,454 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' 2024-07-11 00:49:13,454 [ scc.merge] INFO 2024-07-11 00:49:13,454 [ scc.merge] INFO Repository: ome/omero-fpbioimage 2024-07-11 00:49:13,454 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,454 [ scc.merge] INFO 2024-07-11 00:49:13,454 [ scc.merge] INFO Merged PRs: 2024-07-11 00:49:13,454 [ scc.merge] INFO - PR 18 jburel 'default size z value' 2024-07-11 00:49:13,454 [ scc.merge] INFO 2024-07-11 00:49:13,454 [ scc.merge] INFO Repository: ome/omero-gallery 2024-07-11 00:49:13,454 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,454 [ scc.merge] INFO 2024-07-11 00:49:13,454 [ scc.merge] INFO Merged PRs: 2024-07-11 00:49:13,454 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2' 2024-07-11 00:49:13,454 [ scc.merge] INFO 2024-07-11 00:49:13,454 [ scc.merge] INFO Repository: ome/omero-iviewer 2024-07-11 00:49:13,454 [ scc.merge] INFO Excluded PRs: 2024-07-11 00:49:13,454 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment) 2024-07-11 00:49:13,454 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment) 2024-07-11 00:49:13,454 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,454 [ scc.merge] INFO 2024-07-11 00:49:13,454 [ scc.merge] INFO Merged PRs: 2024-07-11 00:49:13,454 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix' 2024-07-11 00:49:13,454 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure' 2024-07-11 00:49:13,454 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip' 2024-07-11 00:49:13,454 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io' 2024-07-11 00:49:13,454 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5' 2024-07-11 00:49:13,454 [ scc.merge] INFO 2024-07-11 00:49:13,454 [ scc.merge] INFO Repository: ome/omero-mapr 2024-07-11 00:49:13,454 [ scc.merge] INFO Excluded PRs: 2024-07-11 00:49:13,454 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment) 2024-07-11 00:49:13,454 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,454 [ scc.merge] INFO 2024-07-11 00:49:13,454 [ scc.merge] INFO Merged PRs: 2024-07-11 00:49:13,454 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient' 2024-07-11 00:49:13,454 [ scc.merge] INFO 2024-07-11 00:49:13,454 [ scc.merge] INFO Repository: ome/omero-metadata 2024-07-11 00:49:13,454 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,454 [ scc.merge] INFO 2024-07-11 00:49:13,455 [ scc.merge] INFO Conflicting PRs (not included): 2024-07-11 00:49:13,455 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names' 2024-07-11 00:49:13,455 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate' 2024-07-11 00:49:13,455 [ scc.merge] INFO 2024-07-11 00:49:13,455 [ scc.merge] INFO Repository: ome/omero-parade 2024-07-11 00:49:13,455 [ scc.merge] INFO Excluded PRs: 2024-07-11 00:49:13,455 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment) 2024-07-11 00:49:13,455 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment) 2024-07-11 00:49:13,455 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment) 2024-07-11 00:49:13,455 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,455 [ scc.merge] INFO 2024-07-11 00:49:13,455 [ scc.merge] INFO Merged PRs: 2024-07-11 00:49:13,455 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31' 2024-07-11 00:49:13,455 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2' 2024-07-11 00:49:13,455 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0' 2024-07-11 00:49:13,455 [ scc.merge] INFO 2024-07-11 00:49:13,455 [ scc.merge] INFO Repository: ome/omero-prometheus-tools 2024-07-11 00:49:13,455 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,455 [ scc.merge] INFO 2024-07-11 00:49:13,455 [ scc.merge] INFO Merged PRs: 2024-07-11 00:49:13,455 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel' 2024-07-11 00:49:13,455 [ scc.merge] INFO 2024-07-11 00:49:13,455 [ scc.merge] INFO Repository: ome/omero-rois 2024-07-11 00:49:13,455 [ scc.merge] INFO Excluded PRs: 2024-07-11 00:49:13,455 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot]) 2024-07-11 00:49:13,455 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,455 [ scc.merge] INFO 2024-07-11 00:49:13,455 [ scc.merge] INFO Merged PRs: 2024-07-11 00:49:13,455 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id' 2024-07-11 00:49:13,455 [ scc.merge] INFO 2024-07-11 00:49:13,455 [ scc.merge] INFO Repository: ome/omero-signup 2024-07-11 00:49:13,455 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,455 [ scc.merge] INFO 2024-07-11 00:49:13,455 [ scc.merge] INFO Conflicting PRs (not included): 2024-07-11 00:49:13,455 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)' 2024-07-11 00:49:13,455 [ scc.merge] INFO 2024-07-11 00:49:13,455 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra 2024-07-11 00:49:13,455 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,455 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO Merged PRs: 2024-07-11 00:49:13,456 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra' 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO Repository: ome/omero-upload 2024-07-11 00:49:13,456 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO Repository: ome/omero-virtual-microscope 2024-07-11 00:49:13,456 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO Repository: ome/omero-web-zarr 2024-07-11 00:49:13,456 [ scc.merge] INFO Excluded PRs: 2024-07-11 00:49:13,456 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft) 2024-07-11 00:49:13,456 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO Conflicting PRs (not included): 2024-07-11 00:49:13,456 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer' 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror 2024-07-11 00:49:13,456 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest 2024-07-11 00:49:13,456 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO Repository: ome/rOMERO-gateway 2024-07-11 00:49:13,456 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO Conflicting PRs (not included): 2024-07-11 00:49:13,456 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly' 2024-07-11 00:49:13,456 [ scc.merge] INFO 2024-07-11 00:49:13,456 [ scc.merge] INFO Repository: ome/scripts 2024-07-11 00:49:13,456 [ scc.merge] INFO Excluded PRs: 2024-07-11 00:49:13,456 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT) 2024-07-11 00:49:13,456 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier) 2024-07-11 00:49:13,456 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn) 2024-07-11 00:49:13,456 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment) 2024-07-11 00:49:13,457 [ scc.merge] INFO Already up to date. 2024-07-11 00:49:13,457 [ scc.merge] INFO 2024-07-11 00:49:13,457 [ scc.merge] INFO Conflicting PRs (not included): 2024-07-11 00:49:13,457 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' 2024-07-11 00:49:13,457 [ scc.merge] INFO 2024-07-11 00:49:13,457 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-07-11 00:49:13,457 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client 2024-07-11 00:49:13,465 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate 2024-07-11 00:49:13,472 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render 2024-07-11 00:49:13,478 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr 2024-07-11 00:49:13,484 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure 2024-07-11 00:49:13,490 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage 2024-07-11 00:49:13,497 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery 2024-07-11 00:49:13,503 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,508 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,508 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer 2024-07-11 00:49:13,508 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr 2024-07-11 00:49:13,514 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata 2024-07-11 00:49:13,521 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade 2024-07-11 00:49:13,528 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools 2024-07-11 00:49:13,534 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois 2024-07-11 00:49:13,542 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup 2024-07-11 00:49:13,547 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra 2024-07-11 00:49:13,554 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload 2024-07-11 00:49:13,561 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope 2024-07-11 00:49:13,568 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr 2024-07-11 00:49:13,575 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror 2024-07-11 00:49:13,582 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest 2024-07-11 00:49:13,589 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway 2024-07-11 00:49:13,595 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push 2024-07-11 00:49:13,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts 2024-07-11 00:49:13,601 [ scc.git] DEBUG Calling 'git remote' 2024-07-11 00:49:13,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push Update component versions python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory WARNING: '' not a valid package name; please use only .-separated package names in setup.py WARNING: '' not a valid package name; please use only .-separated package names in setup.py WARNING: '' not a valid package name; please use only .-separated package names in setup.py WARNING: '' not a valid package name; please use only .-separated package names in setup.py WARNING: The wheel package is not available. WARNING: The wheel package is not available. WARNING: The wheel package is not available. WARNING: The wheel package is not available. WARNING: The wheel package is not available. WARNING: The wheel package is not available. /home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0' warnings.warn(tmpl.format(**locals())) /home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0' warnings.warn(tmpl.format(**locals())) python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory WARNING: '' not a valid package name; please use only .-separated package names in setup.py WARNING: '' not a valid package name; please use only .-separated package names in setup.py WARNING: '' not a valid package name; please use only .-separated package names in setup.py WARNING: '' not a valid package name; please use only .-separated package names in setup.py python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory WARNING: '' not a valid package name; please use only .-separated package names in setup.py WARNING: '' not a valid package name; please use only .-separated package names in setup.py python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory Updating omero-gateway from 5.9.1 to 5.9.2-SNAPSHOT grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Up-to-date: Up-to-date: Up-to-date: Commit all component version changes Entering 'minimal-omero-client' Entering 'omero-cli-duplicate' Entering 'omero-cli-render' Entering 'omero-cli-zarr' Entering 'omero-figure' Entering 'omero-fpbioimage' Entering 'omero-gallery' Entering 'omero-iviewer' Entering 'omero-mapr' Entering 'omero-metadata' Entering 'omero-parade' Entering 'omero-prometheus-tools' Entering 'omero-rois' Entering 'omero-signup' Entering 'omero-test-infra' Entering 'omero-upload' Entering 'omero-virtual-microscope' Entering 'omero-web-zarr' Entering 'omero-weberror' Entering 'omero-webtest' Entering 'rOMERO-gateway' Entering 'scripts' Entering 'minimal-omero-client' [detached HEAD 1e91257] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-cli-duplicate' HEAD detached from 027b3e6 nothing to commit, working tree clean Entering 'omero-cli-render' HEAD detached from 53e3f42 nothing to commit, working tree clean Entering 'omero-cli-zarr' HEAD detached from 9b73dd9 Untracked files: (use "git add ..." to include in what will be committed) .eggs/ nothing added to commit but untracked files present (use "git add" to track) Entering 'omero-figure' HEAD detached from 64566080 nothing to commit, working tree clean Entering 'omero-fpbioimage' HEAD detached from e5b3ca3 nothing to commit, working tree clean Entering 'omero-gallery' HEAD detached from 56f4435 nothing to commit, working tree clean Entering 'omero-iviewer' HEAD detached from a8f380f nothing to commit, working tree clean Entering 'omero-mapr' HEAD detached from 9631b15 nothing to commit, working tree clean Entering 'omero-metadata' HEAD detached from e2fc5ec nothing to commit, working tree clean Entering 'omero-parade' HEAD detached from 5d441c2 nothing to commit, working tree clean Entering 'omero-prometheus-tools' HEAD detached from 18bccb6 nothing to commit, working tree clean Entering 'omero-rois' HEAD detached from 5c752d5 nothing to commit, working tree clean Entering 'omero-signup' HEAD detached from c8610db nothing to commit, working tree clean Entering 'omero-test-infra' HEAD detached from cda3ec6 nothing to commit, working tree clean Entering 'omero-upload' HEAD detached from aca9e9c nothing to commit, working tree clean Entering 'omero-virtual-microscope' HEAD detached from deab817 nothing to commit, working tree clean Entering 'omero-web-zarr' HEAD detached from 67bb245 nothing to commit, working tree clean Entering 'omero-weberror' HEAD detached from adfa132 nothing to commit, working tree clean Entering 'omero-webtest' HEAD detached from 8da48e1 nothing to commit, working tree clean Entering 'rOMERO-gateway' HEAD detached from 7b5d64d nothing to commit, working tree clean Entering 'scripts' HEAD detached from c20d273 nothing to commit, working tree clean [detached HEAD 2657ec6] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919 2024-07-11 00:50:01,293 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919 Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425 2024-07-11 00:50:10,300 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425 Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383 2024-07-11 00:50:12,676 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383 Following Github server redirection from /repos/ome/scripts to /repositories/4865545 2024-07-11 00:50:17,315 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545 2024-07-11 00:51:09,771 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci [Pipeline] archiveArtifacts Archiving artifacts [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline Finished: SUCCESS