Started by upstream project "Trigger" build number 144
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 cc9eff3c325328a7ee46857e572be7124cd0358c (refs/remotes/origin/master)
Commit message: "Merge pull request #287 from ome/dependabot/submodules/omero-py-749a68a"
> 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 cc9eff3c325328a7ee46857e572be7124cd0358c # timeout=10
> git rev-list --no-walk cc9eff3c325328a7ee46857e572be7124cd0358c # 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
[Pipeline] pwd
[Pipeline] copyArtifacts
Copied 1 artifact from "OMERO-build-push" build number 126
[Pipeline] sh
> 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
+ 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-21 00:33:20,628 [ scc.config] DEBUG Found github.token
2024-07-21 00:33:20,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-21 00:33:20,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:33:21,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:33:21,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-21 00:33:21,650 [ scc.gh] DEBUG 4353 remaining from 5000 (Reset at 00:07
2024-07-21 00:33:21,651 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-21 00:33:21,655 [ scc.git] DEBUG Check current status
2024-07-21 00:33:21,656 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-21 00:33:21,660 [ scc.git] DEBUG cc9eff3 Merge pull request #287 from ome/dependabot/submodules/omero-py-749a68a
2024-07-21 00:33:21,660 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-21 00:33:21,701 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-21 00:33:21,705 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-21 00:33:21,708 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-21 00:33:21,722 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-21 00:33:21,742 [ scc.git] DEBUG 5a2cd79d7cb7847d560e98f1d11240794e7be47f omero-web (v5.26.0-3-g5a2cd79d7)
2024-07-21 00:33:21,748 [ scc.config] DEBUG Found remote.origin.url
2024-07-21 00:33:22,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-21 00:33:22,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-21 00:33:23,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-21 00:33:23,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-21 00:33:23,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-21 00:33:23,884 [ scc.git] DEBUG Resetting...
2024-07-21 00:33:23,884 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-21 00:33:23,891 [ scc.git] DEBUG HEAD is now at cc9eff3 Merge pull request #287 from ome/dependabot/submodules/omero-py-749a68a
2024-07-21 00:33:23,891 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-21 00:33:23,945 [ scc.git] DEBUG Check current status
2024-07-21 00:33:23,946 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-21 00:33:23,952 [ scc.git] DEBUG cc9eff3 Merge pull request #287 from ome/dependabot/submodules/omero-py-749a68a
2024-07-21 00:33:23,952 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-21 00:33:23,997 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-21 00:33:24,000 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-21 00:33:24,004 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-21 00:33:24,008 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-21 00:33:24,012 [ scc.git] DEBUG 5a2cd79d7cb7847d560e98f1d11240794e7be47f omero-web (v5.26.0-3-g5a2cd79d7)
2024-07-21 00:33:24,013 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-21 00:33:24,013 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-21 00:33:24,013 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-21 00:33:24,013 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-21 00:33:24,013 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-21 00:33:24,013 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:33:24,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-21 00:33:24,310 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:33:24,310 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:33:24,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:24,315 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:33:24,318 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:33:24,318 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:33:24,322 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:33:24,326 [ scc.git] DEBUG Already up to date.
2024-07-21 00:33:24,326 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:33:24,326 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:33:24,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:24,330 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:33:24,372 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:33:24,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:24,376 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:33:24,580 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e6e45c8e0> has no local changes
2024-07-21 00:33:24,581 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/122/)'
2024-07-21 00:33:24,609 [ scc.git] DEBUG [detached HEAD a26d6e5] merge master -Dorg -Snone
2024-07-21 00:33:24,609 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-21 00:33:24,609 [ scc.merge] INFO Already up to date.
2024-07-21 00:33:24,609 [ scc.merge] INFO
2024-07-21 00:33:24,609 [ scc.merge] INFO
2024-07-21 00:33:24,609 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-21 00:33:24,609 [ 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'
Submodule path 'omero-web': checked out 'ba8c7e23c5d3343992812b7579e8d2cf30eb5374'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-21 00:33:27,092 [ scc.config] DEBUG Found github.token
2024-07-21 00:33:27,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-21 00:33:27,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:33:27,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:33:28,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-21 00:33:28,161 [ scc.gh] DEBUG 4345 remaining from 5000 (Reset at 00:07
2024-07-21 00:33:28,162 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-21 00:33:28,167 [ scc.git] DEBUG Check current status
2024-07-21 00:33:28,167 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-21 00:33:28,170 [ scc.git] DEBUG a26d6e5 merge master -Dorg -Snone
2024-07-21 00:33:28,171 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-21 00:33:28,210 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-21 00:33:28,213 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-21 00:33:28,216 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-21 00:33:28,220 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-21 00:33:28,225 [ scc.git] DEBUG +ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-21 00:33:28,229 [ scc.config] DEBUG Found remote.origin.url
2024-07-21 00:33:28,229 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-07-21 00:33:28,231 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-21 00:33:28,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-21 00:33:29,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-21 00:33:29,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-21 00:33:30,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-21 00:33:30,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-21 00:33:30,625 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:33:30,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-21 00:33:30,676 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-21 00:33:30,681 [ scc.git] DEBUG Check current status
2024-07-21 00:33:30,681 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-21 00:33:30,686 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-07-21 00:33:30,686 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-21 00:33:30,732 [ scc.config] DEBUG Found remote.origin.url
2024-07-21 00:33:31,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-07-21 00:33:31,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-21 00:33:32,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-21 00:33:32,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-21 00:33:32,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-21 00:33:32,856 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:33:32,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:33:32,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-21 00:33:32,895 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-21 00:33:32,900 [ scc.git] DEBUG Check current status
2024-07-21 00:33:32,900 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-21 00:33:32,904 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-07-21 00:33:32,904 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-21 00:33:32,947 [ scc.config] DEBUG Found remote.origin.url
2024-07-21 00:33:33,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-07-21 00:33:33,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-21 00:33:34,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-21 00:33:34,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-21 00:33:35,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-21 00:33:35,149 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:33:35,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:33:35,188 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-21 00:33:35,188 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-21 00:33:35,192 [ scc.git] DEBUG Check current status
2024-07-21 00:33:35,192 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-21 00:33:35,211 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-07-21 00:33:35,212 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-21 00:33:35,256 [ scc.config] DEBUG Found remote.origin.url
2024-07-21 00:33:35,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-07-21 00:33:36,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-21 00:33:36,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-21 00:33:36,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-21 00:33:37,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-21 00:33:37,317 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:33:37,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:33:37,357 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-21 00:33:37,357 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-21 00:33:37,361 [ scc.git] DEBUG Check current status
2024-07-21 00:33:37,361 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-21 00:33:37,372 [ scc.git] DEBUG c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-21 00:33:37,372 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-21 00:33:37,415 [ scc.config] DEBUG Found remote.origin.url
2024-07-21 00:33:37,416 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-07-21 00:33:37,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-07-21 00:33:38,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-21 00:33:38,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-21 00:33:39,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-21 00:33:39,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-21 00:33:39,581 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:33:39,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:33:39,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-21 00:33:39,622 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-21 00:33:39,626 [ scc.git] DEBUG Check current status
2024-07-21 00:33:39,626 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-21 00:33:39,638 [ scc.git] DEBUG ba8c7e23c Merge pull request #563 from chris-allan/batch-by-max-download-rows
2024-07-21 00:33:39,639 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-21 00:33:39,679 [ scc.config] DEBUG Found remote.origin.url
2024-07-21 00:33:40,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-07-21 00:33:40,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-21 00:33:40,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-21 00:33:41,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-21 00:33:41,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-21 00:33:41,868 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:33:41,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:33:41,911 [ scc.git] DEBUG Resetting...
2024-07-21 00:33:41,911 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-21 00:33:41,917 [ scc.git] DEBUG HEAD is now at a26d6e5 merge master -Dorg -Snone
2024-07-21 00:33:41,918 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-21 00:33:41,987 [ scc.git] DEBUG Submodule path 'omero-web': checked out '5a2cd79d7cb7847d560e98f1d11240794e7be47f'
2024-07-21 00:33:41,991 [ scc.git] DEBUG Check current status
2024-07-21 00:33:41,991 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-21 00:33:41,996 [ scc.git] DEBUG a26d6e5 merge master -Dorg -Snone
2024-07-21 00:33:41,997 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-21 00:33:42,044 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-21 00:33:42,047 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-21 00:33:42,051 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-21 00:33:42,055 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-21 00:33:42,059 [ scc.git] DEBUG 5a2cd79d7cb7847d560e98f1d11240794e7be47f omero-web (v5.26.0-3-g5a2cd79d7)
2024-07-21 00:33:42,060 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-21 00:33:42,060 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-21 00:33:42,060 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-21 00:33:42,060 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-21 00:33:42,060 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-21 00:33:42,060 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-07-21 00:33:42,061 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:33:42,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-21 00:33:42,310 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:33:42,310 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:33:42,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:42,315 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:33:42,319 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:33:42,319 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:33:42,323 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:33:42,328 [ scc.git] DEBUG Already up to date.
2024-07-21 00:33:42,328 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:33:42,328 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:33:42,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:42,331 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:33:42,372 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:33:42,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:42,376 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:33:42,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-07-21 00:33:43,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-07-21 00:33:43,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-07-21 00:33:44,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-21 00:33:44,762 [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-21 00:33:45,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-21 00:33:45,809 [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-21 00:33:45,810 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-21 00:33:45,810 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:33:45,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-21 00:33:45,810 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:33:45,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:45,815 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:33:45,820 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:33:45,821 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:33:45,826 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:33:45,831 [ scc.git] DEBUG Already up to date.
2024-07-21 00:33:45,831 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-07-21 00:33:46,225 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-07-21 00:33:46,226 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-07-21 00:33:46,231 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:33:46,232 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:33:46,232 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:46,238 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-21 00:33:46,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:46,252 [ 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-21 00:33:46,443 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-07-21 00:33:46,443 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-07-21 00:33:46,444 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-07-21 00:33:46,444 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-07-21 00:33:46,444 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-07-21 00:33:46,444 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-07-21 00:33:46,444 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-07-21 00:33:46,444 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-07-21 00:33:46,444 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-07-21 00:33:46,444 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:33:46,448 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-07-21 00:33:46,448 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-07-21 00:33:46,448 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-07-21 00:33:46,448 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-07-21 00:33:46,448 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-07-21 00:33:46,449 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-07-21 00:33:46,449 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-07-21 00:33:46,449 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-07-21 00:33:46,449 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-07-21 00:33:46,449 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-07-21 00:33:46,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:33:46,621 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:33:46,666 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:33:46,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:46,672 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:33:46,716 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:33:46,722 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f561d20deb0> has no local changes
2024-07-21 00:33:46,722 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/122/)'
2024-07-21 00:33:46,732 [ scc.git] DEBUG [detached HEAD 079ca22] merge master -Dorg -Ssuccess-only
2024-07-21 00:33:46,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:33:46,732 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:33:47,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-07-21 00:33:47,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-07-21 00:33:48,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-07-21 00:33:48,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-21 00:33:49,068 [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-21 00:33:49,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-21 00:33:49,985 [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-21 00:33:49,986 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-21 00:33:50,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-07-21 00:33:50,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-07-21 00:33:51,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-07-21 00:33:51,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-07-21 00:33:51,852 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:33:51,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-21 00:33:51,853 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:33:51,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:51,862 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:33:51,866 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:33:51,867 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:33:51,872 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:33:51,878 [ scc.git] DEBUG Already up to date.
2024-07-21 00:33:51,878 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-07-21 00:33:52,335 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-07-21 00:33:52,336 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-07-21 00:33:52,342 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:33:52,343 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:33:52,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:52,349 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-21 00:33:52,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:52,360 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-21 00:33:52,382 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-07-21 00:33:52,382 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:33:52,385 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-07-21 00:33:52,386 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-07-21 00:33:52,386 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-07-21 00:33:52,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:33:52,565 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:33:52,613 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:33:52,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:33:52,618 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:33:52,660 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:33:52,667 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f561c0e7460> has no local changes
2024-07-21 00:33:52,668 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/122/)'
2024-07-21 00:33:52,677 [ scc.git] DEBUG [detached HEAD 7079bea] merge master -Dorg -Ssuccess-only
2024-07-21 00:33:52,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:33:52,678 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:33:53,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-07-21 00:33:53,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-07-21 00:33:54,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-07-21 00:33:54,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-21 00:33:55,182 [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-21 00:33:55,665 [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-21 00:33:56,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-21 00:33:56,611 [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-21 00:33:57,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-21 00:33:57,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-07-21 00:33:57,529 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-07-21 00:33:58,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-07-21 00:33:58,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-07-21 00:33:58,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-07-21 00:33:59,506 [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-21 00:33:59,983 [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-21 00:34:00,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-07-21 00:34:00,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-21 00:34:01,531 [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-21 00:34:02,022 [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-21 00:34:02,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-21 00:34:03,020 [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-21 00:34:03,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-21 00:34:03,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-07-21 00:34:03,941 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-07-21 00:34:04,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-07-21 00:34:04,430 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-07-21 00:34:04,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-07-21 00:34:05,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-07-21 00:34:05,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-21 00:34:06,322 [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-21 00:34:06,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-21 00:34:07,212 [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-21 00:34:07,213 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-21 00:34:07,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-07-21 00:34:08,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-07-21 00:34:08,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-21 00:34:09,166 [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-21 00:34:09,624 [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-21 00:34:10,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-21 00:34:10,565 [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-21 00:34:10,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-21 00:34:11,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-07-21 00:34:11,436 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-07-21 00:34:11,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-07-21 00:34:12,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-07-21 00:34:12,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-07-21 00:34:13,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-07-21 00:34:13,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-21 00:34:14,418 [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-21 00:34:14,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-21 00:34:15,277 [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-21 00:34:15,278 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-21 00:34:15,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-07-21 00:34:16,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-21 00:34:16,688 [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-21 00:34:17,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-21 00:34:17,623 [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-21 00:34:17,624 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-21 00:34:18,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-07-21 00:34:18,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-07-21 00:34:19,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-21 00:34:19,585 [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-21 00:34:20,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-21 00:34:20,571 [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-21 00:34:20,572 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-21 00:34:21,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-07-21 00:34:21,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-07-21 00:34:21,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-21 00:34:22,478 [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-21 00:34:22,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-21 00:34:23,365 [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-21 00:34:23,365 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-07-21 00:34:23,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-07-21 00:34:24,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-07-21 00:34:24,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-07-21 00:34:25,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-07-21 00:34:25,319 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:34:25,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-21 00:34:25,320 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:34:25,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:25,325 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:34:25,331 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:34:25,331 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:34:25,337 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:34:25,343 [ scc.git] DEBUG Already up to date.
2024-07-21 00:34:25,343 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-07-21 00:34:25,779 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-21 00:34:25,779 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-07-21 00:34:25,785 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-07-21 00:34:26,200 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-21 00:34:26,200 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-07-21 00:34:26,205 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-07-21 00:34:26,589 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-21 00:34:26,589 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-07-21 00:34:26,594 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-07-21 00:34:26,966 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-21 00:34:26,967 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-07-21 00:34:26,972 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-07-21 00:34:27,368 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-21 00:34:27,368 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-07-21 00:34:27,373 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-07-21 00:34:27,749 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-21 00:34:27,750 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-07-21 00:34:27,755 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-07-21 00:34:28,103 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-21 00:34:28,103 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-07-21 00:34:28,108 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-07-21 00:34:28,503 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-21 00:34:28,503 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-07-21 00:34:28,509 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:34:28,509 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:34:28,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:28,515 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-21 00:34:28,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:28,534 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-21 00:34:28,598 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-07-21 00:34:28,598 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-07-21 00:34:28,599 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:34:28,604 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-07-21 00:34:28,604 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-07-21 00:34:28,604 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-07-21 00:34:28,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:34:28,776 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-21 00:34:28,790 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:28,795 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-21 00:34:28,959 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-21 00:34:28,959 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-07-21 00:34:28,960 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:34:28,969 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-07-21 00:34:28,969 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-07-21 00:34:28,969 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-07-21 00:34:29,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:34:29,184 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-07-21 00:34:29,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:29,206 [ 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-21 00:34:29,275 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-07-21 00:34:29,277 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:34:29,284 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-07-21 00:34:29,285 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-07-21 00:34:29,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:34:29,599 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-07-21 00:34:29,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:29,616 [ 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-21 00:34:29,744 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-07-21 00:34:29,744 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-07-21 00:34:29,745 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:34:29,749 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-21 00:34:29,749 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-07-21 00:34:29,749 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-07-21 00:34:30,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:34:30,015 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-21 00:34:30,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:30,033 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-21 00:34:30,053 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:34:30,056 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-07-21 00:34:30,056 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-07-21 00:34:30,056 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-07-21 00:34:30,056 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-07-21 00:34:30,056 [ scc.git] DEBUG create mode 100644 connect.py
2024-07-21 00:34:30,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:34:30,445 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-07-21 00:34:30,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:30,462 [ 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-21 00:34:30,483 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-07-21 00:34:30,485 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:34:30,489 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-07-21 00:34:30,489 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-21 00:34:30,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:34:30,864 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-07-21 00:34:30,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:30,882 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-07-21 00:34:30,949 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-07-21 00:34:30,950 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:34:30,955 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-07-21 00:34:30,955 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-07-21 00:34:31,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:34:31,314 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-21 00:34:31,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:31,332 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-21 00:34:31,380 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-21 00:34:31,381 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:34:31,388 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-07-21 00:34:31,389 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-07-21 00:34:31,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:34:31,741 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:34:31,786 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:34:31,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:31,791 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:34:31,832 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:34:31,841 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f561c13ff10> has no local changes
2024-07-21 00:34:31,842 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/122/)'
2024-07-21 00:34:31,853 [ scc.git] DEBUG [detached HEAD 3727e4ea] merge master -Dorg -Ssuccess-only
2024-07-21 00:34:31,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:34:31,854 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-21 00:34:31,854 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:34:32,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-21 00:34:32,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-21 00:34:33,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-21 00:34:33,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-21 00:34:34,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-21 00:34:34,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-21 00:34:35,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-21 00:34:35,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-21 00:34:36,380 [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-21 00:34:36,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-21 00:34:37,250 [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-21 00:34:37,251 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-21 00:34:37,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-21 00:34:38,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-21 00:34:38,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-21 00:34:39,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-21 00:34:39,369 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:34:39,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-21 00:34:39,370 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:34:39,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:39,376 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-21 00:34:39,382 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:34:39,382 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-21 00:34:39,388 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-21 00:34:39,395 [ scc.git] DEBUG Already up to date.
2024-07-21 00:34:39,396 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-21 00:34:39,828 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-07-21 00:34:39,828 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-21 00:34:39,834 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:34:39,835 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:34:39,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:39,840 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-21 00:34:39,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:39,852 [ 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-21 00:34:39,931 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-21 00:34:39,931 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-21 00:34:39,931 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-21 00:34:39,931 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-21 00:34:39,937 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-21 00:34:39,948 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-21 00:34:40,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:34:40,145 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-21 00:34:40,152 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-21 00:34:40,159 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#122](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/122/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/122/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-21 00:34:40,166 [ scc.config] DEBUG Found github.token
2024-07-21 00:34:40,167 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-21 00:34:40,167 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:34:40,215 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:34:40,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:34:40,223 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:34:40,270 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:34:40,278 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f561c0f5640> has no local changes
2024-07-21 00:34:40,278 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-python-superbuild-push#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/122/)'
2024-07-21 00:34:40,289 [ scc.git] DEBUG [detached HEAD 08ebd3c] merge master -Dorg -Ssuccess-only
2024-07-21 00:34:40,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:34:40,290 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:34:40,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-07-21 00:34:41,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-07-21 00:34:41,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564 HTTP/1.1" 200 None
2024-07-21 00:34:42,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564/comments HTTP/1.1" 200 None
2024-07-21 00:34:42,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-21 00:34:43,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:34:43,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-21 00:34:44,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-21 00:34:44,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/091e5fc2d35212271ac71fd66b42c611299d6fde?per_page=1 HTTP/1.1" 200 None
2024-07-21 00:34:45,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-21 00:34:45,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/status HTTP/1.1" 200 None
2024-07-21 00:34:45,664 [ scc.repo] DEBUG - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-21 00:34:46,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555 HTTP/1.1" 200 None
2024-07-21 00:34:46,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555/comments HTTP/1.1" 200 None
2024-07-21 00:34:47,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-21 00:34:47,790 [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-21 00:34:48,286 [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-21 00:34:48,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-21 00:34:49,303 [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-21 00:34:49,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-21 00:34:50,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/status HTTP/1.1" 200 None
2024-07-21 00:34:50,157 [ scc.repo] DEBUG - PR 555 chris-allan 'Archive status'
2024-07-21 00:34:50,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-07-21 00:34:51,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-07-21 00:34:51,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-07-21 00:34:52,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-07-21 00:34:52,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-21 00:34:53,081 [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-21 00:34:53,584 [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-21 00:34:54,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-21 00:34:54,510 [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-21 00:34:54,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-21 00:34:55,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-07-21 00:34:55,411 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-21 00:34:55,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-07-21 00:34:56,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-07-21 00:34:56,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-21 00:34:57,367 [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-21 00:34:57,869 [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-21 00:34:58,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-21 00:34:58,724 [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-21 00:34:59,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-21 00:34:59,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-07-21 00:34:59,667 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-21 00:35:00,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-07-21 00:35:00,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-07-21 00:35:01,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-07-21 00:35:01,656 [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-21 00:35:02,109 [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-21 00:35:02,111 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:35:02,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-21 00:35:02,112 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:35:02,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:35:02,117 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:35:02,122 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:35:02,122 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:35:02,127 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:35:02,143 [ scc.git] DEBUG Updating 5a2cd79d7..ba8c7e23c
2024-07-21 00:35:02,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/563 HTTP/1.1" 200 None
2024-07-21 00:35:03,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/554 HTTP/1.1" 200 None
2024-07-21 00:35:04,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/562 HTTP/1.1" 200 None
2024-07-21 00:35:04,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/560 HTTP/1.1" 200 None
2024-07-21 00:35:05,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/558 HTTP/1.1" 200 None
2024-07-21 00:35:05,524 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-07-21 00:35:06,051 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-21 00:35:06,051 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-07-21 00:35:06,056 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-07-21 00:35:06,436 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-21 00:35:06,436 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-07-21 00:35:06,441 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-21 00:35:07,143 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-21 00:35:07,143 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-21 00:35:07,148 [ scc.git] DEBUG Calling 'git fetch origin pull/564/head'
2024-07-21 00:35:07,506 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-21 00:35:07,506 [ scc.git] DEBUG * branch refs/pull/564/head -> FETCH_HEAD
2024-07-21 00:35:07,512 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:35:07,512 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:35:07,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:35:07,516 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-07-21 00:35:07,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:35:07,528 [ 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-21 00:35:07,599 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-21 00:35:07,599 [ scc.git] DEBUG Auto-merging setup.py
2024-07-21 00:35:07,600 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:35:07,604 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-07-21 00:35:07,604 [ scc.git] DEBUG setup.py | 1 +
2024-07-21 00:35:07,605 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-07-21 00:35:07,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:35:07,794 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-07-21 00:35:07,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:35:07,811 [ 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-21 00:35:07,907 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-07-21 00:35:07,907 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-21 00:35:07,908 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:35:07,912 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-07-21 00:35:07,912 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-07-21 00:35:07,912 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-07-21 00:35:08,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:35:08,234 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-21 00:35:08,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:35:08,248 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Archive status) 97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-21 00:35:08,348 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-21 00:35:08,349 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:35:08,354 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.tree.js | 3 +++
2024-07-21 00:35:08,354 [ scc.git] DEBUG .../webclient/annotations/includes/core_metadata.html | 6 ++++++
2024-07-21 00:35:08,354 [ scc.git] DEBUG omeroweb/webclient/tree.py | 10 ++++++++--
2024-07-21 00:35:08,354 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 1 +
2024-07-21 00:35:08,354 [ scc.git] DEBUG 4 files changed, 18 insertions(+), 2 deletions(-)
2024-07-21 00:35:08,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:35:08,645 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...091e5fc2d35212271ac71fd66b42c611299d6fde'
2024-07-21 00:35:08,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:35:08,659 [ 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) 091e5fc2d35212271ac71fd66b42c611299d6fde'
2024-07-21 00:35:08,724 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-21 00:35:08,724 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py
2024-07-21 00:35:08,725 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:35:08,730 [ scc.git] DEBUG omeroweb/settings.py | 7 ++
2024-07-21 00:35:08,730 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 29 +++++++
2024-07-21 00:35:08,730 [ scc.git] DEBUG omeroweb/webgateway/views.py | 175 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-21 00:35:08,730 [ scc.git] DEBUG 3 files changed, 210 insertions(+), 1 deletion(-)
2024-07-21 00:35:09,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:35:09,076 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:35:09,117 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:35:09,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:35:09,123 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:35:09,165 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:35:09,176 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f561c10a4f0> has no local changes
2024-07-21 00:35:09,176 [ 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)
Updating 5a2cd79d7..ba8c7e23c
Previously merged:
- PR 563 chris-allan 'Batch by MAX_TABLE_DOWNLOAD_ROWS'
- PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query'
- PR 562 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
- PR 560 will-moore 'linkify supports urls that include $ character'
- PR 558 jburel 'Update readme'
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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/122/)'
2024-07-21 00:35:09,186 [ scc.git] DEBUG [detached HEAD 45c86a83a] merge master -Dorg -Ssuccess-only
2024-07-21 00:35:09,186 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:35:09,187 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:35:09,236 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-07-21 00:35:09,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:35:09,511 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-07-21 00:35:09,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:35:09,942 [ scc.config] DEBUG Found submodule.omero-py.url
2024-07-21 00:35:10,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:35:10,353 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-07-21 00:35:10,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:35:10,771 [ scc.config] DEBUG Found submodule.omero-web.url
2024-07-21 00:35:11,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:35:11,202 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:35:11,248 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f561d2018e0> has local changes
2024-07-21 00:35:11,248 [ 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)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 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)
Updating 5a2cd79d7..ba8c7e23c
Previously merged:
- PR 563 chris-allan 'Batch by MAX_TABLE_DOWNLOAD_ROWS'
- PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query'
- PR 562 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
- PR 560 will-moore 'linkify supports urls that include $ character'
- PR 558 jburel 'Update readme'
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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/122/)'
2024-07-21 00:35:11,259 [ scc.git] DEBUG [detached HEAD 2d2ac00] merge master -Dorg -Ssuccess-only
2024-07-21 00:35:11,259 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-07-21 00:35:11,259 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-21 00:35:11,259 [ scc.merge] INFO Already up to date.
2024-07-21 00:35:11,259 [ scc.merge] INFO
2024-07-21 00:35:11,259 [ scc.merge] INFO
2024-07-21 00:35:11,259 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-07-21 00:35:11,260 [ scc.merge] INFO Already up to date.
2024-07-21 00:35:11,260 [ scc.merge] INFO
2024-07-21 00:35:11,260 [ scc.merge] INFO Merged PRs:
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-21 00:35:11,260 [ scc.merge] INFO
2024-07-21 00:35:11,260 [ scc.merge] INFO Repository: ome/omero-marshal
2024-07-21 00:35:11,260 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-07-21 00:35:11,260 [ scc.merge] INFO Already up to date.
2024-07-21 00:35:11,260 [ scc.merge] INFO
2024-07-21 00:35:11,260 [ scc.merge] INFO Merged PRs:
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-21 00:35:11,260 [ scc.merge] INFO
2024-07-21 00:35:11,260 [ scc.merge] INFO Repository: ome/omero-py
2024-07-21 00:35:11,260 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-07-21 00:35:11,260 [ scc.merge] INFO Already up to date.
2024-07-21 00:35:11,260 [ scc.merge] INFO
2024-07-21 00:35:11,260 [ scc.merge] INFO Merged PRs:
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-07-21 00:35:11,260 [ scc.merge] INFO
2024-07-21 00:35:11,260 [ scc.merge] INFO Repository: ome/omero-scripts
2024-07-21 00:35:11,260 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-21 00:35:11,260 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-21 00:35:11,261 [ scc.merge] INFO Already up to date.
2024-07-21 00:35:11,261 [ scc.merge] INFO
2024-07-21 00:35:11,261 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-21 00:35:11,261 [ scc.merge] INFO
2024-07-21 00:35:11,261 [ scc.merge] INFO Repository: ome/omero-web
2024-07-21 00:35:11,261 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-07-21 00:35:11,261 [ scc.merge] INFO Updating 5a2cd79d7..ba8c7e23c
2024-07-21 00:35:11,261 [ scc.merge] INFO Previously merged:
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 563 chris-allan 'Batch by MAX_TABLE_DOWNLOAD_ROWS'
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query'
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 562 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 560 will-moore 'linkify supports urls that include $ character'
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 558 jburel 'Update readme'
2024-07-21 00:35:11,261 [ scc.merge] INFO
2024-07-21 00:35:11,261 [ scc.merge] INFO Merged PRs:
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 555 chris-allan 'Archive status'
2024-07-21 00:35:11,261 [ scc.merge] INFO - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-21 00:35:11,261 [ scc.merge] INFO
2024-07-21 00:35:11,261 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-21 00:35:11,261 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:35:11,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-21 00:35:11,267 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:35:11,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:35:11,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-21 00:35:11,272 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:35:11,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:35:11,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-21 00:35:11,277 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:35:11,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:35:11,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-21 00:35:11,282 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:35:11,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-21 00:35:11,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-21 00:35:11,286 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:35:11,290 [ 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 5a2cd79d7
nothing to commit, working tree clean
HEAD detached from cc9eff3
nothing to commit, working tree clean
2024-07-21 00:35:42,015 [ 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