Started by upstream project "Trigger" build number 215
originally caused by:
Started by timer
[Pipeline] Start of Pipeline
[Pipeline] node
Running on testintegration in /home/omero/workspace/OMERO-python-superbuild-push
[Pipeline] {
[Pipeline] library
Loading library recursiveMerge@master
Attempting to resolve master from remote references...
> git --version # timeout=10
> git --version # 'git version 2.39.2'
> git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10
Found match: refs/heads/master revision f061dff15033c5cd55249a383f52c15ca4a0e5cf
The recommended git tool is: NONE
No credentials specified
> git rev-parse --resolve-git-dir /var/jenkins_home/jobs/OMERO-python-superbuild-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10
Fetching changes from the remote Git repository
> git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10
Fetching without tags
Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git
> git --version # timeout=10
> git --version # 'git version 2.39.2'
> git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10
Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master)
> git config core.sparsecheckout # timeout=10
> git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10
Commit message: "Merge pull request #17 from jburel/python3"
> git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10
[Pipeline] checkout
The recommended git tool is: NONE
No credentials specified
Fetching changes from the remote Git repository
Checking out Revision e849d7220735d67c4a474051cc03805d0a822cde (refs/remotes/origin/master)
> git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-python-superbuild-push/.git # timeout=10
> git config remote.origin.url https://github.com/ome/omero-python-superbuild.git # timeout=10
Fetching upstream changes from https://github.com/ome/omero-python-superbuild.git
> git --version # timeout=10
> git --version # 'git version 2.39.3'
> git fetch --tags --force --progress -- https://github.com/ome/omero-python-superbuild.git +refs/heads/*:refs/remotes/origin/* # timeout=10
> git rev-parse refs/remotes/origin/master^{commit} # timeout=10
> git config core.sparsecheckout # timeout=10
> git checkout -f e849d7220735d67c4a474051cc03805d0a822cde # timeout=10
Commit message: "Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1"
> git rev-list --no-walk e849d7220735d67c4a474051cc03805d0a822cde # timeout=10
Cleaning workspace
> git rev-parse --verify HEAD # timeout=10
Resetting working tree
> git reset --hard # timeout=10
> git clean -fdx # timeout=10
> git submodule foreach --recursive git reset --hard # timeout=10
> git submodule foreach --recursive git clean -fdx # timeout=10
> git remote # timeout=10
> git submodule init # timeout=10
> git submodule sync # timeout=10
> git config --get remote.origin.url # timeout=10
> git submodule init # timeout=10
> git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10
> git config --get submodule.omero-py.url # timeout=10
> git config -f .gitmodules --get submodule.omero-py.path # timeout=10
> git config --get submodule.omero-web.url # timeout=10
> git config -f .gitmodules --get submodule.omero-web.path # timeout=10
> git config --get submodule.omero-marshal.url # timeout=10
> git config -f .gitmodules --get submodule.omero-marshal.path # timeout=10
> git config --get submodule.omero-dropbox.url # timeout=10
> git config -f .gitmodules --get submodule.omero-dropbox.path # timeout=10
> git config --get submodule.omero-scripts.url # timeout=10
> git config -f .gitmodules --get submodule.omero-scripts.path # timeout=10
> git submodule update --init --recursive omero-py # timeout=10
> git submodule update --init --recursive omero-web # timeout=10
[Pipeline] pwd
[Pipeline] copyArtifacts
Copied 1 artifact from "OMERO-build-push" build number 187
[Pipeline] sh
> git submodule update --init --recursive omero-marshal # timeout=10
> git submodule update --init --recursive omero-dropbox # timeout=10
> git submodule update --init --recursive omero-scripts # timeout=10
+ pushd build
~/workspace/OMERO-python-superbuild-push/build ~/workspace/OMERO-python-superbuild-push
+ curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz
+ tar -zxf -
+ popd
~/workspace/OMERO-python-superbuild-push
+ python3 -m venv build/venv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ python3 -m pip install -U pip
Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3)
Collecting pip
Using cached pip-24.2-py3-none-any.whl (1.8 MB)
Installing collected packages: pip
Attempting uninstall: pip
Found existing installation: pip 21.2.3
Uninstalling pip-21.2.3:
Successfully uninstalled pip-21.2.3
Successfully installed pip-24.2
+ python3 -m pip install scc
Collecting scc
Using cached scc-0.20.0-py3-none-any.whl.metadata (3.6 kB)
Collecting PyGithub>=1.54 (from scc)
Using cached PyGithub-2.4.0-py3-none-any.whl.metadata (3.9 kB)
Collecting PyYAML>=5.1 (from scc)
Using cached PyYAML-6.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.1 kB)
Collecting future (from scc)
Using cached future-1.0.0-py3-none-any.whl.metadata (4.0 kB)
Collecting ruamel.yaml (from scc)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl.metadata (23 kB)
Collecting ruamel.yaml.jinja2 (from scc)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl.metadata (2.9 kB)
Collecting six (from scc)
Using cached six-1.16.0-py2.py3-none-any.whl.metadata (1.8 kB)
Collecting urllib3<2 (from scc)
Using cached urllib3-1.26.20-py2.py3-none-any.whl.metadata (50 kB)
Collecting yaclifw<0.3,>=0.2.0 (from scc)
Using cached yaclifw-0.2.0-py3-none-any.whl
Collecting pynacl>=1.4.0 (from PyGithub>=1.54->scc)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl.metadata (8.6 kB)
Collecting requests>=2.14.0 (from PyGithub>=1.54->scc)
Using cached requests-2.32.3-py3-none-any.whl.metadata (4.6 kB)
Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached PyJWT-2.9.0-py3-none-any.whl.metadata (3.0 kB)
Collecting typing-extensions>=4.0.0 (from PyGithub>=1.54->scc)
Using cached typing_extensions-4.12.2-py3-none-any.whl.metadata (3.0 kB)
Collecting Deprecated (from PyGithub>=1.54->scc)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl.metadata (5.4 kB)
Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl.metadata (2.2 kB)
Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached cryptography-43.0.1-cp39-abi3-manylinux_2_28_x86_64.whl.metadata (5.4 kB)
Collecting cffi>=1.4.1 (from pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached cffi-1.17.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (1.5 kB)
Collecting charset-normalizer<4,>=2 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (33 kB)
Collecting idna<4,>=2.5 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached idna-3.10-py3-none-any.whl.metadata (10 kB)
Collecting certifi>=2017.4.17 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached certifi-2024.8.30-py3-none-any.whl.metadata (2.2 kB)
Collecting wrapt<2,>=1.10 (from Deprecated->PyGithub>=1.54->scc)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (6.6 kB)
Collecting pycparser (from cffi>=1.4.1->pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached pycparser-2.22-py3-none-any.whl.metadata (943 bytes)
Using cached scc-0.20.0-py3-none-any.whl (48 kB)
Using cached PyGithub-2.4.0-py3-none-any.whl (362 kB)
Using cached PyYAML-6.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (737 kB)
Using cached urllib3-1.26.20-py2.py3-none-any.whl (144 kB)
Using cached future-1.0.0-py3-none-any.whl (491 kB)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl (117 kB)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB)
Using cached six-1.16.0-py2.py3-none-any.whl (11 kB)
Using cached PyJWT-2.9.0-py3-none-any.whl (22 kB)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl (856 kB)
Using cached requests-2.32.3-py3-none-any.whl (64 kB)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl (562 kB)
Using cached typing_extensions-4.12.2-py3-none-any.whl (37 kB)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl (9.6 kB)
Using cached certifi-2024.8.30-py3-none-any.whl (167 kB)
Using cached cffi-1.17.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (445 kB)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (142 kB)
Using cached cryptography-43.0.1-cp39-abi3-manylinux_2_28_x86_64.whl (4.0 MB)
Using cached idna-3.10-py3-none-any.whl (70 kB)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (80 kB)
Using cached pycparser-2.22-py3-none-any.whl (117 kB)
Installing collected packages: wrapt, urllib3, typing-extensions, six, ruamel.yaml.clib, PyYAML, pyjwt, pycparser, idna, future, charset-normalizer, certifi, yaclifw, ruamel.yaml, requests, Deprecated, cffi, ruamel.yaml.jinja2, pynacl, cryptography, PyGithub, scc
Successfully installed Deprecated-1.2.14 PyGithub-2.4.0 PyYAML-6.0.2 certifi-2024.8.30 cffi-1.17.1 charset-normalizer-3.3.2 cryptography-43.0.1 future-1.0.0 idna-3.10 pycparser-2.22 pyjwt-2.9.0 pynacl-1.5.0 requests-2.32.3 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.8 ruamel.yaml.jinja2-0.2.7 scc-0.20.0 six-1.16.0 typing-extensions-4.12.2 urllib3-1.26.20 wrapt-1.16.0 yaclifw-0.2.0
[Pipeline] sh
+ export BASE_REPO=omero-python-superbuild.git
+ BASE_REPO=omero-python-superbuild.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-09-19 00:34:42,054 [ scc.config] DEBUG Found github.token
2024-09-19 00:34:42,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-19 00:34:42,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:34:42,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:34:43,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-19 00:34:43,024 [ scc.gh] DEBUG 4370 remaining from 5000 (Reset at 00:09
2024-09-19 00:34:43,024 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-19 00:34:43,029 [ scc.git] DEBUG Check current status
2024-09-19 00:34:43,030 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-19 00:34:43,034 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-09-19 00:34:43,034 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-19 00:34:43,072 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-19 00:34:43,074 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-19 00:34:43,078 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-19 00:34:43,082 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-19 00:34:43,085 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-09-19 00:34:43,089 [ scc.config] DEBUG Found remote.origin.url
2024-09-19 00:34:43,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-19 00:34:43,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-19 00:34:44,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-19 00:34:44,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-19 00:34:45,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-19 00:34:45,194 [ scc.git] DEBUG Resetting...
2024-09-19 00:34:45,194 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-19 00:34:45,201 [ scc.git] DEBUG HEAD is now at e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-09-19 00:34:45,201 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-19 00:34:45,256 [ scc.git] DEBUG Check current status
2024-09-19 00:34:45,257 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-19 00:34:45,261 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-09-19 00:34:45,261 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-19 00:34:45,304 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-19 00:34:45,307 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-19 00:34:45,311 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-19 00:34:45,316 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-19 00:34:45,319 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-09-19 00:34:45,320 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-19 00:34:45,320 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-19 00:34:45,320 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-19 00:34:45,320 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-19 00:34:45,320 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-19 00:34:45,320 [ scc.repo] DEBUG ## PRs found:
2024-09-19 00:34:45,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-19 00:34:46,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-09-19 00:34:46,128 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-19 00:34:46,129 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-09-19 00:34:46,129 [ scc.repo] DEBUG ## Branches found:
2024-09-19 00:34:46,129 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:34:46,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:34:46,133 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-19 00:34:46,136 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-19 00:34:46,137 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-19 00:34:46,141 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-19 00:34:46,145 [ scc.git] DEBUG Already up to date.
2024-09-19 00:34:46,145 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-09-19 00:34:46,494 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-19 00:34:46,494 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-09-19 00:34:46,499 [ scc.git] DEBUG ## Unique users: []
2024-09-19 00:34:46,499 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:34:46,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:34:46,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-09-19 00:34:46,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:34:46,548 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 293 (Bump omero-py from `749a68a` to `4fd72ef`) 9660559833988d271074de56e54f2462a7be74e9'
2024-09-19 00:34:46,557 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:34:46,559 [ scc.git] DEBUG omero-py | 2 +-
2024-09-19 00:34:46,559 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-19 00:34:46,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:34:46,692 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-19 00:34:46,909 [ scc.git] DEBUG Submodule path 'omero-py': checked out '4fd72efaa8cdbec9da98e1d28678af16878a86ba'
2024-09-19 00:34:46,909 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:34:46,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:34:46,913 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-19 00:34:47,782 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff0a4f96e50> has no local changes
2024-09-19 00:34:47,783 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
Generated by OMERO-python-superbuild-push#178 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/178/)'
2024-09-19 00:34:47,809 [ scc.git] DEBUG [detached HEAD 0e14359] merge master -Dorg -Snone
2024-09-19 00:34:47,810 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-19 00:34:47,810 [ scc.merge] INFO Already up to date.
2024-09-19 00:34:47,810 [ scc.merge] INFO
2024-09-19 00:34:47,810 [ scc.merge] INFO Merged PRs:
2024-09-19 00:34:47,810 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-09-19 00:34:47,810 [ scc.merge] INFO
2024-09-19 00:34:47,810 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-19 00:34:47,810 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-09-19 00:34:50,109 [ scc.config] DEBUG Found github.token
2024-09-19 00:34:50,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-19 00:34:50,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:34:50,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:34:51,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-19 00:34:51,061 [ scc.gh] DEBUG 4360 remaining from 5000 (Reset at 00:09
2024-09-19 00:34:51,062 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-19 00:34:51,066 [ scc.git] DEBUG Check current status
2024-09-19 00:34:51,067 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-19 00:34:51,071 [ scc.git] DEBUG 0e14359 merge master -Dorg -Snone
2024-09-19 00:34:51,071 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-19 00:34:51,111 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-19 00:34:51,114 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-19 00:34:51,118 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-09-19 00:34:51,121 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-19 00:34:51,124 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-09-19 00:34:51,129 [ scc.config] DEBUG Found remote.origin.url
2024-09-19 00:34:51,130 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-09-19 00:34:51,132 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-09-19 00:34:51,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-19 00:34:51,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-19 00:34:52,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-19 00:34:52,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-19 00:34:53,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-19 00:34:53,184 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-19 00:34:53,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-19 00:34:53,230 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-19 00:34:53,234 [ scc.git] DEBUG Check current status
2024-09-19 00:34:53,234 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-19 00:34:53,239 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-09-19 00:34:53,239 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-19 00:34:53,284 [ scc.config] DEBUG Found remote.origin.url
2024-09-19 00:34:53,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-09-19 00:34:54,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-19 00:34:54,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-19 00:34:54,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-19 00:34:55,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-19 00:34:55,363 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-19 00:34:55,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:34:55,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-19 00:34:55,406 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-19 00:34:55,411 [ scc.git] DEBUG Check current status
2024-09-19 00:34:55,411 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-19 00:34:55,415 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-09-19 00:34:55,415 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-19 00:34:55,457 [ scc.config] DEBUG Found remote.origin.url
2024-09-19 00:34:55,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-09-19 00:34:56,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-19 00:34:56,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-19 00:34:57,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-19 00:34:57,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-19 00:34:57,532 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-19 00:34:57,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:34:57,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-19 00:34:57,577 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-19 00:34:57,580 [ scc.git] DEBUG Check current status
2024-09-19 00:34:57,581 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-19 00:34:57,590 [ scc.git] DEBUG 4fd72efa Bump version: 5.19.5 → 5.19.6.dev0
2024-09-19 00:34:57,591 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-19 00:34:57,635 [ scc.config] DEBUG Found remote.origin.url
2024-09-19 00:34:57,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-09-19 00:34:58,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-19 00:34:58,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-19 00:34:59,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-19 00:34:59,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-19 00:34:59,670 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-19 00:34:59,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:34:59,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-19 00:34:59,715 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-19 00:34:59,719 [ scc.git] DEBUG Check current status
2024-09-19 00:34:59,719 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-19 00:34:59,725 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-19 00:34:59,725 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-19 00:34:59,768 [ scc.config] DEBUG Found remote.origin.url
2024-09-19 00:34:59,769 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-09-19 00:35:00,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-09-19 00:35:00,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-19 00:35:01,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-19 00:35:01,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-19 00:35:01,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-19 00:35:01,830 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-19 00:35:01,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:35:01,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-19 00:35:01,876 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-19 00:35:01,880 [ scc.git] DEBUG Check current status
2024-09-19 00:35:01,881 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-19 00:35:01,897 [ scc.git] DEBUG da5b7d11f Bump version: 5.27.2 → 5.27.3.dev0
2024-09-19 00:35:01,897 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-19 00:35:01,943 [ scc.config] DEBUG Found remote.origin.url
2024-09-19 00:35:02,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-09-19 00:35:02,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-19 00:35:03,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-19 00:35:03,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-19 00:35:03,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-19 00:35:03,977 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-19 00:35:04,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:35:04,021 [ scc.git] DEBUG Resetting...
2024-09-19 00:35:04,021 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-19 00:35:04,027 [ scc.git] DEBUG HEAD is now at 0e14359 merge master -Dorg -Snone
2024-09-19 00:35:04,027 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-19 00:35:04,085 [ scc.git] DEBUG Check current status
2024-09-19 00:35:04,085 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-19 00:35:04,089 [ scc.git] DEBUG 0e14359 merge master -Dorg -Snone
2024-09-19 00:35:04,090 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-19 00:35:04,131 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-19 00:35:04,134 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-19 00:35:04,138 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-09-19 00:35:04,142 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-19 00:35:04,145 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-09-19 00:35:04,146 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-19 00:35:04,146 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-19 00:35:04,146 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-19 00:35:04,146 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-19 00:35:04,146 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-19 00:35:04,146 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-09-19 00:35:04,146 [ scc.repo] DEBUG ## PRs found:
2024-09-19 00:35:04,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-19 00:35:04,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-09-19 00:35:04,911 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-19 00:35:05,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-09-19 00:35:05,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:06,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-09-19 00:35:06,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/9660559833988d271074de56e54f2462a7be74e9?per_page=1 HTTP/1.1" 200 2
2024-09-19 00:35:06,905 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-09-19 00:35:06,905 [ scc.repo] DEBUG ## Branches found:
2024-09-19 00:35:06,906 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:35:06,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:06,910 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-19 00:35:06,913 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-19 00:35:06,913 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-19 00:35:06,918 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-19 00:35:06,924 [ scc.git] DEBUG Already up to date.
2024-09-19 00:35:06,925 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-09-19 00:35:07,247 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-19 00:35:07,247 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-09-19 00:35:07,253 [ scc.git] DEBUG ## Unique users: []
2024-09-19 00:35:07,253 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:35:07,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:07,258 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-09-19 00:35:07,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:07,267 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 293 (Bump omero-py from `749a68a` to `4fd72ef`) 9660559833988d271074de56e54f2462a7be74e9'
2024-09-19 00:35:07,273 [ scc.git] DEBUG Already up to date.
2024-09-19 00:35:07,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:35:07,409 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-19 00:35:07,452 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:35:07,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:07,458 [ scc.repo] DEBUG ## PRs found:
2024-09-19 00:35:07,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-09-19 00:35:08,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-09-19 00:35:08,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-09-19 00:35:09,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-19 00:35:09,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:10,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-19 00:35:10,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-09-19 00:35:10,744 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-19 00:35:10,744 [ scc.repo] DEBUG ## Branches found:
2024-09-19 00:35:10,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-19 00:35:10,744 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:35:10,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:10,749 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-19 00:35:10,753 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-19 00:35:10,753 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-19 00:35:10,758 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-19 00:35:10,762 [ scc.git] DEBUG Already up to date.
2024-09-19 00:35:10,762 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-09-19 00:35:11,151 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-09-19 00:35:11,152 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-09-19 00:35:11,157 [ scc.git] DEBUG ## Unique users: []
2024-09-19 00:35:11,157 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:35:11,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:11,161 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-09-19 00:35:11,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:11,172 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-09-19 00:35:11,435 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-09-19 00:35:11,435 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-09-19 00:35:11,435 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-09-19 00:35:11,435 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-09-19 00:35:11,435 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-09-19 00:35:11,435 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-09-19 00:35:11,435 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-09-19 00:35:11,436 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-09-19 00:35:11,436 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-09-19 00:35:11,436 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:35:11,440 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-09-19 00:35:11,440 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-09-19 00:35:11,440 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-09-19 00:35:11,440 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-09-19 00:35:11,440 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-09-19 00:35:11,440 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-09-19 00:35:11,441 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-09-19 00:35:11,441 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-09-19 00:35:11,441 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-09-19 00:35:11,441 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-09-19 00:35:11,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:35:11,572 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-19 00:35:11,614 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:35:11,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:11,620 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-19 00:35:11,662 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-19 00:35:11,669 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe9266e2700> has no local changes
2024-09-19 00:35:11,669 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Generated by OMERO-python-superbuild-push#178 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/178/)'
2024-09-19 00:35:11,680 [ scc.git] DEBUG [detached HEAD fdb41bb] merge master -Dorg -Ssuccess-only
2024-09-19 00:35:11,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:35:11,681 [ scc.repo] DEBUG ## PRs found:
2024-09-19 00:35:12,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-09-19 00:35:12,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-09-19 00:35:13,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-09-19 00:35:13,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-19 00:35:14,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:14,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-19 00:35:15,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-09-19 00:35:15,017 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-19 00:35:15,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-09-19 00:35:15,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-09-19 00:35:16,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-09-19 00:35:16,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-09-19 00:35:16,835 [ scc.repo] DEBUG ## Branches found:
2024-09-19 00:35:16,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-19 00:35:16,835 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:35:16,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:16,840 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-19 00:35:16,844 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-19 00:35:16,844 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-19 00:35:16,849 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-19 00:35:16,854 [ scc.git] DEBUG Already up to date.
2024-09-19 00:35:16,854 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-09-19 00:35:17,194 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-09-19 00:35:17,195 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-09-19 00:35:17,199 [ scc.git] DEBUG ## Unique users: []
2024-09-19 00:35:17,199 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:35:17,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:17,204 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-19 00:35:17,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:17,219 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-19 00:35:17,230 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-09-19 00:35:17,231 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:35:17,233 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-09-19 00:35:17,233 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-09-19 00:35:17,233 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-09-19 00:35:17,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:35:17,371 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-19 00:35:17,415 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:35:17,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:17,421 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-19 00:35:17,466 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-19 00:35:17,472 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe9255cd730> has no local changes
2024-09-19 00:35:17,473 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Generated by OMERO-python-superbuild-push#178 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/178/)'
2024-09-19 00:35:17,483 [ scc.git] DEBUG [detached HEAD 08ac321] merge master -Dorg -Ssuccess-only
2024-09-19 00:35:17,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:35:17,484 [ scc.repo] DEBUG ## PRs found:
2024-09-19 00:35:18,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-09-19 00:35:18,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-09-19 00:35:19,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-09-19 00:35:19,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-09-19 00:35:19,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-09-19 00:35:20,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-19 00:35:21,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:21,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-19 00:35:22,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-19 00:35:22,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:22,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-19 00:35:23,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-09-19 00:35:23,237 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-09-19 00:35:23,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-09-19 00:35:24,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-09-19 00:35:24,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-09-19 00:35:25,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:25,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-19 00:35:26,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-09-19 00:35:26,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-19 00:35:27,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:27,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-19 00:35:27,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-19 00:35:28,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:28,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-19 00:35:29,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-09-19 00:35:29,258 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-09-19 00:35:29,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-09-19 00:35:29,689 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-09-19 00:35:30,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-09-19 00:35:30,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-09-19 00:35:31,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-19 00:35:31,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:31,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-19 00:35:32,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-09-19 00:35:32,405 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-19 00:35:32,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-09-19 00:35:33,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-09-19 00:35:33,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-19 00:35:34,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:34,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-19 00:35:35,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-19 00:35:35,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:36,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-19 00:35:36,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-09-19 00:35:36,465 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-09-19 00:35:36,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-09-19 00:35:37,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-09-19 00:35:37,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-09-19 00:35:38,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-09-19 00:35:38,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-19 00:35:39,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:39,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-19 00:35:40,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-09-19 00:35:40,141 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-19 00:35:40,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-09-19 00:35:41,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-19 00:35:41,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:42,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-19 00:35:42,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-09-19 00:35:42,459 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-19 00:35:42,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-09-19 00:35:43,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-09-19 00:35:44,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-19 00:35:44,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:45,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-19 00:35:45,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-09-19 00:35:45,438 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-19 00:35:45,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-09-19 00:35:46,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-09-19 00:35:46,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-19 00:35:47,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:35:47,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-19 00:35:48,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-09-19 00:35:48,264 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-09-19 00:35:48,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-09-19 00:35:49,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-09-19 00:35:49,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-09-19 00:35:50,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-09-19 00:35:50,055 [ scc.repo] DEBUG ## Branches found:
2024-09-19 00:35:50,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-19 00:35:50,055 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:35:50,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:50,061 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-19 00:35:50,065 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-19 00:35:50,065 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-19 00:35:50,071 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-19 00:35:50,076 [ scc.git] DEBUG Already up to date.
2024-09-19 00:35:50,076 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-09-19 00:35:51,727 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-19 00:35:51,728 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-09-19 00:35:51,737 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-09-19 00:35:52,039 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-19 00:35:52,040 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-09-19 00:35:52,045 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-09-19 00:35:52,435 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-19 00:35:52,435 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-09-19 00:35:52,440 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-09-19 00:35:52,753 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-19 00:35:52,753 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-09-19 00:35:52,759 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-09-19 00:35:53,126 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-19 00:35:53,127 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-09-19 00:35:53,132 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-09-19 00:35:53,466 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-19 00:35:53,466 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-09-19 00:35:53,472 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-09-19 00:35:53,794 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-19 00:35:53,794 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-09-19 00:35:53,799 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-09-19 00:35:54,251 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-19 00:35:54,252 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-09-19 00:35:54,257 [ scc.git] DEBUG ## Unique users: []
2024-09-19 00:35:54,258 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:35:54,258 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:54,262 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-19 00:35:54,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:54,277 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-19 00:35:54,386 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-09-19 00:35:54,387 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-09-19 00:35:54,388 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:35:54,393 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-09-19 00:35:54,393 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-09-19 00:35:54,393 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-09-19 00:35:54,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:35:54,526 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-19 00:35:54,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:54,545 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-19 00:35:54,907 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-19 00:35:54,907 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-09-19 00:35:54,908 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:35:54,917 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-09-19 00:35:54,917 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-09-19 00:35:54,917 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-09-19 00:35:55,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:35:55,053 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-09-19 00:35:55,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:55,079 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-09-19 00:35:55,104 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-09-19 00:35:55,105 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:35:55,109 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-09-19 00:35:55,109 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-09-19 00:35:55,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:35:55,437 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-09-19 00:35:55,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:55,458 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2024-09-19 00:35:55,569 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-09-19 00:35:55,570 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-09-19 00:35:55,571 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:35:55,577 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-09-19 00:35:55,578 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-09-19 00:35:55,578 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-09-19 00:35:55,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:35:55,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-19 00:35:55,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:55,843 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-19 00:35:55,864 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:35:55,868 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-09-19 00:35:55,869 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-09-19 00:35:55,869 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-09-19 00:35:55,869 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-09-19 00:35:55,869 [ scc.git] DEBUG create mode 100644 connect.py
2024-09-19 00:35:56,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:35:56,211 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-09-19 00:35:56,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:56,235 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-09-19 00:35:56,351 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-09-19 00:35:56,353 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:35:56,356 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-09-19 00:35:56,356 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-19 00:35:56,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:35:56,588 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-09-19 00:35:56,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:56,609 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-09-19 00:35:57,141 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-09-19 00:35:57,141 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:35:57,145 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-09-19 00:35:57,145 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-09-19 00:35:57,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:35:57,325 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-19 00:35:57,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:57,354 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-19 00:35:57,499 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-19 00:35:57,500 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:35:57,513 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-09-19 00:35:57,513 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-09-19 00:35:57,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:35:57,708 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-19 00:35:57,771 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:35:57,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:35:57,777 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-19 00:35:57,838 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-19 00:35:57,849 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe9255cd5b0> has no local changes
2024-09-19 00:35:57,849 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
- PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
Generated by OMERO-python-superbuild-push#178 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/178/)'
2024-09-19 00:35:57,866 [ scc.git] DEBUG [detached HEAD 06c8f22e] merge master -Dorg -Ssuccess-only
2024-09-19 00:35:57,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:35:57,867 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-19 00:35:57,867 [ scc.repo] DEBUG ## PRs found:
2024-09-19 00:35:58,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-19 00:35:58,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-09-19 00:35:59,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-09-19 00:35:59,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:36:00,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-19 00:36:00,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-09-19 00:36:01,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-09-19 00:36:01,252 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-09-19 00:36:01,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-19 00:36:02,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-19 00:36:02,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-19 00:36:03,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-19 00:36:03,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-19 00:36:04,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-19 00:36:04,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-19 00:36:04,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:36:05,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-19 00:36:05,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-09-19 00:36:05,904 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-19 00:36:06,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-19 00:36:06,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-19 00:36:07,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-19 00:36:07,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-19 00:36:07,864 [ scc.repo] DEBUG ## Branches found:
2024-09-19 00:36:07,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-19 00:36:07,865 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:36:07,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:36:07,871 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-19 00:36:07,876 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-19 00:36:07,876 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-19 00:36:07,882 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-19 00:36:07,888 [ scc.git] DEBUG Already up to date.
2024-09-19 00:36:07,888 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-19 00:36:08,316 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-09-19 00:36:08,317 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-19 00:36:08,322 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-09-19 00:36:08,768 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-09-19 00:36:08,768 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-09-19 00:36:08,775 [ scc.git] DEBUG ## Unique users: []
2024-09-19 00:36:08,776 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:36:08,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:36:08,783 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-19 00:36:08,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:36:08,798 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-19 00:36:08,931 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-19 00:36:08,931 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-19 00:36:08,932 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-19 00:36:08,932 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-19 00:36:08,938 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-19 00:36:08,945 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-19 00:36:09,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:36:09,087 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-19 00:36:09,095 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-19 00:36:09,100 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#178](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/178/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/178/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-19 00:36:09,106 [ scc.config] DEBUG Found github.token
2024-09-19 00:36:09,107 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-19 00:36:09,107 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-09-19 00:36:09,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:36:09,123 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-09-19 00:36:09,200 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:36:09,204 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-09-19 00:36:09,204 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-09-19 00:36:09,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:36:09,478 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-19 00:36:09,523 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:36:09,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:36:09,528 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-19 00:36:09,571 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-19 00:36:09,578 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe925616c40> has no local changes
2024-09-19 00:36:09,579 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-python-superbuild-push#178 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/178/)'
2024-09-19 00:36:09,589 [ scc.git] DEBUG [detached HEAD 0794f77] merge master -Dorg -Ssuccess-only
2024-09-19 00:36:09,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:36:09,590 [ scc.repo] DEBUG ## PRs found:
2024-09-19 00:36:10,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-09-19 00:36:10,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581 HTTP/1.1" 200 None
2024-09-19 00:36:10,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581/comments HTTP/1.1" 200 None
2024-09-19 00:36:11,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/580 HTTP/1.1" 200 None
2024-09-19 00:36:11,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc HTTP/1.1" 200 None
2024-09-19 00:36:12,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:36:12,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-19 00:36:13,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc HTTP/1.1" 200 None
2024-09-19 00:36:13,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc?per_page=1 HTTP/1.1" 200 None
2024-09-19 00:36:14,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc HTTP/1.1" 200 None
2024-09-19 00:36:14,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc/status HTTP/1.1" 200 None
2024-09-19 00:36:14,576 [ scc.repo] DEBUG - PR 580 sbesson 'omeroweb.webgateway.obj_id_bitmask: handle empty query results'
2024-09-19 00:36:15,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-09-19 00:36:15,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-09-19 00:36:15,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-09-19 00:36:16,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-09-19 00:36:16,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-09-19 00:36:17,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-09-19 00:36:17,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-19 00:36:18,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:36:18,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-19 00:36:19,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-19 00:36:19,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-09-19 00:36:20,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-19 00:36:20,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-09-19 00:36:20,567 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-19 00:36:21,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-09-19 00:36:21,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-09-19 00:36:22,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-19 00:36:22,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:36:22,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-19 00:36:23,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-19 00:36:23,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-09-19 00:36:24,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-19 00:36:24,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-09-19 00:36:24,717 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-19 00:36:25,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-09-19 00:36:25,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-09-19 00:36:26,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-09-19 00:36:26,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-19 00:36:27,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-19 00:36:27,106 [ scc.repo] DEBUG ## Branches found:
2024-09-19 00:36:27,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-19 00:36:27,106 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:36:27,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:36:27,111 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-19 00:36:27,115 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-19 00:36:27,116 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-19 00:36:27,121 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-19 00:36:27,127 [ scc.git] DEBUG Already up to date.
2024-09-19 00:36:27,128 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-09-19 00:36:27,835 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-19 00:36:27,835 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-09-19 00:36:27,841 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-09-19 00:36:28,177 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-19 00:36:28,178 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-09-19 00:36:28,183 [ scc.git] DEBUG Calling 'git fetch origin pull/580/head'
2024-09-19 00:36:28,800 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-19 00:36:28,800 [ scc.git] DEBUG * branch refs/pull/580/head -> FETCH_HEAD
2024-09-19 00:36:28,805 [ scc.git] DEBUG ## Unique users: []
2024-09-19 00:36:28,806 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:36:28,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:36:28,811 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-09-19 00:36:28,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:36:28,826 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-09-19 00:36:29,368 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-09-19 00:36:29,368 [ scc.git] DEBUG Auto-merging setup.py
2024-09-19 00:36:29,370 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:36:29,373 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-09-19 00:36:29,373 [ scc.git] DEBUG setup.py | 1 +
2024-09-19 00:36:29,373 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-09-19 00:36:29,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:36:29,510 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-09-19 00:36:29,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:36:29,524 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-09-19 00:36:29,808 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-09-19 00:36:29,808 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-09-19 00:36:29,810 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:36:29,814 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-09-19 00:36:29,814 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-09-19 00:36:29,814 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-09-19 00:36:29,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:36:29,953 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc'
2024-09-19 00:36:29,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:36:29,967 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 580 (omeroweb.webgateway.obj_id_bitmask: handle empty query results) 1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc'
2024-09-19 00:36:30,056 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-19 00:36:30,061 [ scc.git] DEBUG omeroweb/webgateway/views.py | 6 ++++++
2024-09-19 00:36:30,061 [ scc.git] DEBUG 1 file changed, 6 insertions(+)
2024-09-19 00:36:30,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:36:30,334 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-19 00:36:30,373 [ scc.git] DEBUG Get sha1 of %s
2024-09-19 00:36:30,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-19 00:36:30,378 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-19 00:36:30,417 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-19 00:36:30,427 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe924577580> has no local changes
2024-09-19 00:36:30,427 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 580 sbesson 'omeroweb.webgateway.obj_id_bitmask: handle empty query results'
Generated by OMERO-python-superbuild-push#178 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/178/)'
2024-09-19 00:36:30,438 [ scc.git] DEBUG [detached HEAD 3fa757dd6] merge master -Dorg -Ssuccess-only
2024-09-19 00:36:30,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:36:30,439 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-19 00:36:30,494 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-09-19 00:36:30,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:36:30,737 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-09-19 00:36:31,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:36:31,135 [ scc.config] DEBUG Found submodule.omero-py.url
2024-09-19 00:36:31,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:36:31,511 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-09-19 00:36:31,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:36:31,893 [ scc.config] DEBUG Found submodule.omero-web.url
2024-09-19 00:36:32,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-19 00:36:32,317 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-19 00:36:32,347 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe9273bde50> has local changes
2024-09-19 00:36:32,347 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
- PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 580 sbesson 'omeroweb.webgateway.obj_id_bitmask: handle empty query results'
Generated by OMERO-python-superbuild-push#178 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/178/)'
2024-09-19 00:36:32,358 [ scc.git] DEBUG [detached HEAD 2ada54d] merge master -Dorg -Ssuccess-only
2024-09-19 00:36:32,358 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-19 00:36:32,358 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-09-19 00:36:32,358 [ scc.merge] INFO Already up to date.
2024-09-19 00:36:32,358 [ scc.merge] INFO
2024-09-19 00:36:32,358 [ scc.merge] INFO Merged PRs:
2024-09-19 00:36:32,358 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-09-19 00:36:32,358 [ scc.merge] INFO
2024-09-19 00:36:32,358 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-09-19 00:36:32,358 [ scc.merge] INFO Already up to date.
2024-09-19 00:36:32,358 [ scc.merge] INFO
2024-09-19 00:36:32,358 [ scc.merge] INFO Merged PRs:
2024-09-19 00:36:32,358 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-19 00:36:32,358 [ scc.merge] INFO
2024-09-19 00:36:32,358 [ scc.merge] INFO Repository: ome/omero-marshal
2024-09-19 00:36:32,359 [ scc.merge] INFO Excluded PRs:
2024-09-19 00:36:32,359 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-09-19 00:36:32,359 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-09-19 00:36:32,359 [ scc.merge] INFO Already up to date.
2024-09-19 00:36:32,359 [ scc.merge] INFO
2024-09-19 00:36:32,359 [ scc.merge] INFO Merged PRs:
2024-09-19 00:36:32,359 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-19 00:36:32,359 [ scc.merge] INFO
2024-09-19 00:36:32,359 [ scc.merge] INFO Repository: ome/omero-py
2024-09-19 00:36:32,359 [ scc.merge] INFO Excluded PRs:
2024-09-19 00:36:32,359 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-09-19 00:36:32,359 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
2024-09-19 00:36:32,359 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-09-19 00:36:32,359 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-09-19 00:36:32,359 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-09-19 00:36:32,359 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-09-19 00:36:32,359 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-09-19 00:36:32,359 [ scc.merge] INFO Already up to date.
2024-09-19 00:36:32,359 [ scc.merge] INFO
2024-09-19 00:36:32,359 [ scc.merge] INFO Merged PRs:
2024-09-19 00:36:32,359 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-09-19 00:36:32,359 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-09-19 00:36:32,360 [ scc.merge] INFO
2024-09-19 00:36:32,360 [ scc.merge] INFO Repository: ome/omero-scripts
2024-09-19 00:36:32,360 [ scc.merge] INFO Excluded PRs:
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-19 00:36:32,360 [ scc.merge] INFO Already up to date.
2024-09-19 00:36:32,360 [ scc.merge] INFO
2024-09-19 00:36:32,360 [ scc.merge] INFO Merged PRs:
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-09-19 00:36:32,360 [ scc.merge] INFO
2024-09-19 00:36:32,360 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-19 00:36:32,360 [ scc.merge] INFO
2024-09-19 00:36:32,360 [ scc.merge] INFO Repository: ome/omero-web
2024-09-19 00:36:32,360 [ scc.merge] INFO Excluded PRs:
2024-09-19 00:36:32,360 [ scc.merge] INFO - PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
2024-09-19 00:36:32,361 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-09-19 00:36:32,361 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-09-19 00:36:32,361 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-09-19 00:36:32,361 [ scc.merge] INFO Already up to date.
2024-09-19 00:36:32,361 [ scc.merge] INFO
2024-09-19 00:36:32,361 [ scc.merge] INFO Merged PRs:
2024-09-19 00:36:32,361 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-19 00:36:32,361 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-19 00:36:32,361 [ scc.merge] INFO - PR 580 sbesson 'omeroweb.webgateway.obj_id_bitmask: handle empty query results'
2024-09-19 00:36:32,361 [ scc.merge] INFO
2024-09-19 00:36:32,361 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-19 00:36:32,361 [ scc.git] DEBUG Calling 'git remote'
2024-09-19 00:36:32,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-19 00:36:32,365 [ scc.git] DEBUG Calling 'git remote'
2024-09-19 00:36:32,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:36:32,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-19 00:36:32,370 [ scc.git] DEBUG Calling 'git remote'
2024-09-19 00:36:32,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:36:32,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-19 00:36:32,374 [ scc.git] DEBUG Calling 'git remote'
2024-09-19 00:36:32,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:36:32,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-19 00:36:32,378 [ scc.git] DEBUG Calling 'git remote'
2024-09-19 00:36:32,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-19 00:36:32,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-19 00:36:32,382 [ scc.git] DEBUG Calling 'git remote'
2024-09-19 00:36:32,386 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
Update component versions
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'omero-dropbox'
Entering 'omero-marshal'
Entering 'omero-py'
Entering 'omero-scripts'
Entering 'omero-web'
Entering 'omero-dropbox'
HEAD detached from a4307f4
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from cca4c2f
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 4fd72efa
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from da5b7d11f
nothing to commit, working tree clean
HEAD detached from e849d72
nothing to commit, working tree clean
2024-09-19 00:37:00,145 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS