Started by upstream project "Trigger" build number 311
originally caused by:
Started by timer
[Pipeline] Start of Pipeline
[Pipeline] node
Running on testintegration in /home/omero/workspace/OMERO-python-superbuild-push
[Pipeline] {
[Pipeline] library
Loading library recursiveMerge@master
Attempting to resolve master from remote references...
> git --version # timeout=10
> git --version # 'git version 2.39.2'
> git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10
Found match: refs/heads/master revision f061dff15033c5cd55249a383f52c15ca4a0e5cf
The recommended git tool is: NONE
No credentials specified
> git rev-parse --resolve-git-dir /var/jenkins_home/jobs/OMERO-python-superbuild-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10
Fetching changes from the remote Git repository
> git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10
Fetching without tags
Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git
> git --version # timeout=10
> git --version # 'git version 2.39.2'
> git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10
Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master)
> git config core.sparsecheckout # timeout=10
> git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10
Commit message: "Merge pull request #17 from jburel/python3"
> git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10
[Pipeline] checkout
The recommended git tool is: NONE
No credentials specified
Fetching changes from the remote Git repository
> 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
Checking out Revision d78ee19ccf7892e0febffe49db7977a49982a551 (refs/remotes/origin/master)
Commit message: "Merge pull request #302 from ome/dependabot/submodules/omero-py-7e296f2"
> git rev-parse refs/remotes/origin/master^{commit} # timeout=10
> git config core.sparsecheckout # timeout=10
> git checkout -f d78ee19ccf7892e0febffe49db7977a49982a551 # timeout=10
> git rev-list --no-walk d78ee19ccf7892e0febffe49db7977a49982a551 # timeout=10
Cleaning workspace
> git rev-parse --verify HEAD # timeout=10
Resetting working tree
> git reset --hard # timeout=10
> git clean -fdx # timeout=10
> git submodule foreach --recursive git reset --hard # timeout=10
> git submodule foreach --recursive git clean -fdx # timeout=10
> git remote # timeout=10
> git submodule init # timeout=10
> git submodule sync # timeout=10
> git config --get remote.origin.url # timeout=10
> git submodule init # timeout=10
> git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10
> git config --get submodule.omero-py.url # timeout=10
> git config -f .gitmodules --get submodule.omero-py.path # timeout=10
> git config --get submodule.omero-web.url # timeout=10
> git config -f .gitmodules --get submodule.omero-web.path # timeout=10
> git config --get submodule.omero-marshal.url # timeout=10
> git config -f .gitmodules --get submodule.omero-marshal.path # timeout=10
> git config --get submodule.omero-dropbox.url # timeout=10
> git config -f .gitmodules --get submodule.omero-dropbox.path # timeout=10
> git config --get submodule.omero-scripts.url # timeout=10
> git config -f .gitmodules --get submodule.omero-scripts.path # timeout=10
> git submodule update --init --recursive omero-py # timeout=10
> git submodule update --init --recursive omero-web # timeout=10
> git submodule update --init --recursive omero-marshal # timeout=10
> git submodule update --init --recursive omero-dropbox # timeout=10
[Pipeline] pwd
[Pipeline] copyArtifacts
Copied 1 artifact from "OMERO-build-push" build number 274
[Pipeline] sh
> git submodule update --init --recursive omero-scripts # timeout=10
+ pushd build
~/workspace/OMERO-python-superbuild-push/build ~/workspace/OMERO-python-superbuild-push
+ curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz
+ tar -zxf -
+ popd
~/workspace/OMERO-python-superbuild-push
+ python3 -m venv build/venv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ python3 -m pip install -U pip
Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3)
Collecting pip
Using cached pip-24.3.1-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.3.1
+ 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.5.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.17.0-py2.py3-none-any.whl.metadata (1.7 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.10.1-py3-none-any.whl.metadata (4.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.15-py2.py3-none-any.whl.metadata (5.5 kB)
Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc)
Using cached ruamel.yaml.clib-0.2.12-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.7 kB)
Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached cryptography-44.0.0-cp39-abi3-manylinux_2_28_x86_64.whl.metadata (5.7 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.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (34 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.12.14-py3-none-any.whl.metadata (2.3 kB)
Collecting wrapt<2,>=1.10 (from Deprecated->PyGithub>=1.54->scc)
Using cached wrapt-1.17.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (6.4 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.5.0-py3-none-any.whl (375 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.17.0-py2.py3-none-any.whl (11 kB)
Using cached PyJWT-2.10.1-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.12-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (724 kB)
Using cached typing_extensions-4.12.2-py3-none-any.whl (37 kB)
Using cached Deprecated-1.2.15-py2.py3-none-any.whl (9.9 kB)
Using cached certifi-2024.12.14-py3-none-any.whl (164 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.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (144 kB)
Using cached cryptography-44.0.0-cp39-abi3-manylinux_2_28_x86_64.whl (4.2 MB)
Using cached idna-3.10-py3-none-any.whl (70 kB)
Using cached wrapt-1.17.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (82 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.15 PyGithub-2.5.0 PyYAML-6.0.2 certifi-2024.12.14 cffi-1.17.1 charset-normalizer-3.4.0 cryptography-44.0.0 future-1.0.0 idna-3.10 pycparser-2.22 pyjwt-2.10.1 pynacl-1.5.0 requests-2.32.3 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.12 ruamel.yaml.jinja2-0.2.7 scc-0.20.0 six-1.17.0 typing-extensions-4.12.2 urllib3-1.26.20 wrapt-1.17.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-12-16 00:34:40,081 [ scc.config] DEBUG Found github.token
2024-12-16 00:34:40,084 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-12-16 00:34:40,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:34:40,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:34:41,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-12-16 00:34:41,052 [ scc.gh] DEBUG 4447 remaining from 5000 (Reset at 00:12
2024-12-16 00:34:41,053 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-16 00:34:41,058 [ scc.git] DEBUG Check current status
2024-12-16 00:34:41,058 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-16 00:34:41,062 [ scc.git] DEBUG d78ee19 Merge pull request #302 from ome/dependabot/submodules/omero-py-7e296f2
2024-12-16 00:34:41,062 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-16 00:34:41,109 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2024-12-16 00:34:41,329 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2024-12-16 00:34:41,419 [ scc.git] DEBUG 7e296f2e547155c4d8c914c55caf67261069eebe omero-py (v5.19.5-5-g7e296f2e)
2024-12-16 00:34:41,423 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-12-16 00:34:41,429 [ scc.git] DEBUG a1483bf008b05162b21f92d286133d501083acd7 omero-web (v5.28.0-3-ga1483bf00)
2024-12-16 00:34:41,433 [ scc.config] DEBUG Found remote.origin.url
2024-12-16 00:34:41,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-12-16 00:34:42,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-16 00:34:42,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-16 00:34:42,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-16 00:34:43,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-16 00:34:43,348 [ scc.git] DEBUG Resetting...
2024-12-16 00:34:43,348 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-12-16 00:34:43,354 [ scc.git] DEBUG HEAD is now at d78ee19 Merge pull request #302 from ome/dependabot/submodules/omero-py-7e296f2
2024-12-16 00:34:43,354 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-12-16 00:34:43,404 [ scc.git] DEBUG Check current status
2024-12-16 00:34:43,404 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-16 00:34:43,408 [ scc.git] DEBUG d78ee19 Merge pull request #302 from ome/dependabot/submodules/omero-py-7e296f2
2024-12-16 00:34:43,408 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-16 00:34:43,446 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2024-12-16 00:34:43,449 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2024-12-16 00:34:43,453 [ scc.git] DEBUG 7e296f2e547155c4d8c914c55caf67261069eebe omero-py (v5.19.5-5-g7e296f2e)
2024-12-16 00:34:43,456 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-12-16 00:34:43,460 [ scc.git] DEBUG a1483bf008b05162b21f92d286133d501083acd7 omero-web (v5.28.0-3-ga1483bf00)
2024-12-16 00:34:43,461 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-12-16 00:34:43,461 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-12-16 00:34:43,461 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-12-16 00:34:43,461 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-12-16 00:34:43,461 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-12-16 00:34:43,461 [ scc.repo] DEBUG ## PRs found:
2024-12-16 00:34:43,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-12-16 00:34:44,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/303 HTTP/1.1" 200 None
2024-12-16 00:34:44,289 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-16 00:34:44,289 [ scc.repo] DEBUG - PR 303 dependabot[bot] 'Bump omero-py from `7e296f2` to `7da917a`'
2024-12-16 00:34:44,289 [ scc.repo] DEBUG ## Branches found:
2024-12-16 00:34:44,290 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:34:44,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:34:44,294 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-16 00:34:44,297 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-16 00:34:44,297 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-16 00:34:44,300 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-16 00:34:44,304 [ scc.git] DEBUG Already up to date.
2024-12-16 00:34:44,304 [ scc.git] DEBUG Calling 'git fetch origin pull/303/head'
2024-12-16 00:34:44,617 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-12-16 00:34:44,617 [ scc.git] DEBUG * branch refs/pull/303/head -> FETCH_HEAD
2024-12-16 00:34:44,622 [ scc.git] DEBUG ## Unique users: []
2024-12-16 00:34:44,622 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:34:44,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:34:44,626 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6bd0948275a1c51251b72009c0f968691a050920'
2024-12-16 00:34:44,630 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:34:44,633 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 303 (Bump omero-py from `7e296f2` to `7da917a`) 6bd0948275a1c51251b72009c0f968691a050920'
2024-12-16 00:34:44,641 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:34:44,644 [ scc.git] DEBUG omero-py | 2 +-
2024-12-16 00:34:44,644 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-12-16 00:34:44,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:34:44,794 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-16 00:34:45,269 [ scc.git] DEBUG Submodule path 'omero-py': checked out '7da917a77ea9c1142dc4b992261e79466e897244'
2024-12-16 00:34:45,269 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:34:45,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:34:45,273 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-16 00:34:45,755 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe775ee5e20> has no local changes
2024-12-16 00:34:45,756 [ 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 303 dependabot[bot] 'Bump omero-py from `7e296f2` to `7da917a`'
Generated by OMERO-python-superbuild-push#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/265/)'
2024-12-16 00:34:45,780 [ scc.git] DEBUG [detached HEAD af728ad] merge master -Dorg -Snone
2024-12-16 00:34:45,780 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-12-16 00:34:45,781 [ scc.merge] INFO Already up to date.
2024-12-16 00:34:45,781 [ scc.merge] INFO
2024-12-16 00:34:45,781 [ scc.merge] INFO Merged PRs:
2024-12-16 00:34:45,781 [ scc.merge] INFO - PR 303 dependabot[bot] 'Bump omero-py from `7e296f2` to `7da917a`'
2024-12-16 00:34:45,781 [ scc.merge] INFO
2024-12-16 00:34:45,781 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-16 00:34:45,781 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
Submodule path 'omero-web': checked out '96d113830f31142cb272c5a486b048cd185c51bd'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-12-16 00:34:48,002 [ scc.config] DEBUG Found github.token
2024-12-16 00:34:48,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-12-16 00:34:48,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:34:48,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:34:48,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-12-16 00:34:48,933 [ scc.gh] DEBUG 4437 remaining from 5000 (Reset at 00:12
2024-12-16 00:34:48,934 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-16 00:34:48,938 [ scc.git] DEBUG Check current status
2024-12-16 00:34:48,938 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-16 00:34:48,941 [ scc.git] DEBUG af728ad merge master -Dorg -Snone
2024-12-16 00:34:48,942 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-16 00:34:48,981 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2024-12-16 00:34:48,983 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2024-12-16 00:34:48,987 [ scc.git] DEBUG 7da917a77ea9c1142dc4b992261e79466e897244 omero-py (v5.19.5-11-g7da917a7)
2024-12-16 00:34:48,991 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-12-16 00:34:48,994 [ scc.git] DEBUG +96d113830f31142cb272c5a486b048cd185c51bd omero-web (v5.28.0-5-g96d113830)
2024-12-16 00:34:48,998 [ scc.config] DEBUG Found remote.origin.url
2024-12-16 00:34:48,998 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-12-16 00:34:49,000 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-12-16 00:34:49,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-12-16 00:34:49,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-16 00:34:50,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-16 00:34:50,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-16 00:34:51,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-16 00:34:51,183 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-16 00:34:51,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-12-16 00:34:51,231 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-16 00:34:51,235 [ scc.git] DEBUG Check current status
2024-12-16 00:34:51,235 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-16 00:34:51,238 [ scc.git] DEBUG 01fa0c5 Merge pull request #24 from jburel/build
2024-12-16 00:34:51,239 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-16 00:34:51,279 [ scc.config] DEBUG Found remote.origin.url
2024-12-16 00:34:51,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-12-16 00:34:52,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-16 00:34:52,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-16 00:34:52,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-16 00:34:53,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-16 00:34:53,379 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-16 00:34:53,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:34:53,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-12-16 00:34:53,420 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-16 00:34:53,424 [ scc.git] DEBUG Check current status
2024-12-16 00:34:53,424 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-16 00:34:53,427 [ scc.git] DEBUG 6d44f66 Merge pull request #82 from jburel/build
2024-12-16 00:34:53,428 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-16 00:34:53,470 [ scc.config] DEBUG Found remote.origin.url
2024-12-16 00:34:53,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-12-16 00:34:54,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-16 00:34:54,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-16 00:34:55,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-16 00:34:55,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-16 00:34:55,557 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-16 00:34:55,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:34:55,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-12-16 00:34:55,597 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-16 00:34:55,601 [ scc.git] DEBUG Check current status
2024-12-16 00:34:55,601 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-16 00:34:55,606 [ scc.git] DEBUG 7da917a7 Merge pull request #439 from tstoeter/patch-1
2024-12-16 00:34:55,606 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-16 00:34:55,649 [ scc.config] DEBUG Found remote.origin.url
2024-12-16 00:34:56,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-12-16 00:34:56,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-16 00:34:56,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-16 00:34:57,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-16 00:34:57,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-16 00:34:57,724 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-16 00:34:57,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:34:57,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-12-16 00:34:57,762 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-16 00:34:57,766 [ scc.git] DEBUG Check current status
2024-12-16 00:34:57,766 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-16 00:34:57,775 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-12-16 00:34:57,776 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-16 00:34:57,817 [ scc.config] DEBUG Found remote.origin.url
2024-12-16 00:34:57,818 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-12-16 00:34:58,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-12-16 00:34:58,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-16 00:34:59,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-16 00:34:59,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-16 00:35:00,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-16 00:35:00,006 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-16 00:35:00,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:35:00,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-12-16 00:35:00,045 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-16 00:35:00,050 [ scc.git] DEBUG Check current status
2024-12-16 00:35:00,050 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-16 00:35:00,102 [ scc.git] DEBUG 96d113830 Merge pull request #601 from jburel/cleanup
2024-12-16 00:35:00,102 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-16 00:35:00,146 [ scc.config] DEBUG Found remote.origin.url
2024-12-16 00:35:00,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-12-16 00:35:00,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-16 00:35:01,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-16 00:35:01,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-16 00:35:02,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-16 00:35:02,188 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-16 00:35:02,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:35:02,230 [ scc.git] DEBUG Resetting...
2024-12-16 00:35:02,230 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-12-16 00:35:02,237 [ scc.git] DEBUG HEAD is now at af728ad merge master -Dorg -Snone
2024-12-16 00:35:02,237 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-12-16 00:35:02,304 [ scc.git] DEBUG Submodule path 'omero-web': checked out 'a1483bf008b05162b21f92d286133d501083acd7'
2024-12-16 00:35:02,308 [ scc.git] DEBUG Check current status
2024-12-16 00:35:02,308 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-16 00:35:02,312 [ scc.git] DEBUG af728ad merge master -Dorg -Snone
2024-12-16 00:35:02,312 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-16 00:35:02,355 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2024-12-16 00:35:02,358 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2024-12-16 00:35:02,362 [ scc.git] DEBUG 7da917a77ea9c1142dc4b992261e79466e897244 omero-py (v5.19.5-11-g7da917a7)
2024-12-16 00:35:02,366 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-12-16 00:35:02,370 [ scc.git] DEBUG a1483bf008b05162b21f92d286133d501083acd7 omero-web (v5.28.0-3-ga1483bf00)
2024-12-16 00:35:02,371 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-12-16 00:35:02,371 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-12-16 00:35:02,371 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-12-16 00:35:02,371 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-12-16 00:35:02,371 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-12-16 00:35:02,371 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-12-16 00:35:02,371 [ scc.repo] DEBUG ## PRs found:
2024-12-16 00:35:02,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-12-16 00:35:03,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/303 HTTP/1.1" 200 None
2024-12-16 00:35:03,161 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-16 00:35:03,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6bd0948275a1c51251b72009c0f968691a050920 HTTP/1.1" 200 None
2024-12-16 00:35:04,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6bd0948275a1c51251b72009c0f968691a050920/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-16 00:35:04,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6bd0948275a1c51251b72009c0f968691a050920 HTTP/1.1" 200 None
2024-12-16 00:35:05,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/6bd0948275a1c51251b72009c0f968691a050920?per_page=1 HTTP/1.1" 200 2
2024-12-16 00:35:05,227 [ scc.repo] DEBUG - PR 303 dependabot[bot] 'Bump omero-py from `7e296f2` to `7da917a`'
2024-12-16 00:35:05,227 [ scc.repo] DEBUG ## Branches found:
2024-12-16 00:35:05,227 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:35:05,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:05,232 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-16 00:35:05,237 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-16 00:35:05,237 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-16 00:35:05,242 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-16 00:35:05,247 [ scc.git] DEBUG Already up to date.
2024-12-16 00:35:05,247 [ scc.git] DEBUG Calling 'git fetch origin pull/303/head'
2024-12-16 00:35:05,602 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-12-16 00:35:05,602 [ scc.git] DEBUG * branch refs/pull/303/head -> FETCH_HEAD
2024-12-16 00:35:05,608 [ scc.git] DEBUG ## Unique users: []
2024-12-16 00:35:05,608 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:35:05,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:05,613 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6bd0948275a1c51251b72009c0f968691a050920'
2024-12-16 00:35:05,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:05,622 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 303 (Bump omero-py from `7e296f2` to `7da917a`) 6bd0948275a1c51251b72009c0f968691a050920'
2024-12-16 00:35:05,627 [ scc.git] DEBUG Already up to date.
2024-12-16 00:35:05,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:35:05,767 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-16 00:35:05,810 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:35:05,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:05,815 [ scc.repo] DEBUG ## PRs found:
2024-12-16 00:35:06,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-12-16 00:35:06,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-12-16 00:35:07,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-12-16 00:35:07,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-12-16 00:35:08,225 [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-12-16 00:35:08,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-12-16 00:35:09,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-12-16 00:35:09,178 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-12-16 00:35:09,178 [ scc.repo] DEBUG ## Branches found:
2024-12-16 00:35:09,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-12-16 00:35:09,178 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:35:09,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:09,183 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-16 00:35:09,188 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-16 00:35:09,188 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-16 00:35:09,193 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-16 00:35:09,198 [ scc.git] DEBUG Already up to date.
2024-12-16 00:35:09,199 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-12-16 00:35:09,509 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-12-16 00:35:09,509 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-12-16 00:35:09,514 [ scc.git] DEBUG ## Unique users: []
2024-12-16 00:35:09,514 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:35:09,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:09,518 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-12-16 00:35:09,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:09,530 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-12-16 00:35:09,730 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-12-16 00:35:09,731 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-12-16 00:35:09,731 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-12-16 00:35:09,731 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-12-16 00:35:09,731 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-12-16 00:35:09,731 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-12-16 00:35:09,731 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-12-16 00:35:09,731 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-12-16 00:35:09,731 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-12-16 00:35:09,731 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:35:09,735 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-12-16 00:35:09,735 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-12-16 00:35:09,735 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-12-16 00:35:09,735 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-12-16 00:35:09,735 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-12-16 00:35:09,735 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-12-16 00:35:09,735 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-12-16 00:35:09,735 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-12-16 00:35:09,735 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-12-16 00:35:09,737 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-12-16 00:35:09,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:35:09,886 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-16 00:35:09,925 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:35:09,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:09,929 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-16 00:35:09,967 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-16 00:35:09,972 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f24408f5490> has no local changes
2024-12-16 00:35:09,973 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/265/)'
2024-12-16 00:35:09,980 [ scc.git] DEBUG [detached HEAD 69e80b7] merge master -Dorg -Ssuccess-only
2024-12-16 00:35:09,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:35:09,981 [ scc.repo] DEBUG ## PRs found:
2024-12-16 00:35:10,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-12-16 00:35:10,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/84 HTTP/1.1" 200 None
2024-12-16 00:35:11,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-12-16 00:35:11,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-12-16 00:35:12,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-12-16 00:35:12,988 [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-12-16 00:35:13,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-12-16 00:35:13,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-12-16 00:35:13,913 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-12-16 00:35:14,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-12-16 00:35:14,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-12-16 00:35:15,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-12-16 00:35:15,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-12-16 00:35:15,794 [ scc.repo] DEBUG ## Branches found:
2024-12-16 00:35:15,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-12-16 00:35:15,794 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:35:15,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:15,799 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-16 00:35:15,803 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-16 00:35:15,803 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-16 00:35:15,807 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-16 00:35:15,811 [ scc.git] DEBUG Already up to date.
2024-12-16 00:35:15,811 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-12-16 00:35:16,165 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-12-16 00:35:16,166 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-12-16 00:35:16,170 [ scc.git] DEBUG ## Unique users: []
2024-12-16 00:35:16,171 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:35:16,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:16,175 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-12-16 00:35:16,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:16,183 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-12-16 00:35:16,197 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-12-16 00:35:16,198 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:35:16,201 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-12-16 00:35:16,201 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-12-16 00:35:16,201 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-12-16 00:35:16,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:35:16,333 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-16 00:35:16,372 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:35:16,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:16,377 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-16 00:35:16,417 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-16 00:35:16,423 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f24408c4e20> has no local changes
2024-12-16 00:35:16,423 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-marshal
Excluded PRs:
- PR 84 joshmoore 'New JSON-LD context-based version' (stage: draft)
- 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/265/)'
2024-12-16 00:35:16,432 [ scc.git] DEBUG [detached HEAD 0347967] merge master -Dorg -Ssuccess-only
2024-12-16 00:35:16,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:35:16,432 [ scc.repo] DEBUG ## PRs found:
2024-12-16 00:35:17,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-12-16 00:35:17,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-12-16 00:35:18,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-12-16 00:35:18,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427/comments HTTP/1.1" 200 None
2024-12-16 00:35:18,589 [ scc.repo] DEBUG # ... Include label: include
2024-12-16 00:35:19,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-12-16 00:35:19,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-16 00:35:20,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-16 00:35:20,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-12-16 00:35:20,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1?per_page=1 HTTP/1.1" 200 None
2024-12-16 00:35:21,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-12-16 00:35:21,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/status HTTP/1.1" 200 None
2024-12-16 00:35:21,828 [ scc.repo] DEBUG - PR 427 Rdornier 'Add fileset folder creation'
2024-12-16 00:35:22,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-12-16 00:35:22,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-12-16 00:35:23,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-12-16 00:35:23,819 [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-12-16 00:35:24,260 [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-12-16 00:35:24,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-12-16 00:35:25,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-12-16 00:35:25,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-12-16 00:35:26,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-12-16 00:35:26,115 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-12-16 00:35:26,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-12-16 00:35:27,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-12-16 00:35:27,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-12-16 00:35:28,096 [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-12-16 00:35:28,542 [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-12-16 00:35:28,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-12-16 00:35:29,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-12-16 00:35:29,960 [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-12-16 00:35:30,445 [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-12-16 00:35:30,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-12-16 00:35:31,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-12-16 00:35:31,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-12-16 00:35:32,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-12-16 00:35:32,227 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-12-16 00:35:32,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-12-16 00:35:32,831 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-12-16 00:35:33,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-12-16 00:35:33,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-12-16 00:35:34,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-12-16 00:35:34,812 [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-12-16 00:35:35,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-12-16 00:35:35,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-12-16 00:35:35,737 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-12-16 00:35:36,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-12-16 00:35:36,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-12-16 00:35:37,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-12-16 00:35:37,642 [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-12-16 00:35:38,074 [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-12-16 00:35:38,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-12-16 00:35:38,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-12-16 00:35:39,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-12-16 00:35:39,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-12-16 00:35:39,932 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-12-16 00:35:40,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-12-16 00:35:40,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-12-16 00:35:41,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-12-16 00:35:41,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-12-16 00:35:42,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-12-16 00:35:42,777 [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-12-16 00:35:43,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-12-16 00:35:43,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-12-16 00:35:43,703 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-12-16 00:35:44,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-12-16 00:35:44,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-12-16 00:35:45,122 [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-12-16 00:35:45,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-12-16 00:35:46,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-12-16 00:35:46,040 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-12-16 00:35:46,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-12-16 00:35:47,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-12-16 00:35:47,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-12-16 00:35:48,102 [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-12-16 00:35:48,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-12-16 00:35:49,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-12-16 00:35:49,022 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-12-16 00:35:49,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-12-16 00:35:49,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-12-16 00:35:50,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-12-16 00:35:50,915 [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-12-16 00:35:51,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-12-16 00:35:51,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-12-16 00:35:51,816 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-12-16 00:35:52,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-12-16 00:35:52,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-12-16 00:35:53,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-12-16 00:35:53,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-12-16 00:35:53,687 [ scc.repo] DEBUG ## Branches found:
2024-12-16 00:35:53,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-12-16 00:35:53,687 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:35:53,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:53,692 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-16 00:35:53,696 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-16 00:35:53,696 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-16 00:35:53,700 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-16 00:35:53,704 [ scc.git] DEBUG Already up to date.
2024-12-16 00:35:53,705 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-12-16 00:35:55,061 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-16 00:35:55,061 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-12-16 00:35:55,067 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-12-16 00:35:55,394 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-16 00:35:55,394 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-12-16 00:35:55,399 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-12-16 00:35:55,688 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-16 00:35:55,688 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-12-16 00:35:55,693 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-12-16 00:35:56,127 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-16 00:35:56,128 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-12-16 00:35:56,133 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-12-16 00:35:56,508 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-16 00:35:56,508 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-12-16 00:35:56,513 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-12-16 00:35:56,802 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-16 00:35:56,802 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-12-16 00:35:56,807 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-12-16 00:35:57,112 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-16 00:35:57,113 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-12-16 00:35:57,117 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-12-16 00:35:57,408 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-16 00:35:57,409 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-12-16 00:35:57,413 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-12-16 00:35:57,894 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-16 00:35:57,894 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-12-16 00:35:57,899 [ scc.git] DEBUG ## Unique users: []
2024-12-16 00:35:57,899 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:35:57,899 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:57,904 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-12-16 00:35:57,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:57,921 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-12-16 00:35:58,103 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-12-16 00:35:58,104 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-12-16 00:35:58,104 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:35:58,110 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-12-16 00:35:58,110 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-12-16 00:35:58,110 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-12-16 00:35:58,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:35:58,270 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-12-16 00:35:58,286 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:58,292 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-12-16 00:35:58,562 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-12-16 00:35:58,562 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-12-16 00:35:58,563 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:35:58,572 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-12-16 00:35:58,572 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-12-16 00:35:58,572 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-12-16 00:35:58,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:35:58,712 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-12-16 00:35:58,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:58,729 [ 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-12-16 00:35:58,831 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-12-16 00:35:58,832 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:35:58,835 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-12-16 00:35:58,835 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-12-16 00:35:59,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:35:59,095 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-12-16 00:35:59,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:59,111 [ 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-12-16 00:35:59,383 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-12-16 00:35:59,383 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-12-16 00:35:59,383 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:35:59,387 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-12-16 00:35:59,387 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-12-16 00:35:59,387 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-12-16 00:35:59,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:35:59,521 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-12-16 00:35:59,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:59,537 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-12-16 00:35:59,569 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:35:59,572 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-12-16 00:35:59,572 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-12-16 00:35:59,572 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-12-16 00:35:59,572 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-12-16 00:35:59,572 [ scc.git] DEBUG create mode 100644 connect.py
2024-12-16 00:35:59,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:35:59,904 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-12-16 00:35:59,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:35:59,922 [ 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-12-16 00:36:00,261 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-12-16 00:36:00,262 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:36:00,266 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-12-16 00:36:00,266 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-12-16 00:36:00,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:00,406 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-12-16 00:36:00,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:00,424 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-12-16 00:36:00,552 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-12-16 00:36:00,554 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:36:00,558 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-12-16 00:36:00,558 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-12-16 00:36:00,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:00,836 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-12-16 00:36:00,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:00,854 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-12-16 00:36:00,972 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-12-16 00:36:00,973 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:36:00,987 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-12-16 00:36:00,987 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-12-16 00:36:01,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:01,234 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-12-16 00:36:01,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:01,254 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Add fileset folder creation) ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-12-16 00:36:01,296 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:36:01,299 [ scc.git] DEBUG .gitignore | 1 +
2024-12-16 00:36:01,299 [ scc.git] DEBUG src/omero/plugins/download.py | 17 ++++++++++++-----
2024-12-16 00:36:01,300 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 5 deletions(-)
2024-12-16 00:36:01,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:01,623 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-16 00:36:01,663 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:36:01,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:01,667 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-16 00:36:01,704 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-16 00:36:01,711 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243b795880> has no local changes
2024-12-16 00:36:01,711 [ 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 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'
- PR 427 Rdornier 'Add fileset folder creation'
Generated by OMERO-python-superbuild-push#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/265/)'
2024-12-16 00:36:01,719 [ scc.git] DEBUG [detached HEAD 504ac378] merge master -Dorg -Ssuccess-only
2024-12-16 00:36:01,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:36:01,720 [ scc.git] INFO Overriding base-branch from master to develop
2024-12-16 00:36:01,720 [ scc.repo] DEBUG ## PRs found:
2024-12-16 00:36:02,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-12-16 00:36:02,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-12-16 00:36:03,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-12-16 00:36:03,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-16 00:36:04,207 [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-12-16 00:36:04,676 [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-12-16 00:36:05,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-16 00:36:05,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-12-16 00:36:05,620 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-16 00:36:06,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-12-16 00:36:06,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-12-16 00:36:07,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-12-16 00:36:07,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-12-16 00:36:08,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-12-16 00:36:08,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-16 00:36:09,179 [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-12-16 00:36:09,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-16 00:36:10,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-12-16 00:36:10,028 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-16 00:36:10,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-12-16 00:36:11,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-12-16 00:36:11,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-12-16 00:36:11,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-12-16 00:36:11,979 [ scc.repo] DEBUG ## Branches found:
2024-12-16 00:36:11,979 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-12-16 00:36:11,979 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:36:11,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:11,984 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-12-16 00:36:11,987 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-16 00:36:11,988 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-12-16 00:36:11,992 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-12-16 00:36:11,996 [ scc.git] DEBUG Already up to date.
2024-12-16 00:36:11,997 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-12-16 00:36:12,387 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-12-16 00:36:12,387 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-12-16 00:36:12,392 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-12-16 00:36:12,721 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-12-16 00:36:12,721 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-12-16 00:36:12,726 [ scc.git] DEBUG ## Unique users: []
2024-12-16 00:36:12,726 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:36:12,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:12,731 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-16 00:36:12,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:12,740 [ 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-12-16 00:36:12,750 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-12-16 00:36:12,750 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-12-16 00:36:12,750 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-16 00:36:12,750 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-16 00:36:12,754 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-16 00:36:12,759 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-12-16 00:36:12,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:12,899 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-16 00:36:12,906 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-16 00:36:12,911 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#265](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/265/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/265/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-12-16 00:36:12,915 [ scc.config] DEBUG Found github.token
2024-12-16 00:36:12,916 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-12-16 00:36:12,916 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-16 00:36:12,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:12,926 [ 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-12-16 00:36:12,941 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:36:12,944 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-12-16 00:36:12,944 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-12-16 00:36:13,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:13,283 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-16 00:36:13,324 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:36:13,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:13,328 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-16 00:36:13,367 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-16 00:36:13,374 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243b7956a0> has no local changes
2024-12-16 00:36:13,375 [ 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 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/265/)'
2024-12-16 00:36:13,382 [ scc.git] DEBUG [detached HEAD ebf42bb] merge master -Dorg -Ssuccess-only
2024-12-16 00:36:13,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:36:13,383 [ scc.repo] DEBUG ## PRs found:
2024-12-16 00:36:13,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-12-16 00:36:14,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/602 HTTP/1.1" 200 None
2024-12-16 00:36:14,393 [ scc.repo] DEBUG # ... Include label: include
2024-12-16 00:36:14,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539 HTTP/1.1" 200 None
2024-12-16 00:36:15,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-16 00:36:15,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-16 00:36:16,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539 HTTP/1.1" 200 None
2024-12-16 00:36:16,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/9119372e9fef8cab0e212f02685c8715a3307539?per_page=1 HTTP/1.1" 200 None
2024-12-16 00:36:17,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539 HTTP/1.1" 200 None
2024-12-16 00:36:17,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539/status HTTP/1.1" 200 None
2024-12-16 00:36:17,685 [ scc.repo] DEBUG - PR 602 Tom-TBT 'Inherit all ann'
2024-12-16 00:36:18,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/600 HTTP/1.1" 200 None
2024-12-16 00:36:18,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4 HTTP/1.1" 200 None
2024-12-16 00:36:19,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-16 00:36:19,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-16 00:36:20,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4 HTTP/1.1" 200 None
2024-12-16 00:36:20,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/f8a449a16e16db1d32aa2e3f703b35e26852c6e4?per_page=1 HTTP/1.1" 200 None
2024-12-16 00:36:21,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4 HTTP/1.1" 200 None
2024-12-16 00:36:21,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4/status HTTP/1.1" 200 None
2024-12-16 00:36:21,576 [ scc.repo] DEBUG - PR 600 sbesson 'Remove Python 3.8 from the testing matrix'
2024-12-16 00:36:22,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/598 HTTP/1.1" 200 None
2024-12-16 00:36:22,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/598/comments HTTP/1.1" 200 None
2024-12-16 00:36:23,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6 HTTP/1.1" 200 None
2024-12-16 00:36:23,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-16 00:36:24,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-16 00:36:24,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6 HTTP/1.1" 200 None
2024-12-16 00:36:24,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/6f07268f880d6159be0bb56eacb20557305152b6?per_page=1 HTTP/1.1" 200 None
2024-12-16 00:36:25,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6 HTTP/1.1" 200 None
2024-12-16 00:36:25,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6/status HTTP/1.1" 200 None
2024-12-16 00:36:25,878 [ scc.repo] DEBUG - PR 598 will-moore 'Fix display of ContrastMethod'
2024-12-16 00:36:26,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596 HTTP/1.1" 200 None
2024-12-16 00:36:26,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596/comments HTTP/1.1" 200 None
2024-12-16 00:36:27,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-12-16 00:36:27,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-16 00:36:28,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-16 00:36:28,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-12-16 00:36:29,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/3aae48f586d7b412538a45b34ddc471a26a286e8?per_page=1 HTTP/1.1" 200 None
2024-12-16 00:36:29,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-12-16 00:36:30,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/status HTTP/1.1" 200 None
2024-12-16 00:36:30,102 [ scc.repo] DEBUG - PR 596 sukunis 'Linkify can parse anchor tag'
2024-12-16 00:36:30,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595 HTTP/1.1" 200 None
2024-12-16 00:36:31,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595/comments HTTP/1.1" 200 None
2024-12-16 00:36:31,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-12-16 00:36:32,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-16 00:36:32,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-16 00:36:32,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-12-16 00:36:33,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/30278b64bb39134a3f1101b600d4a82256e6eaeb?per_page=1 HTTP/1.1" 200 None
2024-12-16 00:36:33,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-12-16 00:36:34,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/status HTTP/1.1" 200 None
2024-12-16 00:36:34,303 [ scc.repo] DEBUG - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2024-12-16 00:36:34,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/585 HTTP/1.1" 200 None
2024-12-16 00:36:35,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-12-16 00:36:35,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-12-16 00:36:36,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-12-16 00:36:36,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-12-16 00:36:37,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-12-16 00:36:37,631 [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-12-16 00:36:38,137 [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-12-16 00:36:38,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-12-16 00:36:39,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-12-16 00:36:39,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-12-16 00:36:39,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-12-16 00:36:39,922 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-12-16 00:36:40,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-12-16 00:36:40,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-12-16 00:36:41,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-12-16 00:36:41,860 [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-12-16 00:36:42,347 [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-12-16 00:36:42,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-12-16 00:36:43,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-12-16 00:36:43,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-12-16 00:36:44,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-12-16 00:36:44,220 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-12-16 00:36:44,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-12-16 00:36:45,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-12-16 00:36:45,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-12-16 00:36:46,192 [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-12-16 00:36:46,673 [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-12-16 00:36:46,675 [ scc.repo] DEBUG ## Branches found:
2024-12-16 00:36:46,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-12-16 00:36:46,675 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:36:46,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:46,681 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-16 00:36:46,686 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-16 00:36:46,686 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-16 00:36:46,691 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-16 00:36:46,704 [ scc.git] DEBUG Updating a1483bf00..96d113830
2024-12-16 00:36:47,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/601 HTTP/1.1" 200 None
2024-12-16 00:36:47,272 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-12-16 00:36:50,631 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-16 00:36:50,632 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-12-16 00:36:50,637 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-12-16 00:36:50,958 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-16 00:36:50,958 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-12-16 00:36:50,964 [ scc.git] DEBUG Calling 'git fetch origin pull/595/head'
2024-12-16 00:36:52,040 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-16 00:36:52,040 [ scc.git] DEBUG * branch refs/pull/595/head -> FETCH_HEAD
2024-12-16 00:36:52,045 [ scc.git] DEBUG Calling 'git fetch origin pull/596/head'
2024-12-16 00:36:52,574 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-16 00:36:52,575 [ scc.git] DEBUG * branch refs/pull/596/head -> FETCH_HEAD
2024-12-16 00:36:52,580 [ scc.git] DEBUG Calling 'git fetch origin pull/598/head'
2024-12-16 00:36:52,885 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-16 00:36:52,885 [ scc.git] DEBUG * branch refs/pull/598/head -> FETCH_HEAD
2024-12-16 00:36:52,890 [ scc.git] DEBUG Calling 'git fetch origin pull/600/head'
2024-12-16 00:36:53,217 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-16 00:36:53,217 [ scc.git] DEBUG * branch refs/pull/600/head -> FETCH_HEAD
2024-12-16 00:36:53,223 [ scc.git] DEBUG Calling 'git fetch origin pull/602/head'
2024-12-16 00:36:53,510 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-16 00:36:53,510 [ scc.git] DEBUG * branch refs/pull/602/head -> FETCH_HEAD
2024-12-16 00:36:53,515 [ scc.git] DEBUG ## Unique users: []
2024-12-16 00:36:53,515 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:36:53,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:53,520 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-12-16 00:36:53,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:53,532 [ 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-12-16 00:36:53,812 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-12-16 00:36:53,813 [ scc.git] DEBUG Auto-merging setup.py
2024-12-16 00:36:53,814 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:36:53,818 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-12-16 00:36:53,818 [ scc.git] DEBUG setup.py | 1 +
2024-12-16 00:36:53,818 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-12-16 00:36:53,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:53,952 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-12-16 00:36:53,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:53,966 [ 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-12-16 00:36:54,201 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-12-16 00:36:54,201 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-12-16 00:36:54,202 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:36:54,207 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-12-16 00:36:54,207 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-12-16 00:36:54,207 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-12-16 00:36:54,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:54,339 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...30278b64bb39134a3f1101b600d4a82256e6eaeb'
2024-12-16 00:36:54,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:54,353 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 595 (linkify supports urls that include {}[] characters) 30278b64bb39134a3f1101b600d4a82256e6eaeb'
2024-12-16 00:36:54,504 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:36:54,508 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.webclient.actions.js | 2 +-
2024-12-16 00:36:54,508 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-12-16 00:36:54,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:54,728 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3aae48f586d7b412538a45b34ddc471a26a286e8'
2024-12-16 00:36:54,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:54,742 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 596 (Linkify can parse anchor tag) 3aae48f586d7b412538a45b34ddc471a26a286e8'
2024-12-16 00:36:54,852 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:36:54,856 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 26 ++++++++++++++++++++--
2024-12-16 00:36:54,856 [ scc.git] DEBUG 1 file changed, 24 insertions(+), 2 deletions(-)
2024-12-16 00:36:55,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:55,112 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6f07268f880d6159be0bb56eacb20557305152b6'
2024-12-16 00:36:55,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:55,127 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 598 (Fix display of ContrastMethod) 6f07268f880d6159be0bb56eacb20557305152b6'
2024-12-16 00:36:55,148 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:36:55,153 [ scc.git] DEBUG omeroweb/webclient/forms.py | 2 +-
2024-12-16 00:36:55,153 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-12-16 00:36:55,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:55,524 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f8a449a16e16db1d32aa2e3f703b35e26852c6e4'
2024-12-16 00:36:55,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:55,538 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 600 (Remove Python 3.8 from the testing matrix) f8a449a16e16db1d32aa2e3f703b35e26852c6e4'
2024-12-16 00:36:55,892 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:36:55,896 [ scc.git] DEBUG .github/workflows/tox.yml | 1 -
2024-12-16 00:36:55,896 [ scc.git] DEBUG tox.ini | 3 +--
2024-12-16 00:36:55,896 [ scc.git] DEBUG 2 files changed, 1 insertion(+), 3 deletions(-)
2024-12-16 00:36:56,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:56,049 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9119372e9fef8cab0e212f02685c8715a3307539'
2024-12-16 00:36:56,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:56,062 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 602 (Inherit all ann) 9119372e9fef8cab0e212f02685c8715a3307539'
2024-12-16 00:36:56,088 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-16 00:36:56,093 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/dusty.css | 1 -
2024-12-16 00:36:56,093 [ scc.git] DEBUG .../javascript/ome.right_panel_comments_pane.js | 134 +++++++++++++++++++--
2024-12-16 00:36:56,093 [ scc.git] DEBUG .../javascript/ome.right_panel_fileanns_pane.js | 80 +++++++++++-
2024-12-16 00:36:56,093 [ scc.git] DEBUG .../javascript/ome.right_panel_mapanns_pane.js | 6 +-
2024-12-16 00:36:56,093 [ scc.git] DEBUG .../javascript/ome.right_panel_ratings_pane.js | 33 ++++-
2024-12-16 00:36:56,093 [ scc.git] DEBUG .../javascript/ome.right_panel_tags_pane.js | 92 ++++++++++++--
2024-12-16 00:36:56,093 [ scc.git] DEBUG .../webclient/annotations/comments_underscore.html | 58 +++++++--
2024-12-16 00:36:56,093 [ scc.git] DEBUG .../webclient/annotations/fileanns_underscore.html | 81 ++++++++-----
2024-12-16 00:36:56,093 [ scc.git] DEBUG .../webclient/annotations/mapanns_underscore.html | 4 +
2024-12-16 00:36:56,093 [ scc.git] DEBUG .../webclient/annotations/ratings_underscore.html | 4 +-
2024-12-16 00:36:56,093 [ scc.git] DEBUG .../webclient/annotations/tags_underscore.html | 30 +++--
2024-12-16 00:36:56,093 [ scc.git] DEBUG 11 files changed, 447 insertions(+), 76 deletions(-)
2024-12-16 00:36:56,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:56,495 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-16 00:36:56,539 [ scc.git] DEBUG Get sha1 of %s
2024-12-16 00:36:56,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-16 00:36:56,544 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-16 00:36:56,586 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-16 00:36:56,597 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243b7caf40> has no local changes
2024-12-16 00:36:56,597 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Updating a1483bf00..96d113830
Previously merged:
- PR 601 jburel 'Remove remaining usage of sdist'
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 595 sukunis 'linkify supports urls that include {}[] characters'
- PR 596 sukunis 'Linkify can parse anchor tag'
- PR 598 will-moore 'Fix display of ContrastMethod'
- PR 600 sbesson 'Remove Python 3.8 from the testing matrix'
- PR 602 Tom-TBT 'Inherit all ann'
Generated by OMERO-python-superbuild-push#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/265/)'
2024-12-16 00:36:56,612 [ scc.git] DEBUG [detached HEAD a3a804d03] merge master -Dorg -Ssuccess-only
2024-12-16 00:36:56,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:36:56,613 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-16 00:36:56,667 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-12-16 00:36:56,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:56,909 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-12-16 00:36:57,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:57,289 [ scc.config] DEBUG Found submodule.omero-py.url
2024-12-16 00:36:57,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:57,692 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-12-16 00:36:58,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:58,090 [ scc.config] DEBUG Found submodule.omero-web.url
2024-12-16 00:36:58,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-16 00:36:58,485 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-16 00:36:58,513 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2442c47e20> has local changes
2024-12-16 00:36:58,513 [ 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 303 dependabot[bot] 'Bump omero-py from `7e296f2` to `7da917a`'
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 84 joshmoore 'New JSON-LD context-based version' (stage: draft)
- 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 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'
- PR 427 Rdornier 'Add fileset folder creation'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- 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 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Updating a1483bf00..96d113830
Previously merged:
- PR 601 jburel 'Remove remaining usage of sdist'
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 595 sukunis 'linkify supports urls that include {}[] characters'
- PR 596 sukunis 'Linkify can parse anchor tag'
- PR 598 will-moore 'Fix display of ContrastMethod'
- PR 600 sbesson 'Remove Python 3.8 from the testing matrix'
- PR 602 Tom-TBT 'Inherit all ann'
Generated by OMERO-python-superbuild-push#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/265/)'
2024-12-16 00:36:58,522 [ scc.git] DEBUG [detached HEAD 4d5f34e] merge master -Dorg -Ssuccess-only
2024-12-16 00:36:58,522 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-12-16 00:36:58,522 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-12-16 00:36:58,523 [ scc.merge] INFO Already up to date.
2024-12-16 00:36:58,523 [ scc.merge] INFO
2024-12-16 00:36:58,523 [ scc.merge] INFO Merged PRs:
2024-12-16 00:36:58,523 [ scc.merge] INFO - PR 303 dependabot[bot] 'Bump omero-py from `7e296f2` to `7da917a`'
2024-12-16 00:36:58,523 [ scc.merge] INFO
2024-12-16 00:36:58,523 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-12-16 00:36:58,523 [ scc.merge] INFO Already up to date.
2024-12-16 00:36:58,523 [ scc.merge] INFO
2024-12-16 00:36:58,523 [ scc.merge] INFO Merged PRs:
2024-12-16 00:36:58,523 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-12-16 00:36:58,523 [ scc.merge] INFO
2024-12-16 00:36:58,523 [ scc.merge] INFO Repository: ome/omero-marshal
2024-12-16 00:36:58,523 [ scc.merge] INFO Excluded PRs:
2024-12-16 00:36:58,523 [ scc.merge] INFO - PR 84 joshmoore 'New JSON-LD context-based version' (stage: draft)
2024-12-16 00:36:58,523 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-12-16 00:36:58,523 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-12-16 00:36:58,523 [ scc.merge] INFO Already up to date.
2024-12-16 00:36:58,523 [ scc.merge] INFO
2024-12-16 00:36:58,523 [ scc.merge] INFO Merged PRs:
2024-12-16 00:36:58,523 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-12-16 00:36:58,523 [ scc.merge] INFO
2024-12-16 00:36:58,523 [ scc.merge] INFO Repository: ome/omero-py
2024-12-16 00:36:58,523 [ scc.merge] INFO Excluded PRs:
2024-12-16 00:36:58,523 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-12-16 00:36:58,523 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-12-16 00:36:58,523 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-12-16 00:36:58,523 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-12-16 00:36:58,523 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-12-16 00:36:58,523 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-12-16 00:36:58,523 [ scc.merge] INFO Already up to date.
2024-12-16 00:36:58,523 [ scc.merge] INFO
2024-12-16 00:36:58,523 [ scc.merge] INFO Merged PRs:
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation'
2024-12-16 00:36:58,524 [ scc.merge] INFO
2024-12-16 00:36:58,524 [ scc.merge] INFO Repository: ome/omero-scripts
2024-12-16 00:36:58,524 [ scc.merge] INFO Excluded PRs:
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-12-16 00:36:58,524 [ scc.merge] INFO Already up to date.
2024-12-16 00:36:58,524 [ scc.merge] INFO
2024-12-16 00:36:58,524 [ scc.merge] INFO Merged PRs:
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-16 00:36:58,524 [ scc.merge] INFO
2024-12-16 00:36:58,524 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-16 00:36:58,524 [ scc.merge] INFO
2024-12-16 00:36:58,524 [ scc.merge] INFO Repository: ome/omero-web
2024-12-16 00:36:58,524 [ scc.merge] INFO Excluded PRs:
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-12-16 00:36:58,524 [ scc.merge] INFO Updating a1483bf00..96d113830
2024-12-16 00:36:58,524 [ scc.merge] INFO Previously merged:
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 601 jburel 'Remove remaining usage of sdist'
2024-12-16 00:36:58,524 [ scc.merge] INFO
2024-12-16 00:36:58,524 [ scc.merge] INFO Merged PRs:
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2024-12-16 00:36:58,524 [ scc.merge] INFO - PR 596 sukunis 'Linkify can parse anchor tag'
2024-12-16 00:36:58,525 [ scc.merge] INFO - PR 598 will-moore 'Fix display of ContrastMethod'
2024-12-16 00:36:58,525 [ scc.merge] INFO - PR 600 sbesson 'Remove Python 3.8 from the testing matrix'
2024-12-16 00:36:58,525 [ scc.merge] INFO - PR 602 Tom-TBT 'Inherit all ann'
2024-12-16 00:36:58,525 [ scc.merge] INFO
2024-12-16 00:36:58,525 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-16 00:36:58,525 [ scc.git] DEBUG Calling 'git remote'
2024-12-16 00:36:58,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-12-16 00:36:58,529 [ scc.git] DEBUG Calling 'git remote'
2024-12-16 00:36:58,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:36:58,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-12-16 00:36:58,533 [ scc.git] DEBUG Calling 'git remote'
2024-12-16 00:36:58,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:36:58,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-12-16 00:36:58,537 [ scc.git] DEBUG Calling 'git remote'
2024-12-16 00:36:58,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:36:58,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-12-16 00:36:58,541 [ scc.git] DEBUG Calling 'git remote'
2024-12-16 00:36:58,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-16 00:36:58,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-12-16 00:36:58,544 [ scc.git] DEBUG Calling 'git remote'
2024-12-16 00:36:58,548 [ 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 01fa0c5
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from 6d44f66
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 7da917a7
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 a1483bf00
nothing to commit, working tree clean
HEAD detached from d78ee19
nothing to commit, working tree clean
2024-12-16 00:37:27,480 [ 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