Started by upstream project "Trigger" build number 225
originally caused by:
Started by user devspace
[Pipeline] Start of Pipeline
[Pipeline] node
Running on testintegration in /home/omero/workspace/OMERO-python-superbuild-push
[Pipeline] {
[Pipeline] library
Loading library recursiveMerge@master
Attempting to resolve master from remote references...
> git --version # timeout=10
> git --version # 'git version 2.39.2'
> git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10
Found match: refs/heads/master revision f061dff15033c5cd55249a383f52c15ca4a0e5cf
The recommended git tool is: NONE
No credentials specified
> git rev-parse --resolve-git-dir /var/jenkins_home/jobs/OMERO-python-superbuild-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10
Fetching changes from the remote Git repository
> git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10
Fetching without tags
Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git
> git --version # timeout=10
> git --version # 'git version 2.39.2'
> git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10
Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master)
> git config core.sparsecheckout # timeout=10
> git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10
Commit message: "Merge pull request #17 from jburel/python3"
> git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10
[Pipeline] checkout
The recommended git tool is: NONE
No credentials specified
Fetching changes from the remote Git repository
Checking out Revision e849d7220735d67c4a474051cc03805d0a822cde (refs/remotes/origin/master)
> git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-python-superbuild-push/.git # timeout=10
> git config remote.origin.url https://github.com/ome/omero-python-superbuild.git # timeout=10
Fetching upstream changes from https://github.com/ome/omero-python-superbuild.git
> git --version # timeout=10
> git --version # 'git version 2.43.5'
> git fetch --tags --force --progress -- https://github.com/ome/omero-python-superbuild.git +refs/heads/*:refs/remotes/origin/* # timeout=10
> git rev-parse refs/remotes/origin/master^{commit} # timeout=10
> git config core.sparsecheckout # timeout=10
> git checkout -f e849d7220735d67c4a474051cc03805d0a822cde # timeout=10
Commit message: "Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1"
> git rev-list --no-walk e849d7220735d67c4a474051cc03805d0a822cde # timeout=10
Cleaning workspace
> git rev-parse --verify HEAD # timeout=10
Resetting working tree
> git reset --hard # timeout=10
> git clean -fdx # timeout=10
> git submodule foreach --recursive git reset --hard # timeout=10
> git submodule foreach --recursive git clean -fdx # timeout=10
> git remote # timeout=10
> git submodule init # timeout=10
> git submodule sync # timeout=10
> git config --get remote.origin.url # timeout=10
> git submodule init # timeout=10
> git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10
> git config --get submodule.omero-py.url # timeout=10
> git config -f .gitmodules --get submodule.omero-py.path # timeout=10
> git config --get submodule.omero-web.url # timeout=10
> git config -f .gitmodules --get submodule.omero-web.path # timeout=10
> git config --get submodule.omero-marshal.url # timeout=10
> git config -f .gitmodules --get submodule.omero-marshal.path # timeout=10
> git config --get submodule.omero-dropbox.url # timeout=10
> git config -f .gitmodules --get submodule.omero-dropbox.path # timeout=10
> git config --get submodule.omero-scripts.url # timeout=10
> git config -f .gitmodules --get submodule.omero-scripts.path # timeout=10
> git submodule update --init --recursive omero-py # timeout=10
> git submodule update --init --recursive omero-web # timeout=10
[Pipeline] pwd
[Pipeline] copyArtifacts
Copied 1 artifact from "OMERO-build-push" build number 193
[Pipeline] sh
+ pushd build
~/workspace/OMERO-python-superbuild-push/build ~/workspace/OMERO-python-superbuild-push
+ curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz
+ tar -zxf -
+ popd
~/workspace/OMERO-python-superbuild-push
+ python3 -m venv build/venv
> git submodule update --init --recursive omero-marshal # timeout=10
> git submodule update --init --recursive omero-dropbox # timeout=10
> git submodule update --init --recursive omero-scripts # timeout=10
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ python3 -m pip install -U pip
Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3)
Collecting pip
Using cached pip-24.2-py3-none-any.whl (1.8 MB)
Installing collected packages: pip
Attempting uninstall: pip
Found existing installation: pip 21.2.3
Uninstalling pip-21.2.3:
Successfully uninstalled pip-21.2.3
Successfully installed pip-24.2
+ python3 -m pip install scc
Collecting scc
Using cached scc-0.20.0-py3-none-any.whl.metadata (3.6 kB)
Collecting PyGithub>=1.54 (from scc)
Using cached PyGithub-2.4.0-py3-none-any.whl.metadata (3.9 kB)
Collecting PyYAML>=5.1 (from scc)
Using cached PyYAML-6.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.1 kB)
Collecting future (from scc)
Using cached future-1.0.0-py3-none-any.whl.metadata (4.0 kB)
Collecting ruamel.yaml (from scc)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl.metadata (23 kB)
Collecting ruamel.yaml.jinja2 (from scc)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl.metadata (2.9 kB)
Collecting six (from scc)
Using cached six-1.16.0-py2.py3-none-any.whl.metadata (1.8 kB)
Collecting urllib3<2 (from scc)
Using cached urllib3-1.26.20-py2.py3-none-any.whl.metadata (50 kB)
Collecting yaclifw<0.3,>=0.2.0 (from scc)
Using cached yaclifw-0.2.0-py3-none-any.whl
Collecting pynacl>=1.4.0 (from PyGithub>=1.54->scc)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl.metadata (8.6 kB)
Collecting requests>=2.14.0 (from PyGithub>=1.54->scc)
Using cached requests-2.32.3-py3-none-any.whl.metadata (4.6 kB)
Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached PyJWT-2.9.0-py3-none-any.whl.metadata (3.0 kB)
Collecting typing-extensions>=4.0.0 (from PyGithub>=1.54->scc)
Using cached typing_extensions-4.12.2-py3-none-any.whl.metadata (3.0 kB)
Collecting Deprecated (from PyGithub>=1.54->scc)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl.metadata (5.4 kB)
Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl.metadata (2.2 kB)
Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached cryptography-43.0.1-cp39-abi3-manylinux_2_28_x86_64.whl.metadata (5.4 kB)
Collecting cffi>=1.4.1 (from pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached cffi-1.17.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (1.5 kB)
Collecting charset-normalizer<4,>=2 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (33 kB)
Collecting idna<4,>=2.5 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached idna-3.10-py3-none-any.whl.metadata (10 kB)
Collecting certifi>=2017.4.17 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached certifi-2024.8.30-py3-none-any.whl.metadata (2.2 kB)
Collecting wrapt<2,>=1.10 (from Deprecated->PyGithub>=1.54->scc)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (6.6 kB)
Collecting pycparser (from cffi>=1.4.1->pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached pycparser-2.22-py3-none-any.whl.metadata (943 bytes)
Using cached scc-0.20.0-py3-none-any.whl (48 kB)
Using cached PyGithub-2.4.0-py3-none-any.whl (362 kB)
Using cached PyYAML-6.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (737 kB)
Using cached urllib3-1.26.20-py2.py3-none-any.whl (144 kB)
Using cached future-1.0.0-py3-none-any.whl (491 kB)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl (117 kB)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB)
Using cached six-1.16.0-py2.py3-none-any.whl (11 kB)
Using cached PyJWT-2.9.0-py3-none-any.whl (22 kB)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl (856 kB)
Using cached requests-2.32.3-py3-none-any.whl (64 kB)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl (562 kB)
Using cached typing_extensions-4.12.2-py3-none-any.whl (37 kB)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl (9.6 kB)
Using cached certifi-2024.8.30-py3-none-any.whl (167 kB)
Using cached cffi-1.17.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (445 kB)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (142 kB)
Using cached cryptography-43.0.1-cp39-abi3-manylinux_2_28_x86_64.whl (4.0 MB)
Using cached idna-3.10-py3-none-any.whl (70 kB)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (80 kB)
Using cached pycparser-2.22-py3-none-any.whl (117 kB)
Installing collected packages: wrapt, urllib3, typing-extensions, six, ruamel.yaml.clib, PyYAML, pyjwt, pycparser, idna, future, charset-normalizer, certifi, yaclifw, ruamel.yaml, requests, Deprecated, cffi, ruamel.yaml.jinja2, pynacl, cryptography, PyGithub, scc
Successfully installed Deprecated-1.2.14 PyGithub-2.4.0 PyYAML-6.0.2 certifi-2024.8.30 cffi-1.17.1 charset-normalizer-3.3.2 cryptography-43.0.1 future-1.0.0 idna-3.10 pycparser-2.22 pyjwt-2.9.0 pynacl-1.5.0 requests-2.32.3 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.8 ruamel.yaml.jinja2-0.2.7 scc-0.20.0 six-1.16.0 typing-extensions-4.12.2 urllib3-1.26.20 wrapt-1.16.0 yaclifw-0.2.0
[Pipeline] sh
+ export BASE_REPO=omero-python-superbuild.git
+ BASE_REPO=omero-python-superbuild.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-09-26 05:33:43,477 [ scc.config] DEBUG Found github.token
2024-09-26 05:33:43,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-26 05:33:43,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:33:44,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:33:44,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-26 05:33:44,427 [ scc.gh] DEBUG 4317 remaining from 5000 (Reset at 05:09
2024-09-26 05:33:44,428 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-26 05:33:44,432 [ scc.git] DEBUG Check current status
2024-09-26 05:33:44,433 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-26 05:33:44,437 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-09-26 05:33:44,438 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-26 05:33:44,479 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-26 05:33:44,481 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-26 05:33:44,485 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-26 05:33:44,489 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-26 05:33:44,492 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-09-26 05:33:44,498 [ scc.config] DEBUG Found remote.origin.url
2024-09-26 05:33:44,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-26 05:33:45,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-26 05:33:45,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-26 05:33:46,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-26 05:33:46,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-26 05:33:46,571 [ scc.git] DEBUG Resetting...
2024-09-26 05:33:46,571 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-26 05:33:46,577 [ scc.git] DEBUG HEAD is now at e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-09-26 05:33:46,577 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-26 05:33:46,636 [ scc.git] DEBUG Check current status
2024-09-26 05:33:46,636 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-26 05:33:46,641 [ scc.git] DEBUG e849d72 Merge pull request #292 from ome/dependabot/submodules/omero-web-da5b7d1
2024-09-26 05:33:46,641 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-26 05:33:46,692 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-26 05:33:46,695 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-26 05:33:46,699 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-26 05:33:46,704 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-26 05:33:46,707 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-09-26 05:33:46,708 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-26 05:33:46,709 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-26 05:33:46,709 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-26 05:33:46,709 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-26 05:33:46,709 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-26 05:33:46,709 [ scc.repo] DEBUG ## PRs found:
2024-09-26 05:33:47,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-26 05:33:47,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-09-26 05:33:47,503 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-26 05:33:47,503 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-09-26 05:33:47,503 [ scc.repo] DEBUG ## Branches found:
2024-09-26 05:33:47,503 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:33:47,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:33:47,507 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 05:33:47,511 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 05:33:47,512 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 05:33:47,516 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 05:33:47,520 [ scc.git] DEBUG Already up to date.
2024-09-26 05:33:47,520 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-09-26 05:33:47,845 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-26 05:33:47,846 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-09-26 05:33:47,851 [ scc.git] DEBUG ## Unique users: []
2024-09-26 05:33:47,851 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:33:47,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:33:47,855 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-09-26 05:33:47,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:33:47,921 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 293 (Bump omero-py from `749a68a` to `4fd72ef`) 9660559833988d271074de56e54f2462a7be74e9'
2024-09-26 05:33:47,931 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:33:47,933 [ scc.git] DEBUG omero-py | 2 +-
2024-09-26 05:33:47,933 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-26 05:33:48,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:33:48,066 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 05:33:48,186 [ scc.git] DEBUG Submodule path 'omero-py': checked out '4fd72efaa8cdbec9da98e1d28678af16878a86ba'
2024-09-26 05:33:48,187 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:33:48,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:33:48,191 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 05:33:48,408 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f102c9ebb80> has no local changes
2024-09-26 05:33:48,408 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
Generated by OMERO-python-superbuild-push#184 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/184/)'
2024-09-26 05:33:48,435 [ scc.git] DEBUG [detached HEAD 93c1e79] merge master -Dorg -Snone
2024-09-26 05:33:48,436 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-26 05:33:48,436 [ scc.merge] INFO Already up to date.
2024-09-26 05:33:48,436 [ scc.merge] INFO
2024-09-26 05:33:48,436 [ scc.merge] INFO Merged PRs:
2024-09-26 05:33:48,436 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-09-26 05:33:48,436 [ scc.merge] INFO
2024-09-26 05:33:48,436 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-26 05:33:48,436 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-09-26 05:33:51,196 [ scc.config] DEBUG Found github.token
2024-09-26 05:33:51,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-26 05:33:51,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:33:51,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:33:52,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-26 05:33:52,138 [ scc.gh] DEBUG 4307 remaining from 5000 (Reset at 05:09
2024-09-26 05:33:52,139 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-26 05:33:52,144 [ scc.git] DEBUG Check current status
2024-09-26 05:33:52,144 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-26 05:33:52,147 [ scc.git] DEBUG 93c1e79 merge master -Dorg -Snone
2024-09-26 05:33:52,147 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-26 05:33:52,188 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-26 05:33:52,191 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-26 05:33:52,194 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-09-26 05:33:52,198 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-26 05:33:52,202 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-09-26 05:33:52,206 [ scc.config] DEBUG Found remote.origin.url
2024-09-26 05:33:52,206 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-09-26 05:33:52,208 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-09-26 05:33:52,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-26 05:33:53,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-26 05:33:53,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-26 05:33:53,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-26 05:33:54,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-26 05:33:54,236 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 05:33:54,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-26 05:33:54,283 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-26 05:33:54,287 [ scc.git] DEBUG Check current status
2024-09-26 05:33:54,287 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-26 05:33:54,290 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-09-26 05:33:54,291 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-26 05:33:54,331 [ scc.config] DEBUG Found remote.origin.url
2024-09-26 05:33:54,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-09-26 05:33:55,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-26 05:33:55,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-26 05:33:55,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-26 05:33:56,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-26 05:33:56,377 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 05:33:56,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:33:56,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-26 05:33:56,416 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-26 05:33:56,421 [ scc.git] DEBUG Check current status
2024-09-26 05:33:56,421 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-26 05:33:56,425 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-09-26 05:33:56,425 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-26 05:33:56,468 [ scc.config] DEBUG Found remote.origin.url
2024-09-26 05:33:56,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-09-26 05:33:57,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-26 05:33:57,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-26 05:33:58,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-26 05:33:58,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-26 05:33:58,520 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 05:33:58,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:33:58,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-26 05:33:58,565 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-26 05:33:58,570 [ scc.git] DEBUG Check current status
2024-09-26 05:33:58,570 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-26 05:33:58,574 [ scc.git] DEBUG 4fd72efa Bump version: 5.19.5 → 5.19.6.dev0
2024-09-26 05:33:58,574 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-26 05:33:58,619 [ scc.config] DEBUG Found remote.origin.url
2024-09-26 05:33:58,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-09-26 05:33:59,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-26 05:33:59,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-26 05:34:00,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-26 05:34:00,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-26 05:34:00,704 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 05:34:00,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:34:00,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-26 05:34:00,744 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-26 05:34:00,749 [ scc.git] DEBUG Check current status
2024-09-26 05:34:00,750 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-26 05:34:00,753 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-26 05:34:00,754 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-26 05:34:00,793 [ scc.config] DEBUG Found remote.origin.url
2024-09-26 05:34:00,794 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-09-26 05:34:01,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-09-26 05:34:01,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-26 05:34:02,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-26 05:34:02,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-26 05:34:02,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-26 05:34:02,846 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 05:34:02,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:34:02,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-26 05:34:02,886 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-26 05:34:02,890 [ scc.git] DEBUG Check current status
2024-09-26 05:34:02,891 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-26 05:34:02,895 [ scc.git] DEBUG da5b7d11f Bump version: 5.27.2 → 5.27.3.dev0
2024-09-26 05:34:02,895 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-26 05:34:02,937 [ scc.config] DEBUG Found remote.origin.url
2024-09-26 05:34:03,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-09-26 05:34:03,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-26 05:34:04,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-26 05:34:04,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-26 05:34:05,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-26 05:34:05,104 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 05:34:05,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:34:05,154 [ scc.git] DEBUG Resetting...
2024-09-26 05:34:05,154 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-26 05:34:05,162 [ scc.git] DEBUG HEAD is now at 93c1e79 merge master -Dorg -Snone
2024-09-26 05:34:05,162 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-26 05:34:05,219 [ scc.git] DEBUG Check current status
2024-09-26 05:34:05,219 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-26 05:34:05,225 [ scc.git] DEBUG 93c1e79 merge master -Dorg -Snone
2024-09-26 05:34:05,226 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-26 05:34:05,269 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-26 05:34:05,272 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-26 05:34:05,276 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-09-26 05:34:05,280 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-26 05:34:05,283 [ scc.git] DEBUG da5b7d11f5375f024d3881db2dcc63899b4087da omero-web (v5.27.2-1-gda5b7d11f)
2024-09-26 05:34:05,284 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-26 05:34:05,284 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-26 05:34:05,285 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-26 05:34:05,285 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-26 05:34:05,285 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-26 05:34:05,285 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-09-26 05:34:05,285 [ scc.repo] DEBUG ## PRs found:
2024-09-26 05:34:05,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-26 05:34:06,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/293 HTTP/1.1" 200 None
2024-09-26 05:34:06,064 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-26 05:34:06,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-09-26 05:34:07,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:07,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/9660559833988d271074de56e54f2462a7be74e9 HTTP/1.1" 200 None
2024-09-26 05:34:07,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/9660559833988d271074de56e54f2462a7be74e9?per_page=1 HTTP/1.1" 200 2
2024-09-26 05:34:07,990 [ scc.repo] DEBUG - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-09-26 05:34:07,991 [ scc.repo] DEBUG ## Branches found:
2024-09-26 05:34:07,991 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:34:07,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:07,997 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 05:34:08,002 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 05:34:08,002 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 05:34:08,007 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 05:34:08,012 [ scc.git] DEBUG Already up to date.
2024-09-26 05:34:08,012 [ scc.git] DEBUG Calling 'git fetch origin pull/293/head'
2024-09-26 05:34:08,342 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-26 05:34:08,343 [ scc.git] DEBUG * branch refs/pull/293/head -> FETCH_HEAD
2024-09-26 05:34:08,349 [ scc.git] DEBUG ## Unique users: []
2024-09-26 05:34:08,350 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:34:08,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:08,356 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9660559833988d271074de56e54f2462a7be74e9'
2024-09-26 05:34:08,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:08,367 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 293 (Bump omero-py from `749a68a` to `4fd72ef`) 9660559833988d271074de56e54f2462a7be74e9'
2024-09-26 05:34:08,371 [ scc.git] DEBUG Already up to date.
2024-09-26 05:34:08,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:34:08,510 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 05:34:08,556 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:34:08,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:08,563 [ scc.repo] DEBUG ## PRs found:
2024-09-26 05:34:09,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-09-26 05:34:09,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-09-26 05:34:09,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-09-26 05:34:10,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-26 05:34:10,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:11,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-26 05:34:11,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-09-26 05:34:11,866 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-26 05:34:11,866 [ scc.repo] DEBUG ## Branches found:
2024-09-26 05:34:11,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-26 05:34:11,866 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:34:11,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:11,871 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 05:34:11,874 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 05:34:11,874 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 05:34:11,878 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 05:34:11,882 [ scc.git] DEBUG Already up to date.
2024-09-26 05:34:11,883 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-09-26 05:34:12,219 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-09-26 05:34:12,219 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-09-26 05:34:12,225 [ scc.git] DEBUG ## Unique users: []
2024-09-26 05:34:12,225 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:34:12,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:12,230 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-09-26 05:34:12,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:12,239 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-09-26 05:34:12,401 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-09-26 05:34:12,401 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-09-26 05:34:12,401 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-09-26 05:34:12,401 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-09-26 05:34:12,401 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-09-26 05:34:12,401 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-09-26 05:34:12,401 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-09-26 05:34:12,401 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-09-26 05:34:12,401 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-09-26 05:34:12,402 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:34:12,406 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-09-26 05:34:12,406 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-09-26 05:34:12,406 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-09-26 05:34:12,406 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-09-26 05:34:12,406 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-09-26 05:34:12,406 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-09-26 05:34:12,406 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-09-26 05:34:12,406 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-09-26 05:34:12,406 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-09-26 05:34:12,406 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-09-26 05:34:12,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:34:12,548 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 05:34:12,589 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:34:12,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:12,595 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 05:34:12,634 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 05:34:12,640 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f984f314f70> has no local changes
2024-09-26 05:34:12,641 [ 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#184 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/184/)'
2024-09-26 05:34:12,648 [ scc.git] DEBUG [detached HEAD 1b4cc3e] merge master -Dorg -Ssuccess-only
2024-09-26 05:34:12,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:34:12,648 [ scc.repo] DEBUG ## PRs found:
2024-09-26 05:34:13,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-09-26 05:34:13,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-09-26 05:34:14,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-09-26 05:34:14,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-26 05:34:14,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:15,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-26 05:34:15,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-09-26 05:34:15,874 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-26 05:34:16,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-09-26 05:34:16,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-09-26 05:34:17,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-09-26 05:34:17,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-09-26 05:34:17,763 [ scc.repo] DEBUG ## Branches found:
2024-09-26 05:34:17,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-26 05:34:17,764 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:34:17,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:17,769 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 05:34:17,773 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 05:34:17,774 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 05:34:17,778 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 05:34:17,783 [ scc.git] DEBUG Already up to date.
2024-09-26 05:34:17,783 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-09-26 05:34:18,188 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-09-26 05:34:18,188 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-09-26 05:34:18,193 [ scc.git] DEBUG ## Unique users: []
2024-09-26 05:34:18,193 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:34:18,193 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:18,199 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-26 05:34:18,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:18,209 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-26 05:34:18,240 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-09-26 05:34:18,241 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:34:18,244 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-09-26 05:34:18,245 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-09-26 05:34:18,245 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-09-26 05:34:18,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:34:18,387 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 05:34:18,427 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:34:18,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:18,434 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 05:34:18,474 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 05:34:18,480 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9851617ee0> has no local changes
2024-09-26 05:34:18,480 [ 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#184 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/184/)'
2024-09-26 05:34:18,488 [ scc.git] DEBUG [detached HEAD c93c135] merge master -Dorg -Ssuccess-only
2024-09-26 05:34:18,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:34:18,489 [ scc.repo] DEBUG ## PRs found:
2024-09-26 05:34:19,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-09-26 05:34:20,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-09-26 05:34:20,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-09-26 05:34:21,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-09-26 05:34:21,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-09-26 05:34:22,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-26 05:34:22,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:23,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-26 05:34:23,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-26 05:34:23,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:24,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-26 05:34:24,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-09-26 05:34:24,893 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-09-26 05:34:25,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-09-26 05:34:25,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-09-26 05:34:26,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-09-26 05:34:26,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:27,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-26 05:34:27,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-09-26 05:34:28,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-26 05:34:28,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:29,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-26 05:34:29,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-26 05:34:30,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:30,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-26 05:34:30,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-09-26 05:34:30,895 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-09-26 05:34:31,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-09-26 05:34:31,343 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-09-26 05:34:31,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-09-26 05:34:32,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-09-26 05:34:32,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-26 05:34:33,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:33,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-26 05:34:34,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-09-26 05:34:34,147 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-26 05:34:34,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-09-26 05:34:35,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-09-26 05:34:35,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-26 05:34:36,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:36,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-26 05:34:37,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-26 05:34:37,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:37,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-26 05:34:38,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-09-26 05:34:38,275 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-09-26 05:34:38,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-09-26 05:34:39,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-09-26 05:34:39,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-09-26 05:34:40,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-09-26 05:34:40,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-26 05:34:41,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:41,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-26 05:34:41,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-09-26 05:34:41,937 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-26 05:34:42,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-09-26 05:34:42,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-26 05:34:43,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:43,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-26 05:34:44,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-09-26 05:34:44,259 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-26 05:34:44,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-09-26 05:34:45,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-09-26 05:34:45,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-26 05:34:46,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:46,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-26 05:34:47,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-09-26 05:34:47,049 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-26 05:34:47,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-09-26 05:34:47,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-09-26 05:34:48,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-26 05:34:48,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:34:49,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-26 05:34:49,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-09-26 05:34:49,897 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-09-26 05:34:50,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-09-26 05:34:50,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-09-26 05:34:51,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-09-26 05:34:51,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-09-26 05:34:51,808 [ scc.repo] DEBUG ## Branches found:
2024-09-26 05:34:51,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-26 05:34:51,808 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:34:51,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:51,814 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 05:34:51,819 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 05:34:51,819 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 05:34:51,824 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 05:34:51,828 [ scc.git] DEBUG Already up to date.
2024-09-26 05:34:51,829 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-09-26 05:34:52,669 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-26 05:34:52,669 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-09-26 05:34:52,674 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-09-26 05:34:53,024 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-26 05:34:53,024 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-09-26 05:34:53,028 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-09-26 05:34:53,346 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-26 05:34:53,347 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-09-26 05:34:53,351 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-09-26 05:34:53,715 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-26 05:34:53,716 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-09-26 05:34:53,721 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-09-26 05:34:54,109 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-26 05:34:54,109 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-09-26 05:34:54,114 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-09-26 05:34:54,400 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-26 05:34:54,401 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-09-26 05:34:54,406 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-09-26 05:34:54,688 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-26 05:34:54,688 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-09-26 05:34:54,694 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-09-26 05:34:55,062 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-26 05:34:55,062 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-09-26 05:34:55,067 [ scc.git] DEBUG ## Unique users: []
2024-09-26 05:34:55,067 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:34:55,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:55,072 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-26 05:34:55,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:55,089 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-26 05:34:55,188 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-09-26 05:34:55,188 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-09-26 05:34:55,188 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:34:55,193 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-09-26 05:34:55,193 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-09-26 05:34:55,193 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-09-26 05:34:55,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:34:55,326 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-26 05:34:55,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:55,344 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-26 05:34:55,502 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-26 05:34:55,502 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-09-26 05:34:55,503 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:34:55,510 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-09-26 05:34:55,510 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-09-26 05:34:55,510 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-09-26 05:34:55,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:34:55,721 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-09-26 05:34:55,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:55,742 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-09-26 05:34:55,787 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-09-26 05:34:55,788 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:34:55,791 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-09-26 05:34:55,791 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-09-26 05:34:56,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:34:56,105 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-09-26 05:34:56,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:56,122 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2024-09-26 05:34:56,247 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-09-26 05:34:56,247 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-09-26 05:34:56,249 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:34:56,252 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-09-26 05:34:56,252 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-09-26 05:34:56,252 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-09-26 05:34:56,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:34:56,487 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-26 05:34:56,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:56,503 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-26 05:34:56,544 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:34:56,547 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-09-26 05:34:56,547 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-09-26 05:34:56,547 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-09-26 05:34:56,547 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-09-26 05:34:56,547 [ scc.git] DEBUG create mode 100644 connect.py
2024-09-26 05:34:56,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:34:56,878 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-09-26 05:34:56,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:56,897 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-09-26 05:34:56,945 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-09-26 05:34:56,946 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:34:56,950 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-09-26 05:34:56,950 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-26 05:34:57,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:34:57,262 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-09-26 05:34:57,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:57,289 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-09-26 05:34:57,338 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-09-26 05:34:57,340 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:34:57,344 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-09-26 05:34:57,344 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-09-26 05:34:57,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:34:57,646 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-26 05:34:57,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:57,664 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-26 05:34:57,761 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-26 05:34:57,763 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:34:57,771 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-09-26 05:34:57,771 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-09-26 05:34:58,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:34:58,038 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 05:34:58,086 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:34:58,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:34:58,093 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 05:34:58,140 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 05:34:58,150 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f984e2bff40> has no local changes
2024-09-26 05:34:58,150 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
- PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
Generated by OMERO-python-superbuild-push#184 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/184/)'
2024-09-26 05:34:58,160 [ scc.git] DEBUG [detached HEAD 3ffc5a15] merge master -Dorg -Ssuccess-only
2024-09-26 05:34:58,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:34:58,161 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-26 05:34:58,161 [ scc.repo] DEBUG ## PRs found:
2024-09-26 05:34:58,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-26 05:34:59,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-09-26 05:34:59,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-09-26 05:35:00,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:35:00,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-26 05:35:00,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-09-26 05:35:01,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-09-26 05:35:01,385 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-09-26 05:35:01,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-26 05:35:02,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-26 05:35:02,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-26 05:35:03,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-26 05:35:03,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-26 05:35:04,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-26 05:35:04,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-26 05:35:05,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:35:05,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-26 05:35:06,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-09-26 05:35:06,240 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-26 05:35:06,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-26 05:35:07,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-26 05:35:07,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-26 05:35:08,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-26 05:35:08,193 [ scc.repo] DEBUG ## Branches found:
2024-09-26 05:35:08,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-26 05:35:08,193 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:35:08,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:35:08,199 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-26 05:35:08,203 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 05:35:08,204 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-26 05:35:08,208 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-26 05:35:08,213 [ scc.git] DEBUG Already up to date.
2024-09-26 05:35:08,213 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-26 05:35:08,855 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-09-26 05:35:08,856 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-26 05:35:08,861 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-09-26 05:35:09,336 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-09-26 05:35:09,336 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-09-26 05:35:09,341 [ scc.git] DEBUG ## Unique users: []
2024-09-26 05:35:09,341 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:35:09,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:35:09,347 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-26 05:35:09,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:35:09,359 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-26 05:35:09,497 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-26 05:35:09,497 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-26 05:35:09,497 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-26 05:35:09,498 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-26 05:35:09,505 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-26 05:35:09,511 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-26 05:35:09,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:35:09,657 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-26 05:35:09,664 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-26 05:35:09,671 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#184](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/184/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/184/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-26 05:35:09,676 [ scc.config] DEBUG Found github.token
2024-09-26 05:35:09,677 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-26 05:35:09,677 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-09-26 05:35:09,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:35:09,688 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-09-26 05:35:09,699 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:35:09,702 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-09-26 05:35:09,702 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-09-26 05:35:10,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:35:10,039 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 05:35:10,082 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:35:10,082 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:35:10,088 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 05:35:10,130 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 05:35:10,136 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f984f314220> has no local changes
2024-09-26 05:35:10,136 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-python-superbuild-push#184 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/184/)'
2024-09-26 05:35:10,145 [ scc.git] DEBUG [detached HEAD f94ff98] merge master -Dorg -Ssuccess-only
2024-09-26 05:35:10,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:35:10,146 [ scc.repo] DEBUG ## PRs found:
2024-09-26 05:35:10,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-09-26 05:35:11,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581 HTTP/1.1" 200 None
2024-09-26 05:35:11,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/581/comments HTTP/1.1" 200 None
2024-09-26 05:35:12,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/580 HTTP/1.1" 200 None
2024-09-26 05:35:12,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc HTTP/1.1" 200 None
2024-09-26 05:35:13,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:35:13,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-26 05:35:13,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc HTTP/1.1" 200 None
2024-09-26 05:35:14,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc?per_page=1 HTTP/1.1" 200 None
2024-09-26 05:35:14,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc HTTP/1.1" 200 None
2024-09-26 05:35:15,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc/status HTTP/1.1" 200 None
2024-09-26 05:35:15,306 [ scc.repo] DEBUG - PR 580 sbesson 'omeroweb.webgateway.obj_id_bitmask: handle empty query results'
2024-09-26 05:35:15,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-09-26 05:35:16,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-09-26 05:35:16,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-09-26 05:35:17,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-09-26 05:35:17,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-09-26 05:35:18,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-09-26 05:35:18,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-26 05:35:19,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:35:19,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-26 05:35:19,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-26 05:35:20,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-09-26 05:35:20,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-26 05:35:21,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-09-26 05:35:21,252 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-26 05:35:21,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-09-26 05:35:22,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-09-26 05:35:22,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-26 05:35:23,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:35:23,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-26 05:35:23,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-26 05:35:24,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-09-26 05:35:24,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-26 05:35:25,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-09-26 05:35:25,288 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-26 05:35:25,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-09-26 05:35:26,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-09-26 05:35:26,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-09-26 05:35:27,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-26 05:35:27,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-26 05:35:27,738 [ scc.repo] DEBUG ## Branches found:
2024-09-26 05:35:27,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-26 05:35:27,738 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:35:27,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:35:27,744 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 05:35:27,749 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 05:35:27,749 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 05:35:27,754 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 05:35:27,760 [ scc.git] DEBUG Already up to date.
2024-09-26 05:35:27,760 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-09-26 05:35:29,098 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-26 05:35:29,099 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-09-26 05:35:29,104 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-09-26 05:35:29,439 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-26 05:35:29,439 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-09-26 05:35:29,444 [ scc.git] DEBUG Calling 'git fetch origin pull/580/head'
2024-09-26 05:35:29,799 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-26 05:35:29,799 [ scc.git] DEBUG * branch refs/pull/580/head -> FETCH_HEAD
2024-09-26 05:35:29,805 [ scc.git] DEBUG ## Unique users: []
2024-09-26 05:35:29,806 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:35:29,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:35:29,811 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-09-26 05:35:29,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:35:29,823 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-09-26 05:35:29,963 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-09-26 05:35:29,963 [ scc.git] DEBUG Auto-merging setup.py
2024-09-26 05:35:29,965 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:35:29,969 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-09-26 05:35:29,969 [ scc.git] DEBUG setup.py | 1 +
2024-09-26 05:35:29,969 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-09-26 05:35:30,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:35:30,103 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-09-26 05:35:30,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:35:30,116 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-09-26 05:35:30,203 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-09-26 05:35:30,203 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-09-26 05:35:30,204 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:35:30,208 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-09-26 05:35:30,208 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-09-26 05:35:30,208 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-09-26 05:35:30,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:35:30,482 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc'
2024-09-26 05:35:30,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:35:30,496 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 580 (omeroweb.webgateway.obj_id_bitmask: handle empty query results) 1c8ad8d1dd0e0fd1abaf6a3d74c439d73a2ffacc'
2024-09-26 05:35:30,515 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 05:35:30,520 [ scc.git] DEBUG omeroweb/webgateway/views.py | 6 ++++++
2024-09-26 05:35:30,520 [ scc.git] DEBUG 1 file changed, 6 insertions(+)
2024-09-26 05:35:30,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:35:30,866 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 05:35:30,907 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 05:35:30,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 05:35:30,913 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 05:35:30,950 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 05:35:30,961 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f984d214b20> has no local changes
2024-09-26 05:35:30,961 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 580 sbesson 'omeroweb.webgateway.obj_id_bitmask: handle empty query results'
Generated by OMERO-python-superbuild-push#184 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/184/)'
2024-09-26 05:35:30,974 [ scc.git] DEBUG [detached HEAD 853d151d5] merge master -Dorg -Ssuccess-only
2024-09-26 05:35:30,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:35:30,975 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 05:35:31,028 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-09-26 05:35:31,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:35:31,264 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-09-26 05:35:31,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:35:31,658 [ scc.config] DEBUG Found submodule.omero-py.url
2024-09-26 05:35:32,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:35:32,045 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-09-26 05:35:32,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:35:32,435 [ scc.config] DEBUG Found submodule.omero-web.url
2024-09-26 05:35:32,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 05:35:32,817 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 05:35:32,846 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f984f5aab80> has local changes
2024-09-26 05:35:32,846 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
- PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 580 sbesson 'omeroweb.webgateway.obj_id_bitmask: handle empty query results'
Generated by OMERO-python-superbuild-push#184 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/184/)'
2024-09-26 05:35:32,856 [ scc.git] DEBUG [detached HEAD 5e83cf0] merge master -Dorg -Ssuccess-only
2024-09-26 05:35:32,856 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-26 05:35:32,856 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-09-26 05:35:32,856 [ scc.merge] INFO Already up to date.
2024-09-26 05:35:32,856 [ scc.merge] INFO
2024-09-26 05:35:32,857 [ scc.merge] INFO Merged PRs:
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 293 dependabot[bot] 'Bump omero-py from `749a68a` to `4fd72ef`'
2024-09-26 05:35:32,857 [ scc.merge] INFO
2024-09-26 05:35:32,857 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-09-26 05:35:32,857 [ scc.merge] INFO Already up to date.
2024-09-26 05:35:32,857 [ scc.merge] INFO
2024-09-26 05:35:32,857 [ scc.merge] INFO Merged PRs:
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-26 05:35:32,857 [ scc.merge] INFO
2024-09-26 05:35:32,857 [ scc.merge] INFO Repository: ome/omero-marshal
2024-09-26 05:35:32,857 [ scc.merge] INFO Excluded PRs:
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-09-26 05:35:32,857 [ scc.merge] INFO Already up to date.
2024-09-26 05:35:32,857 [ scc.merge] INFO
2024-09-26 05:35:32,857 [ scc.merge] INFO Merged PRs:
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-26 05:35:32,857 [ scc.merge] INFO
2024-09-26 05:35:32,857 [ scc.merge] INFO Repository: ome/omero-py
2024-09-26 05:35:32,857 [ scc.merge] INFO Excluded PRs:
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-09-26 05:35:32,857 [ scc.merge] INFO Already up to date.
2024-09-26 05:35:32,857 [ scc.merge] INFO
2024-09-26 05:35:32,857 [ scc.merge] INFO Merged PRs:
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-26 05:35:32,857 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-09-26 05:35:32,858 [ scc.merge] INFO
2024-09-26 05:35:32,858 [ scc.merge] INFO Repository: ome/omero-scripts
2024-09-26 05:35:32,858 [ scc.merge] INFO Excluded PRs:
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-26 05:35:32,858 [ scc.merge] INFO Already up to date.
2024-09-26 05:35:32,858 [ scc.merge] INFO
2024-09-26 05:35:32,858 [ scc.merge] INFO Merged PRs:
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-09-26 05:35:32,858 [ scc.merge] INFO
2024-09-26 05:35:32,858 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-26 05:35:32,858 [ scc.merge] INFO
2024-09-26 05:35:32,858 [ scc.merge] INFO Repository: ome/omero-web
2024-09-26 05:35:32,858 [ scc.merge] INFO Excluded PRs:
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 581 Tom-TBT 'Dynamic generation of the LUTs png ' (user: Tom-TBT)
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-09-26 05:35:32,858 [ scc.merge] INFO Already up to date.
2024-09-26 05:35:32,858 [ scc.merge] INFO
2024-09-26 05:35:32,858 [ scc.merge] INFO Merged PRs:
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-26 05:35:32,858 [ scc.merge] INFO - PR 580 sbesson 'omeroweb.webgateway.obj_id_bitmask: handle empty query results'
2024-09-26 05:35:32,858 [ scc.merge] INFO
2024-09-26 05:35:32,858 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-26 05:35:32,859 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 05:35:32,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-26 05:35:32,863 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 05:35:32,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:35:32,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-26 05:35:32,867 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 05:35:32,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:35:32,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-26 05:35:32,871 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 05:35:32,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:35:32,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-26 05:35:32,875 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 05:35:32,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-26 05:35:32,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-26 05:35:32,879 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 05:35:32,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
Update component versions
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'omero-dropbox'
Entering 'omero-marshal'
Entering 'omero-py'
Entering 'omero-scripts'
Entering 'omero-web'
Entering 'omero-dropbox'
HEAD detached from a4307f4
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from cca4c2f
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 4fd72efa
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from da5b7d11f
nothing to commit, working tree clean
HEAD detached from e849d72
nothing to commit, working tree clean
2024-09-26 05:36:00,524 [ 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