Started by upstream project "Trigger" build number 153
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 508496fba006c24030e94a686761108e34ba8f70 (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 508496fba006c24030e94a686761108e34ba8f70 # timeout=10
Commit message: "Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2"
> git rev-list --no-walk 508496fba006c24030e94a686761108e34ba8f70 # timeout=10
Cleaning workspace
> git rev-parse --verify HEAD # timeout=10
Resetting working tree
> git reset --hard # timeout=10
> git clean -fdx # timeout=10
> git submodule foreach --recursive git reset --hard # timeout=10
> git submodule foreach --recursive git clean -fdx # timeout=10
> git remote # timeout=10
> git submodule init # timeout=10
> git submodule sync # timeout=10
> git config --get remote.origin.url # timeout=10
> git submodule init # timeout=10
> git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10
> git config --get submodule.omero-py.url # timeout=10
> git config -f .gitmodules --get submodule.omero-py.path # timeout=10
> git config --get submodule.omero-web.url # timeout=10
> git config -f .gitmodules --get submodule.omero-web.path # timeout=10
> git config --get submodule.omero-marshal.url # timeout=10
> git config -f .gitmodules --get submodule.omero-marshal.path # timeout=10
> git config --get submodule.omero-dropbox.url # timeout=10
> git config -f .gitmodules --get submodule.omero-dropbox.path # timeout=10
> git config --get submodule.omero-scripts.url # timeout=10
> git config -f .gitmodules --get submodule.omero-scripts.path # timeout=10
> git submodule update --init --recursive omero-py # timeout=10
> git submodule update --init --recursive omero-web # timeout=10
> git submodule update --init --recursive omero-marshal # timeout=10
> git submodule update --init --recursive omero-dropbox # timeout=10
> git submodule update --init --recursive omero-scripts # timeout=10
[Pipeline] pwd
[Pipeline] copyArtifacts
Copied 1 artifact from "OMERO-build-push" build number 131
[Pipeline] sh
+ pushd build
~/workspace/OMERO-python-superbuild-push/build ~/workspace/OMERO-python-superbuild-push
+ curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz
+ tar -zxf -
+ popd
~/workspace/OMERO-python-superbuild-push
+ python3 -m venv build/venv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ python3 -m pip install -U pip
Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3)
Collecting pip
Using cached pip-24.1.2-py3-none-any.whl (1.8 MB)
Installing collected packages: pip
Attempting uninstall: pip
Found existing installation: pip 21.2.3
Uninstalling pip-21.2.3:
Successfully uninstalled pip-21.2.3
Successfully installed pip-24.1.2
+ python3 -m pip install scc
Collecting scc
Using cached scc-0.20.0-py3-none-any.whl.metadata (3.6 kB)
Collecting PyGithub>=1.54 (from scc)
Using cached PyGithub-2.3.0-py3-none-any.whl.metadata (3.8 kB)
Collecting PyYAML>=5.1 (from scc)
Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.1 kB)
Collecting future (from scc)
Using cached future-1.0.0-py3-none-any.whl.metadata (4.0 kB)
Collecting ruamel.yaml (from scc)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl.metadata (23 kB)
Collecting ruamel.yaml.jinja2 (from scc)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl.metadata (2.9 kB)
Collecting six (from scc)
Using cached six-1.16.0-py2.py3-none-any.whl.metadata (1.8 kB)
Collecting urllib3<2 (from scc)
Using cached urllib3-1.26.19-py2.py3-none-any.whl.metadata (49 kB)
Collecting yaclifw<0.3,>=0.2.0 (from scc)
Using cached yaclifw-0.2.0-py3-none-any.whl
Collecting pynacl>=1.4.0 (from PyGithub>=1.54->scc)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl.metadata (8.6 kB)
Collecting requests>=2.14.0 (from PyGithub>=1.54->scc)
Using cached requests-2.32.3-py3-none-any.whl.metadata (4.6 kB)
Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached PyJWT-2.8.0-py3-none-any.whl.metadata (4.2 kB)
Collecting typing-extensions>=4.0.0 (from PyGithub>=1.54->scc)
Using cached typing_extensions-4.12.2-py3-none-any.whl.metadata (3.0 kB)
Collecting Deprecated (from PyGithub>=1.54->scc)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl.metadata (5.4 kB)
Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl.metadata (2.2 kB)
Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached cryptography-43.0.0-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.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (1.5 kB)
Collecting charset-normalizer<4,>=2 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (33 kB)
Collecting idna<4,>=2.5 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached idna-3.7-py3-none-any.whl.metadata (9.9 kB)
Collecting certifi>=2017.4.17 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached certifi-2024.7.4-py3-none-any.whl.metadata (2.2 kB)
Collecting wrapt<2,>=1.10 (from Deprecated->PyGithub>=1.54->scc)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (6.6 kB)
Collecting pycparser (from cffi>=1.4.1->pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached pycparser-2.22-py3-none-any.whl.metadata (943 bytes)
Using cached scc-0.20.0-py3-none-any.whl (48 kB)
Using cached PyGithub-2.3.0-py3-none-any.whl (354 kB)
Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (738 kB)
Using cached urllib3-1.26.19-py2.py3-none-any.whl (143 kB)
Using cached future-1.0.0-py3-none-any.whl (491 kB)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl (117 kB)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB)
Using cached six-1.16.0-py2.py3-none-any.whl (11 kB)
Using cached PyJWT-2.8.0-py3-none-any.whl (22 kB)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl (856 kB)
Using cached requests-2.32.3-py3-none-any.whl (64 kB)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl (562 kB)
Using cached typing_extensions-4.12.2-py3-none-any.whl (37 kB)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl (9.6 kB)
Using cached certifi-2024.7.4-py3-none-any.whl (162 kB)
Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (443 kB)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (142 kB)
Using cached cryptography-43.0.0-cp39-abi3-manylinux_2_28_x86_64.whl (4.0 MB)
Using cached idna-3.7-py3-none-any.whl (66 kB)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (80 kB)
Using cached pycparser-2.22-py3-none-any.whl (117 kB)
Installing collected packages: wrapt, urllib3, typing-extensions, six, ruamel.yaml.clib, PyYAML, pyjwt, pycparser, idna, future, charset-normalizer, certifi, yaclifw, ruamel.yaml, requests, Deprecated, cffi, ruamel.yaml.jinja2, pynacl, cryptography, PyGithub, scc
Successfully installed Deprecated-1.2.14 PyGithub-2.3.0 PyYAML-6.0.1 certifi-2024.7.4 cffi-1.16.0 charset-normalizer-3.3.2 cryptography-43.0.0 future-1.0.0 idna-3.7 pycparser-2.22 pyjwt-2.8.0 pynacl-1.5.0 requests-2.32.3 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.8 ruamel.yaml.jinja2-0.2.7 scc-0.20.0 six-1.16.0 typing-extensions-4.12.2 urllib3-1.26.19 wrapt-1.16.0 yaclifw-0.2.0
[Pipeline] sh
+ export BASE_REPO=omero-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-07-26 00:35:25,246 [ scc.config] DEBUG Found github.token
2024-07-26 00:35:25,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-26 00:35:25,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:35:25,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:35:26,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-26 00:35:26,273 [ scc.gh] DEBUG 4352 remaining from 5000 (Reset at 00:07
2024-07-26 00:35:26,274 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-26 00:35:26,278 [ scc.git] DEBUG Check current status
2024-07-26 00:35:26,278 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-26 00:35:26,281 [ scc.git] DEBUG 508496f Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2
2024-07-26 00:35:26,281 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-26 00:35:26,323 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-26 00:35:26,326 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-26 00:35:26,329 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-26 00:35:26,334 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-26 00:35:26,492 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-26 00:35:26,498 [ scc.config] DEBUG Found remote.origin.url
2024-07-26 00:35:26,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-26 00:35:27,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-26 00:35:27,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-26 00:35:28,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-26 00:35:28,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-26 00:35:28,516 [ scc.git] DEBUG Resetting...
2024-07-26 00:35:28,516 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-26 00:35:28,523 [ scc.git] DEBUG HEAD is now at 508496f Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2
2024-07-26 00:35:28,523 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-26 00:35:28,582 [ scc.git] DEBUG Check current status
2024-07-26 00:35:28,583 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-26 00:35:28,587 [ scc.git] DEBUG 508496f Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2
2024-07-26 00:35:28,587 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-26 00:35:28,629 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-26 00:35:28,631 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-26 00:35:28,635 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-26 00:35:28,639 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-26 00:35:28,644 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-26 00:35:28,645 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-26 00:35:28,645 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-26 00:35:28,645 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-26 00:35:28,645 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-26 00:35:28,645 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-26 00:35:28,646 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:35:28,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-26 00:35:28,959 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:35:28,959 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:35:28,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:28,965 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:35:28,968 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:35:28,968 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:35:28,973 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:35:28,978 [ scc.git] DEBUG Already up to date.
2024-07-26 00:35:28,978 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:35:28,978 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:35:28,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:28,983 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:35:29,029 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:35:29,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:29,033 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:35:29,271 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4c2cef8e0> has no local changes
2024-07-26 00:35:29,271 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Generated by OMERO-python-superbuild-push#128 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/128/)'
2024-07-26 00:35:29,299 [ scc.git] DEBUG [detached HEAD 661d087] merge master -Dorg -Snone
2024-07-26 00:35:29,299 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-26 00:35:29,299 [ scc.merge] INFO Already up to date.
2024-07-26 00:35:29,299 [ scc.merge] INFO
2024-07-26 00:35:29,299 [ scc.merge] INFO
2024-07-26 00:35:29,299 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-26 00:35:29,299 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
From https://github.com/ome/omero-scripts
c20d273..312afbe develop -> origin/develop
* [new tag] v5.8.3 -> v5.8.3
Submodule path 'omero-scripts': checked out '312afbed633613e1f728a1fe9eaac096e54318e0'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-26 00:35:32,089 [ scc.config] DEBUG Found github.token
2024-07-26 00:35:32,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-26 00:35:32,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:35:32,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:35:33,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-26 00:35:33,130 [ scc.gh] DEBUG 4344 remaining from 5000 (Reset at 00:07
2024-07-26 00:35:33,131 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-26 00:35:33,136 [ scc.git] DEBUG Check current status
2024-07-26 00:35:33,136 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-26 00:35:33,140 [ scc.git] DEBUG 661d087 merge master -Dorg -Snone
2024-07-26 00:35:33,140 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-26 00:35:33,179 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-26 00:35:33,182 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-26 00:35:33,186 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-26 00:35:33,190 [ scc.git] DEBUG +312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-07-26 00:35:33,195 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-26 00:35:33,199 [ scc.config] DEBUG Found remote.origin.url
2024-07-26 00:35:33,200 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-07-26 00:35:33,201 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-26 00:35:33,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-26 00:35:34,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-26 00:35:34,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-26 00:35:34,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-26 00:35:35,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-26 00:35:35,419 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:35:35,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-26 00:35:35,467 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-26 00:35:35,471 [ scc.git] DEBUG Check current status
2024-07-26 00:35:35,472 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-26 00:35:35,477 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-07-26 00:35:35,477 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-26 00:35:35,523 [ scc.config] DEBUG Found remote.origin.url
2024-07-26 00:35:35,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-07-26 00:35:36,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-26 00:35:36,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-26 00:35:37,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-26 00:35:37,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-26 00:35:37,652 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:35:37,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:35:37,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-26 00:35:37,690 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-26 00:35:37,694 [ scc.git] DEBUG Check current status
2024-07-26 00:35:37,694 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-26 00:35:37,698 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-07-26 00:35:37,698 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-26 00:35:37,738 [ scc.config] DEBUG Found remote.origin.url
2024-07-26 00:35:38,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-07-26 00:35:38,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-26 00:35:39,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-26 00:35:39,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-26 00:35:39,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-26 00:35:39,898 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:35:39,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:35:39,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-26 00:35:39,942 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-26 00:35:39,947 [ scc.git] DEBUG Check current status
2024-07-26 00:35:39,947 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-26 00:35:39,969 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-07-26 00:35:39,969 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-26 00:35:40,014 [ scc.config] DEBUG Found remote.origin.url
2024-07-26 00:35:40,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-07-26 00:35:40,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-26 00:35:41,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-26 00:35:41,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-26 00:35:42,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-26 00:35:42,158 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:35:42,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:35:42,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-26 00:35:42,203 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-26 00:35:42,207 [ scc.git] DEBUG Check current status
2024-07-26 00:35:42,207 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-26 00:35:42,218 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-07-26 00:35:42,218 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-26 00:35:42,265 [ scc.config] DEBUG Found remote.origin.url
2024-07-26 00:35:42,266 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-07-26 00:35:42,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-07-26 00:35:43,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-26 00:35:43,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-26 00:35:43,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-26 00:35:44,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-26 00:35:44,423 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:35:44,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:35:44,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-26 00:35:44,466 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-26 00:35:44,471 [ scc.git] DEBUG Check current status
2024-07-26 00:35:44,471 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-26 00:35:44,495 [ scc.git] DEBUG ba8c7e23c Merge pull request #563 from chris-allan/batch-by-max-download-rows
2024-07-26 00:35:44,495 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-26 00:35:44,543 [ scc.config] DEBUG Found remote.origin.url
2024-07-26 00:35:44,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-07-26 00:35:45,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-26 00:35:45,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-26 00:35:46,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-26 00:35:46,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-26 00:35:46,669 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:35:46,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:35:46,711 [ scc.git] DEBUG Resetting...
2024-07-26 00:35:46,712 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-26 00:35:46,719 [ scc.git] DEBUG HEAD is now at 661d087 merge master -Dorg -Snone
2024-07-26 00:35:46,719 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-26 00:35:46,779 [ scc.git] DEBUG Submodule path 'omero-scripts': checked out 'c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-26 00:35:46,786 [ scc.git] DEBUG Check current status
2024-07-26 00:35:46,786 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-26 00:35:46,792 [ scc.git] DEBUG 661d087 merge master -Dorg -Snone
2024-07-26 00:35:46,793 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-26 00:35:46,834 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-26 00:35:46,837 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-26 00:35:46,840 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-26 00:35:46,845 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-26 00:35:46,849 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-26 00:35:46,850 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-26 00:35:46,851 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-26 00:35:46,851 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-26 00:35:46,851 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-26 00:35:46,851 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-26 00:35:46,851 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-07-26 00:35:46,851 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:35:47,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-26 00:35:47,118 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:35:47,118 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:35:47,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:47,123 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:35:47,128 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:35:47,128 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:35:47,133 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:35:47,139 [ scc.git] DEBUG Already up to date.
2024-07-26 00:35:47,140 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:35:47,140 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:35:47,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:47,144 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:35:47,187 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:35:47,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:47,205 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:35:47,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-07-26 00:35:48,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-07-26 00:35:48,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-07-26 00:35:49,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-26 00:35:49,641 [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-07-26 00:35:50,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-26 00:35:50,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:35:50,643 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-26 00:35:50,643 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:35:50,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-26 00:35:50,643 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:35:50,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:50,648 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:35:50,653 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:35:50,653 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:35:50,657 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:35:50,661 [ scc.git] DEBUG Already up to date.
2024-07-26 00:35:50,661 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-07-26 00:35:51,027 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-07-26 00:35:51,028 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-07-26 00:35:51,032 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:35:51,033 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:35:51,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:51,037 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-26 00:35:51,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:51,048 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-26 00:35:51,166 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-07-26 00:35:51,166 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-07-26 00:35:51,166 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-07-26 00:35:51,166 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-07-26 00:35:51,167 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-07-26 00:35:51,167 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-07-26 00:35:51,167 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-07-26 00:35:51,167 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-07-26 00:35:51,167 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-07-26 00:35:51,167 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:35:51,172 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-07-26 00:35:51,172 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-07-26 00:35:51,172 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-07-26 00:35:51,172 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-07-26 00:35:51,172 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-07-26 00:35:51,172 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-07-26 00:35:51,172 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-07-26 00:35:51,172 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-07-26 00:35:51,172 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-07-26 00:35:51,172 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-07-26 00:35:51,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:35:51,335 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:35:51,377 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:35:51,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:51,382 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:35:51,424 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:35:51,430 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f303b00deb0> has no local changes
2024-07-26 00:35:51,431 [ 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#128 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/128/)'
2024-07-26 00:35:51,449 [ scc.git] DEBUG [detached HEAD 9654045] merge master -Dorg -Ssuccess-only
2024-07-26 00:35:51,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:35:51,449 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:35:51,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-07-26 00:35:52,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-07-26 00:35:52,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-07-26 00:35:53,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-26 00:35:53,792 [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-07-26 00:35:54,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-26 00:35:54,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:35:54,665 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-26 00:35:55,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-07-26 00:35:55,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-07-26 00:35:56,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-07-26 00:35:56,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-07-26 00:35:56,591 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:35:56,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-26 00:35:56,591 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:35:56,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:56,596 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:35:56,600 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:35:56,600 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:35:56,605 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:35:56,609 [ scc.git] DEBUG Already up to date.
2024-07-26 00:35:56,609 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-07-26 00:35:57,060 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-07-26 00:35:57,061 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-07-26 00:35:57,065 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:35:57,066 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:35:57,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:57,070 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-26 00:35:57,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:57,078 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-26 00:35:57,096 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-07-26 00:35:57,096 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:35:57,099 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-07-26 00:35:57,099 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-07-26 00:35:57,099 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-07-26 00:35:57,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:35:57,276 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:35:57,314 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:35:57,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:35:57,318 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:35:57,359 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:35:57,365 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3039ee6460> has no local changes
2024-07-26 00:35:57,365 [ 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#128 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/128/)'
2024-07-26 00:35:57,373 [ scc.git] DEBUG [detached HEAD d0105d6] merge master -Dorg -Ssuccess-only
2024-07-26 00:35:57,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:35:57,374 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:35:57,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-07-26 00:35:58,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-07-26 00:35:58,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-07-26 00:35:59,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-26 00:36:00,005 [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-07-26 00:36:00,555 [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-07-26 00:36:01,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-26 00:36:01,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-07-26 00:36:02,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-26 00:36:02,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-07-26 00:36:02,442 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-07-26 00:36:02,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-07-26 00:36:03,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-07-26 00:36:03,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-07-26 00:36:04,379 [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-07-26 00:36:04,889 [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-07-26 00:36:05,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-07-26 00:36:05,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-26 00:36:06,383 [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-07-26 00:36:06,852 [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-07-26 00:36:07,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-26 00:36:07,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-07-26 00:36:08,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-26 00:36:08,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-07-26 00:36:08,784 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-07-26 00:36:09,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-07-26 00:36:09,246 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-07-26 00:36:09,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-07-26 00:36:10,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-07-26 00:36:10,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-26 00:36:11,180 [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-07-26 00:36:11,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-26 00:36:12,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:36:12,149 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-26 00:36:12,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-07-26 00:36:13,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-07-26 00:36:13,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-26 00:36:14,137 [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-07-26 00:36:14,619 [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-07-26 00:36:15,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-26 00:36:15,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-07-26 00:36:16,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-26 00:36:16,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-07-26 00:36:16,547 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-07-26 00:36:17,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-07-26 00:36:17,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-07-26 00:36:18,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-07-26 00:36:18,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-07-26 00:36:19,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-26 00:36:19,627 [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-07-26 00:36:20,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-26 00:36:20,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:36:20,592 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-26 00:36:21,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-07-26 00:36:21,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-26 00:36:22,052 [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-07-26 00:36:22,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-26 00:36:22,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:36:22,994 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-26 00:36:23,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-07-26 00:36:23,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-07-26 00:36:24,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-26 00:36:25,026 [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-07-26 00:36:25,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-26 00:36:25,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:36:25,928 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-26 00:36:26,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-07-26 00:36:26,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-07-26 00:36:27,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-26 00:36:27,884 [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-07-26 00:36:28,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-26 00:36:28,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:36:28,837 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-07-26 00:36:29,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-07-26 00:36:29,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-07-26 00:36:30,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-07-26 00:36:30,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-07-26 00:36:30,732 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:36:30,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-26 00:36:30,732 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:36:30,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:30,737 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:36:30,741 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:36:30,741 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:36:30,746 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:36:30,750 [ scc.git] DEBUG Already up to date.
2024-07-26 00:36:30,750 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-07-26 00:36:31,560 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-26 00:36:31,560 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-07-26 00:36:31,565 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-07-26 00:36:31,943 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-26 00:36:31,943 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-07-26 00:36:31,948 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-07-26 00:36:32,331 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-26 00:36:32,331 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-07-26 00:36:32,339 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-07-26 00:36:32,723 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-26 00:36:32,723 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-07-26 00:36:32,728 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-07-26 00:36:33,325 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-26 00:36:33,326 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-07-26 00:36:33,332 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-07-26 00:36:33,663 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-26 00:36:33,663 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-07-26 00:36:33,668 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-07-26 00:36:33,999 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-26 00:36:34,000 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-07-26 00:36:34,005 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-07-26 00:36:34,404 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-26 00:36:34,405 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-07-26 00:36:34,410 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:36:34,410 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:36:34,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:34,415 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-26 00:36:34,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:34,431 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-26 00:36:34,580 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-07-26 00:36:34,580 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-07-26 00:36:34,581 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:36:34,585 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-07-26 00:36:34,586 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-07-26 00:36:34,586 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-07-26 00:36:34,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:36:34,770 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-26 00:36:34,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:34,786 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-26 00:36:34,899 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-26 00:36:34,899 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-07-26 00:36:34,900 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:36:34,907 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-07-26 00:36:34,907 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-07-26 00:36:34,907 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-07-26 00:36:35,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:36:35,176 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-07-26 00:36:35,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:35,192 [ 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-07-26 00:36:35,252 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-07-26 00:36:35,253 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:36:35,256 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-07-26 00:36:35,256 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-07-26 00:36:35,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:36:35,599 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-07-26 00:36:35,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:35,618 [ 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-07-26 00:36:35,769 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-07-26 00:36:35,770 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-07-26 00:36:35,771 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:36:35,774 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-26 00:36:35,775 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-07-26 00:36:35,775 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-07-26 00:36:36,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:36:36,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-26 00:36:36,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:36,047 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-26 00:36:36,089 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:36:36,092 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-07-26 00:36:36,092 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-07-26 00:36:36,092 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-07-26 00:36:36,092 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-07-26 00:36:36,092 [ scc.git] DEBUG create mode 100644 connect.py
2024-07-26 00:36:36,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:36:36,441 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-07-26 00:36:36,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:36,457 [ 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-07-26 00:36:36,549 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-07-26 00:36:36,550 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:36:36,554 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-07-26 00:36:36,554 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-26 00:36:36,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:36:36,860 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-07-26 00:36:36,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:36,877 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-07-26 00:36:36,972 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-07-26 00:36:36,973 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:36:36,977 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-07-26 00:36:36,977 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-07-26 00:36:37,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:36:37,267 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-26 00:36:37,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:37,285 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-26 00:36:37,358 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-26 00:36:37,374 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:36:37,381 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-07-26 00:36:37,381 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-07-26 00:36:37,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:36:37,685 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:36:37,725 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:36:37,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:37,731 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:36:37,767 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:36:37,776 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3039f3ff10> has no local changes
2024-07-26 00:36:37,776 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 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#128 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/128/)'
2024-07-26 00:36:37,787 [ scc.git] DEBUG [detached HEAD 3f6ce443] merge master -Dorg -Ssuccess-only
2024-07-26 00:36:37,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:36:37,788 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-26 00:36:37,788 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:36:38,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-26 00:36:38,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-26 00:36:39,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-26 00:36:39,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-26 00:36:40,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-26 00:36:40,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-26 00:36:41,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-26 00:36:41,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-26 00:36:42,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:36:42,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-26 00:36:43,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:36:43,400 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-26 00:36:43,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-26 00:36:44,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-26 00:36:44,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-26 00:36:45,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-26 00:36:45,424 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:36:45,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-26 00:36:45,424 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:36:45,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:45,429 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-26 00:36:45,433 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:36:45,433 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-26 00:36:45,437 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-26 00:36:45,447 [ scc.git] DEBUG Updating c20d273..312afbe
2024-07-26 00:36:45,447 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-26 00:36:45,864 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-07-26 00:36:45,864 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-26 00:36:45,868 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:36:45,868 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:36:45,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:45,873 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-26 00:36:45,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:45,884 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-26 00:36:45,923 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-26 00:36:45,923 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-26 00:36:45,923 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-26 00:36:45,924 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-26 00:36:45,929 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-07-26 00:36:45,936 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-07-26 00:36:46,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:36:46,104 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-26 00:36:46,110 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-07-26 00:36:46,115 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#128](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/128/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/128/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-26 00:36:46,120 [ scc.config] DEBUG Found github.token
2024-07-26 00:36:46,120 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-26 00:36:46,120 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:36:46,161 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:36:46,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:36:46,166 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:36:46,207 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:36:46,214 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3039ef5640> has no local changes
2024-07-26 00:36:46,214 [ 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)
Updating c20d273..312afbe
Previously merged:
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-python-superbuild-push#128 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/128/)'
2024-07-26 00:36:46,223 [ scc.git] DEBUG [detached HEAD 2c470e5] merge master -Dorg -Ssuccess-only
2024-07-26 00:36:46,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:36:46,223 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:36:46,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-07-26 00:36:47,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-07-26 00:36:47,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-07-26 00:36:48,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564 HTTP/1.1" 200 None
2024-07-26 00:36:48,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564/comments HTTP/1.1" 200 None
2024-07-26 00:36:49,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/c5815868107e99b7c63281ade90611c45db5bd72 HTTP/1.1" 200 None
2024-07-26 00:36:49,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/c5815868107e99b7c63281ade90611c45db5bd72/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:36:50,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/c5815868107e99b7c63281ade90611c45db5bd72/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:36:50,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/c5815868107e99b7c63281ade90611c45db5bd72 HTTP/1.1" 200 None
2024-07-26 00:36:51,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/c5815868107e99b7c63281ade90611c45db5bd72?per_page=1 HTTP/1.1" 200 None
2024-07-26 00:36:51,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/c5815868107e99b7c63281ade90611c45db5bd72 HTTP/1.1" 200 None
2024-07-26 00:36:52,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/c5815868107e99b7c63281ade90611c45db5bd72/status HTTP/1.1" 200 None
2024-07-26 00:36:52,002 [ scc.repo] DEBUG - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-26 00:36:52,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555 HTTP/1.1" 200 None
2024-07-26 00:36:53,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555/comments HTTP/1.1" 200 None
2024-07-26 00:36:53,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-26 00:36:54,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:36:54,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:36:55,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-26 00:36:55,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/97e479b717e34179eceea2507d3e69a04b2fec1e?per_page=1 HTTP/1.1" 200 None
2024-07-26 00:36:56,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-26 00:36:56,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/status HTTP/1.1" 200 None
2024-07-26 00:36:56,477 [ scc.repo] DEBUG - PR 555 chris-allan 'Archive status'
2024-07-26 00:36:56,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-07-26 00:36:57,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-07-26 00:36:57,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-07-26 00:36:58,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-07-26 00:36:58,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-26 00:36:59,420 [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-07-26 00:36:59,952 [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-07-26 00:37:00,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-26 00:37:00,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-07-26 00:37:01,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-26 00:37:01,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-07-26 00:37:01,799 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-26 00:37:02,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-07-26 00:37:02,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-07-26 00:37:03,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-26 00:37:03,765 [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-07-26 00:37:04,272 [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-07-26 00:37:04,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-26 00:37:05,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-07-26 00:37:05,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-26 00:37:06,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-07-26 00:37:06,169 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-26 00:37:06,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-07-26 00:37:07,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-07-26 00:37:07,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-07-26 00:37:08,155 [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-07-26 00:37:08,661 [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-07-26 00:37:08,663 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:37:08,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-26 00:37:08,664 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:37:08,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:37:08,669 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:37:08,674 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:37:08,674 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:37:08,679 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:37:08,685 [ scc.git] DEBUG Already up to date.
2024-07-26 00:37:08,685 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-07-26 00:37:09,190 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-26 00:37:09,190 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-07-26 00:37:09,197 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-07-26 00:37:09,599 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-26 00:37:09,600 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-07-26 00:37:09,605 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-26 00:37:10,354 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-26 00:37:10,354 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-26 00:37:10,360 [ scc.git] DEBUG Calling 'git fetch origin pull/564/head'
2024-07-26 00:37:10,729 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-26 00:37:10,729 [ scc.git] DEBUG * branch refs/pull/564/head -> FETCH_HEAD
2024-07-26 00:37:10,735 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:37:10,735 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:37:10,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:37:10,741 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-07-26 00:37:10,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:37:10,751 [ 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-07-26 00:37:10,827 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-26 00:37:10,828 [ scc.git] DEBUG Auto-merging setup.py
2024-07-26 00:37:10,829 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:37:10,833 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-07-26 00:37:10,833 [ scc.git] DEBUG setup.py | 1 +
2024-07-26 00:37:10,833 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-07-26 00:37:10,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:37:10,990 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-07-26 00:37:10,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:37:11,000 [ 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-07-26 00:37:11,101 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-07-26 00:37:11,102 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-26 00:37:11,102 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:37:11,107 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-07-26 00:37:11,107 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-07-26 00:37:11,107 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-07-26 00:37:11,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:37:11,405 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-26 00:37:11,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:37:11,416 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Archive status) 97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-26 00:37:11,565 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-26 00:37:11,566 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:37:11,571 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.tree.js | 3 +++
2024-07-26 00:37:11,571 [ scc.git] DEBUG .../webclient/annotations/includes/core_metadata.html | 6 ++++++
2024-07-26 00:37:11,571 [ scc.git] DEBUG omeroweb/webclient/tree.py | 10 ++++++++--
2024-07-26 00:37:11,571 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 1 +
2024-07-26 00:37:11,571 [ scc.git] DEBUG 4 files changed, 18 insertions(+), 2 deletions(-)
2024-07-26 00:37:11,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:37:11,813 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c5815868107e99b7c63281ade90611c45db5bd72'
2024-07-26 00:37:11,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:37:11,824 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 564 (New table API endpoints for lower level table access) c5815868107e99b7c63281ade90611c45db5bd72'
2024-07-26 00:37:11,875 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-26 00:37:11,876 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py
2024-07-26 00:37:11,876 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:37:11,881 [ scc.git] DEBUG omeroweb/settings.py | 7 ++
2024-07-26 00:37:11,881 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 29 +++++++
2024-07-26 00:37:11,881 [ scc.git] DEBUG omeroweb/webgateway/views.py | 178 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-26 00:37:11,881 [ scc.git] DEBUG 3 files changed, 213 insertions(+), 1 deletion(-)
2024-07-26 00:37:12,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:37:12,222 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:37:12,267 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:37:12,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:37:12,272 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:37:12,312 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:37:12,323 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3039f0a4f0> has no local changes
2024-07-26 00:37:12,323 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- 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 555 chris-allan 'Archive status'
- PR 564 knabar 'New table API endpoints for lower level table access'
Generated by OMERO-python-superbuild-push#128 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/128/)'
2024-07-26 00:37:12,333 [ scc.git] DEBUG [detached HEAD e75294a24] merge master -Dorg -Ssuccess-only
2024-07-26 00:37:12,333 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:37:12,334 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:37:12,380 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-07-26 00:37:12,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:37:12,662 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-07-26 00:37:13,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:37:13,075 [ scc.config] DEBUG Found submodule.omero-py.url
2024-07-26 00:37:13,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:37:13,496 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-07-26 00:37:13,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:37:13,912 [ scc.config] DEBUG Found submodule.omero-web.url
2024-07-26 00:37:14,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:37:14,341 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:37:14,375 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f303b0018e0> has local changes
2024-07-26 00:37:14,375 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 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)
Updating c20d273..312afbe
Previously merged:
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- 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 555 chris-allan 'Archive status'
- PR 564 knabar 'New table API endpoints for lower level table access'
Generated by OMERO-python-superbuild-push#128 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/128/)'
2024-07-26 00:37:14,386 [ scc.git] DEBUG [detached HEAD da61ff0] merge master -Dorg -Ssuccess-only
2024-07-26 00:37:14,386 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-26 00:37:14,386 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-07-26 00:37:14,387 [ scc.merge] INFO Already up to date.
2024-07-26 00:37:14,387 [ scc.merge] INFO
2024-07-26 00:37:14,387 [ scc.merge] INFO
2024-07-26 00:37:14,387 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-07-26 00:37:14,387 [ scc.merge] INFO Already up to date.
2024-07-26 00:37:14,387 [ scc.merge] INFO
2024-07-26 00:37:14,387 [ scc.merge] INFO Merged PRs:
2024-07-26 00:37:14,387 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-26 00:37:14,387 [ scc.merge] INFO
2024-07-26 00:37:14,387 [ scc.merge] INFO Repository: ome/omero-marshal
2024-07-26 00:37:14,387 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:37:14,387 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-07-26 00:37:14,387 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-07-26 00:37:14,387 [ scc.merge] INFO Already up to date.
2024-07-26 00:37:14,387 [ scc.merge] INFO
2024-07-26 00:37:14,387 [ scc.merge] INFO Merged PRs:
2024-07-26 00:37:14,387 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-26 00:37:14,387 [ scc.merge] INFO
2024-07-26 00:37:14,387 [ scc.merge] INFO Repository: ome/omero-py
2024-07-26 00:37:14,387 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:37:14,387 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-07-26 00:37:14,387 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-07-26 00:37:14,387 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-07-26 00:37:14,387 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-07-26 00:37:14,387 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-07-26 00:37:14,387 [ scc.merge] INFO Already up to date.
2024-07-26 00:37:14,387 [ scc.merge] INFO
2024-07-26 00:37:14,387 [ scc.merge] INFO Merged PRs:
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-07-26 00:37:14,388 [ scc.merge] INFO
2024-07-26 00:37:14,388 [ scc.merge] INFO Repository: ome/omero-scripts
2024-07-26 00:37:14,388 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-26 00:37:14,388 [ scc.merge] INFO Updating c20d273..312afbe
2024-07-26 00:37:14,388 [ scc.merge] INFO Previously merged:
2024-07-26 00:37:14,388 [ scc.merge] INFO
2024-07-26 00:37:14,388 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-26 00:37:14,388 [ scc.merge] INFO
2024-07-26 00:37:14,388 [ scc.merge] INFO Repository: ome/omero-web
2024-07-26 00:37:14,388 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-07-26 00:37:14,388 [ scc.merge] INFO Already up to date.
2024-07-26 00:37:14,388 [ scc.merge] INFO
2024-07-26 00:37:14,388 [ scc.merge] INFO Merged PRs:
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 555 chris-allan 'Archive status'
2024-07-26 00:37:14,388 [ scc.merge] INFO - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-26 00:37:14,388 [ scc.merge] INFO
2024-07-26 00:37:14,388 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-26 00:37:14,389 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:37:14,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-26 00:37:14,393 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:37:14,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:37:14,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-26 00:37:14,398 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:37:14,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:37:14,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-26 00:37:14,402 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:37:14,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:37:14,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-26 00:37:14,408 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:37:14,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-26 00:37:14,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-26 00:37:14,413 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:37:14,418 [ 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 749a68ac
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from c20d273
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from ba8c7e23c
nothing to commit, working tree clean
HEAD detached from 508496f
nothing to commit, working tree clean
2024-07-26 00:37:45,272 [ 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