Console Output
+ 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-11-23 00:32:59,943 [ scc.config] DEBUG Found github.token
2024-11-23 00:32:59,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-23 00:33:00,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:33:00,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:33:00,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-23 00:33:00,883 [ scc.gh] DEBUG 4394 remaining from 5000 (Reset at 00:11
2024-11-23 00:33:00,884 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-23 00:33:00,887 [ scc.git] DEBUG Check current status
2024-11-23 00:33:00,888 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-23 00:33:00,891 [ scc.git] DEBUG 41a3326 Merge pull request #298 from ome/dependabot/submodules/omero-dropbox-01fa0c5
2024-11-23 00:33:00,891 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-23 00:33:00,935 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2024-11-23 00:33:00,938 [ scc.git] DEBUG 0e829faff6efffc160dc73d7e292bb773d70f585 omero-marshal (v0.9.0-7-g0e829fa)
2024-11-23 00:33:00,942 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-23 00:33:00,946 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-23 00:33:00,950 [ scc.git] DEBUG cbf9730529bf9839d3dd252f507be03ea59dae2a omero-web (v5.28.0-1-gcbf973052)
2024-11-23 00:33:00,954 [ scc.config] DEBUG Found remote.origin.url
2024-11-23 00:33:01,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-23 00:33:01,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-23 00:33:02,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-23 00:33:02,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-23 00:33:03,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-23 00:33:03,017 [ scc.git] DEBUG Resetting...
2024-11-23 00:33:03,018 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-23 00:33:03,023 [ scc.git] DEBUG HEAD is now at 41a3326 Merge pull request #298 from ome/dependabot/submodules/omero-dropbox-01fa0c5
2024-11-23 00:33:03,023 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-23 00:33:03,079 [ scc.git] DEBUG Check current status
2024-11-23 00:33:03,079 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-23 00:33:03,084 [ scc.git] DEBUG 41a3326 Merge pull request #298 from ome/dependabot/submodules/omero-dropbox-01fa0c5
2024-11-23 00:33:03,084 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-23 00:33:03,123 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2024-11-23 00:33:03,126 [ scc.git] DEBUG 0e829faff6efffc160dc73d7e292bb773d70f585 omero-marshal (v0.9.0-7-g0e829fa)
2024-11-23 00:33:03,129 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-23 00:33:03,133 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-23 00:33:03,137 [ scc.git] DEBUG cbf9730529bf9839d3dd252f507be03ea59dae2a omero-web (v5.28.0-1-gcbf973052)
2024-11-23 00:33:03,137 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-23 00:33:03,137 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-23 00:33:03,138 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-23 00:33:03,138 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-23 00:33:03,138 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-23 00:33:03,138 [ scc.repo] DEBUG ## PRs found:
2024-11-23 00:33:03,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-11-23 00:33:03,443 [ scc.repo] DEBUG ## Branches found:
2024-11-23 00:33:03,443 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:33:03,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:03,447 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-23 00:33:03,450 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-23 00:33:03,450 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-23 00:33:03,454 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-23 00:33:03,458 [ scc.git] DEBUG Already up to date.
2024-11-23 00:33:03,458 [ scc.git] DEBUG ## Unique users: []
2024-11-23 00:33:03,458 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:33:03,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:03,461 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-23 00:33:03,502 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:33:03,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:03,506 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-23 00:33:04,292 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f876cae2a60> has no local changes
2024-11-23 00:33:04,292 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Generated by OMERO-python-superbuild-push#242 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/242/)'
2024-11-23 00:33:04,317 [ scc.git] DEBUG [detached HEAD e4988d8] merge master -Dorg -Snone
2024-11-23 00:33:04,317 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-23 00:33:04,317 [ scc.merge] INFO Already up to date.
2024-11-23 00:33:04,317 [ scc.merge] INFO
2024-11-23 00:33:04,317 [ scc.merge] INFO
2024-11-23 00:33:04,317 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-23 00:33:04,317 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
From https://github.com/ome/omero-py
4fd72efa..578334c3 master -> origin/master
Submodule path 'omero-py': checked out '578334c36545690e5dcc607c3d01bb8a58744164'
From https://github.com/ome/omero-web
cbf973052..a1483bf00 master -> origin/master
Submodule path 'omero-web': checked out 'a1483bf008b05162b21f92d286133d501083acd7'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-11-23 00:33:09,325 [ scc.config] DEBUG Found github.token
2024-11-23 00:33:09,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-23 00:33:09,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:33:09,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:33:10,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-23 00:33:10,271 [ scc.gh] DEBUG 4386 remaining from 5000 (Reset at 00:11
2024-11-23 00:33:10,272 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-23 00:33:10,276 [ scc.git] DEBUG Check current status
2024-11-23 00:33:10,276 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-23 00:33:10,279 [ scc.git] DEBUG e4988d8 merge master -Dorg -Snone
2024-11-23 00:33:10,280 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-23 00:33:10,321 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2024-11-23 00:33:10,324 [ scc.git] DEBUG 0e829faff6efffc160dc73d7e292bb773d70f585 omero-marshal (v0.9.0-7-g0e829fa)
2024-11-23 00:33:10,328 [ scc.git] DEBUG +578334c36545690e5dcc607c3d01bb8a58744164 omero-py (v5.19.5-3-g578334c3)
2024-11-23 00:33:10,332 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-23 00:33:10,336 [ scc.git] DEBUG +a1483bf008b05162b21f92d286133d501083acd7 omero-web (v5.28.0-3-ga1483bf00)
2024-11-23 00:33:10,341 [ scc.config] DEBUG Found remote.origin.url
2024-11-23 00:33:10,341 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-11-23 00:33:10,343 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-11-23 00:33:10,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-11-23 00:33:11,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-23 00:33:11,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-23 00:33:12,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-23 00:33:12,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-23 00:33:12,557 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-23 00:33:12,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-23 00:33:12,609 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-23 00:33:12,613 [ scc.git] DEBUG Check current status
2024-11-23 00:33:12,613 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-23 00:33:12,616 [ scc.git] DEBUG 01fa0c5 Merge pull request #24 from jburel/build
2024-11-23 00:33:12,617 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-23 00:33:12,659 [ scc.config] DEBUG Found remote.origin.url
2024-11-23 00:33:13,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-11-23 00:33:13,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-23 00:33:13,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-23 00:33:14,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-23 00:33:14,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-23 00:33:14,707 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-23 00:33:14,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:33:14,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-23 00:33:14,749 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-23 00:33:14,753 [ scc.git] DEBUG Check current status
2024-11-23 00:33:14,753 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-23 00:33:14,757 [ scc.git] DEBUG 0e829fa Merge pull request #83 from jburel/remove_py38
2024-11-23 00:33:14,757 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-23 00:33:14,801 [ scc.config] DEBUG Found remote.origin.url
2024-11-23 00:33:15,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-11-23 00:33:15,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-23 00:33:16,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-23 00:33:16,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-23 00:33:16,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-23 00:33:16,860 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-23 00:33:16,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:33:16,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-23 00:33:16,912 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-23 00:33:16,917 [ scc.git] DEBUG Check current status
2024-11-23 00:33:16,917 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-23 00:33:16,921 [ scc.git] DEBUG 578334c3 Merge pull request #434 from sbesson/python38_eol
2024-11-23 00:33:16,921 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-23 00:33:16,967 [ scc.config] DEBUG Found remote.origin.url
2024-11-23 00:33:17,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-11-23 00:33:17,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-23 00:33:18,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-23 00:33:18,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-23 00:33:19,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-23 00:33:19,017 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-23 00:33:19,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:33:19,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-23 00:33:19,058 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-23 00:33:19,063 [ scc.git] DEBUG Check current status
2024-11-23 00:33:19,064 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-23 00:33:19,211 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-23 00:33:19,212 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-23 00:33:19,254 [ scc.config] DEBUG Found remote.origin.url
2024-11-23 00:33:19,255 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-11-23 00:33:19,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-11-23 00:33:19,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-23 00:33:20,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-23 00:33:20,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-23 00:33:21,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-23 00:33:21,216 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-23 00:33:21,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:33:21,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-23 00:33:21,264 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-23 00:33:21,268 [ scc.git] DEBUG Check current status
2024-11-23 00:33:21,268 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-23 00:33:21,450 [ scc.git] DEBUG a1483bf00 Merge pull request #599 from knabar/maint-build
2024-11-23 00:33:21,450 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-23 00:33:21,496 [ scc.config] DEBUG Found remote.origin.url
2024-11-23 00:33:21,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-11-23 00:33:22,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-23 00:33:22,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-23 00:33:23,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-23 00:33:23,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-23 00:33:23,435 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-23 00:33:23,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:33:23,473 [ scc.git] DEBUG Resetting...
2024-11-23 00:33:23,473 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-23 00:33:23,478 [ scc.git] DEBUG HEAD is now at e4988d8 merge master -Dorg -Snone
2024-11-23 00:33:23,479 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-23 00:33:23,532 [ scc.git] DEBUG Submodule path 'omero-py': checked out '4fd72efaa8cdbec9da98e1d28678af16878a86ba'
2024-11-23 00:33:23,553 [ scc.git] DEBUG Submodule path 'omero-web': checked out 'cbf9730529bf9839d3dd252f507be03ea59dae2a'
2024-11-23 00:33:23,556 [ scc.git] DEBUG Check current status
2024-11-23 00:33:23,556 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-23 00:33:23,560 [ scc.git] DEBUG e4988d8 merge master -Dorg -Snone
2024-11-23 00:33:23,560 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-23 00:33:23,599 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2024-11-23 00:33:23,602 [ scc.git] DEBUG 0e829faff6efffc160dc73d7e292bb773d70f585 omero-marshal (v0.9.0-7-g0e829fa)
2024-11-23 00:33:23,605 [ scc.git] DEBUG 4fd72efaa8cdbec9da98e1d28678af16878a86ba omero-py (v5.19.5-1-g4fd72efa)
2024-11-23 00:33:23,609 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-11-23 00:33:23,613 [ scc.git] DEBUG cbf9730529bf9839d3dd252f507be03ea59dae2a omero-web (v5.28.0-1-gcbf973052)
2024-11-23 00:33:23,614 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-23 00:33:23,614 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-23 00:33:23,614 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-23 00:33:23,614 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-23 00:33:23,614 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-23 00:33:23,614 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-11-23 00:33:23,614 [ scc.repo] DEBUG ## PRs found:
2024-11-23 00:33:23,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-11-23 00:33:23,849 [ scc.repo] DEBUG ## Branches found:
2024-11-23 00:33:23,849 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:33:23,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:23,853 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-23 00:33:23,857 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-23 00:33:23,857 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-23 00:33:23,861 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-23 00:33:23,865 [ scc.git] DEBUG Already up to date.
2024-11-23 00:33:23,865 [ scc.git] DEBUG ## Unique users: []
2024-11-23 00:33:23,865 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:33:23,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:23,869 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-23 00:33:23,908 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:33:23,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:23,912 [ scc.repo] DEBUG ## PRs found:
2024-11-23 00:33:24,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-11-23 00:33:24,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-11-23 00:33:25,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-11-23 00:33:25,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-23 00:33:26,312 [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-11-23 00:33:26,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-11-23 00:33:27,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-11-23 00:33:27,216 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-23 00:33:27,216 [ scc.repo] DEBUG ## Branches found:
2024-11-23 00:33:27,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-23 00:33:27,217 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:33:27,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:27,222 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-23 00:33:27,226 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-23 00:33:27,227 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-23 00:33:27,231 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-23 00:33:27,235 [ scc.git] DEBUG Already up to date.
2024-11-23 00:33:27,236 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-11-23 00:33:27,582 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-11-23 00:33:27,582 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-11-23 00:33:27,587 [ scc.git] DEBUG ## Unique users: []
2024-11-23 00:33:27,587 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:33:27,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:27,592 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-11-23 00:33:27,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:27,602 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-11-23 00:33:27,838 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-11-23 00:33:27,838 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-11-23 00:33:27,838 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-11-23 00:33:27,838 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-11-23 00:33:27,838 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-11-23 00:33:27,838 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-11-23 00:33:27,838 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-11-23 00:33:27,838 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-11-23 00:33:27,838 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-11-23 00:33:27,839 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:33:27,842 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-11-23 00:33:27,842 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-11-23 00:33:27,842 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-11-23 00:33:27,842 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-11-23 00:33:27,842 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-11-23 00:33:27,842 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-11-23 00:33:27,842 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-11-23 00:33:27,843 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-11-23 00:33:27,843 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-11-23 00:33:27,843 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-11-23 00:33:27,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:33:27,991 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-23 00:33:28,030 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:33:28,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:28,034 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-23 00:33:28,074 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-23 00:33:28,080 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f86e13b4700> has no local changes
2024-11-23 00:33:28,080 [ 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#242 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/242/)'
2024-11-23 00:33:28,087 [ scc.git] DEBUG [detached HEAD bf38d6c] merge master -Dorg -Ssuccess-only
2024-11-23 00:33:28,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:33:28,088 [ scc.repo] DEBUG ## PRs found:
2024-11-23 00:33:28,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-11-23 00:33:29,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/82 HTTP/1.1" 200 None
2024-11-23 00:33:29,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/9339efb1dc7acf574426ddd54c0ac1fd20e4d83c HTTP/1.1" 200 None
2024-11-23 00:33:30,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/9339efb1dc7acf574426ddd54c0ac1fd20e4d83c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-23 00:33:30,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/9339efb1dc7acf574426ddd54c0ac1fd20e4d83c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-23 00:33:30,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/9339efb1dc7acf574426ddd54c0ac1fd20e4d83c HTTP/1.1" 200 None
2024-11-23 00:33:31,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/9339efb1dc7acf574426ddd54c0ac1fd20e4d83c?per_page=1 HTTP/1.1" 200 2
2024-11-23 00:33:31,313 [ scc.repo] DEBUG - PR 82 jburel 'Build'
2024-11-23 00:33:31,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-11-23 00:33:32,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-11-23 00:33:32,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-23 00:33:33,338 [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-11-23 00:33:33,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-11-23 00:33:34,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-11-23 00:33:34,291 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-23 00:33:34,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-11-23 00:33:35,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-11-23 00:33:35,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-11-23 00:33:36,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-11-23 00:33:36,134 [ scc.repo] DEBUG ## Branches found:
2024-11-23 00:33:36,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-23 00:33:36,134 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:33:36,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:36,139 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-23 00:33:36,144 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-23 00:33:36,144 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-23 00:33:36,149 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-23 00:33:36,153 [ scc.git] DEBUG Already up to date.
2024-11-23 00:33:36,153 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-11-23 00:33:36,552 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-11-23 00:33:36,552 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-11-23 00:33:36,556 [ scc.git] DEBUG Calling 'git fetch origin pull/82/head'
2024-11-23 00:33:36,954 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-11-23 00:33:36,954 [ scc.git] DEBUG * branch refs/pull/82/head -> FETCH_HEAD
2024-11-23 00:33:36,959 [ scc.git] DEBUG ## Unique users: []
2024-11-23 00:33:36,959 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:33:36,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:36,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-23 00:33:36,969 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:36,973 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-11-23 00:33:37,070 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-11-23 00:33:37,071 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:33:37,074 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-11-23 00:33:37,074 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-11-23 00:33:37,074 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-11-23 00:33:37,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:33:37,210 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9339efb1dc7acf574426ddd54c0ac1fd20e4d83c'
2024-11-23 00:33:37,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:37,222 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 82 (Build) 9339efb1dc7acf574426ddd54c0ac1fd20e4d83c'
2024-11-23 00:33:37,290 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:33:37,292 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 8 +++++---
2024-11-23 00:33:37,292 [ scc.git] DEBUG 1 file changed, 5 insertions(+), 3 deletions(-)
2024-11-23 00:33:37,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:33:37,592 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-23 00:33:37,635 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:33:37,635 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:33:37,639 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-23 00:33:37,679 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-23 00:33:37,686 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f86e368cdc0> has no local changes
2024-11-23 00:33:37,686 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
- PR 82 jburel 'Build'
Generated by OMERO-python-superbuild-push#242 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/242/)'
2024-11-23 00:33:37,695 [ scc.git] DEBUG [detached HEAD 0413f00] merge master -Dorg -Ssuccess-only
2024-11-23 00:33:37,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:33:37,696 [ scc.repo] DEBUG ## PRs found:
2024-11-23 00:33:38,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-11-23 00:33:38,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/431 HTTP/1.1" 200 None
2024-11-23 00:33:39,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-23 00:33:39,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-23 00:33:40,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-23 00:33:40,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-23 00:33:41,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0e500ec05bf9227b66b28a480b40e0936241d953?per_page=1 HTTP/1.1" 200 None
2024-11-23 00:33:41,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953 HTTP/1.1" 200 None
2024-11-23 00:33:42,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0e500ec05bf9227b66b28a480b40e0936241d953/status HTTP/1.1" 200 None
2024-11-23 00:33:42,007 [ scc.repo] DEBUG - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-23 00:33:42,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-11-23 00:33:42,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-11-23 00:33:43,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427/comments HTTP/1.1" 200 None
2024-11-23 00:33:43,428 [ scc.repo] DEBUG # ... Include label: include
2024-11-23 00:33:43,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-23 00:33:44,370 [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-11-23 00:33:44,847 [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-11-23 00:33:45,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-23 00:33:45,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1?per_page=1 HTTP/1.1" 200 None
2024-11-23 00:33:46,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-11-23 00:33:46,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/status HTTP/1.1" 200 None
2024-11-23 00:33:46,600 [ scc.repo] DEBUG - PR 427 Rdornier 'Add fileset folder creation'
2024-11-23 00:33:47,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-11-23 00:33:47,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-11-23 00:33:48,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-23 00:33:48,586 [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-11-23 00:33:49,057 [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-11-23 00:33:49,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-23 00:33:50,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-11-23 00:33:50,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-11-23 00:33:50,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-11-23 00:33:50,846 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-11-23 00:33:51,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-11-23 00:33:51,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-11-23 00:33:52,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-11-23 00:33:52,706 [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-11-23 00:33:53,170 [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-11-23 00:33:53,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-11-23 00:33:54,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-23 00:33:54,650 [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-11-23 00:33:55,138 [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-11-23 00:33:55,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-23 00:33:56,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-11-23 00:33:56,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-11-23 00:33:56,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-11-23 00:33:56,999 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-11-23 00:33:57,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-11-23 00:33:57,463 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-11-23 00:33:57,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-11-23 00:33:58,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-11-23 00:33:58,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-23 00:33:59,374 [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-11-23 00:33:59,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-11-23 00:34:00,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-11-23 00:34:00,266 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-23 00:34:00,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-11-23 00:34:01,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-11-23 00:34:01,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-23 00:34:02,143 [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-11-23 00:34:02,620 [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-11-23 00:34:03,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-23 00:34:03,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-11-23 00:34:04,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-11-23 00:34:04,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-11-23 00:34:04,473 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-11-23 00:34:04,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-11-23 00:34:05,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-11-23 00:34:05,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-11-23 00:34:06,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-11-23 00:34:06,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-23 00:34:07,304 [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-11-23 00:34:07,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-11-23 00:34:08,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-11-23 00:34:08,188 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-23 00:34:08,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-11-23 00:34:09,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-23 00:34:09,659 [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-11-23 00:34:10,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-11-23 00:34:10,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-11-23 00:34:10,599 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-23 00:34:11,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-11-23 00:34:11,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-11-23 00:34:12,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-23 00:34:12,555 [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-11-23 00:34:13,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-11-23 00:34:13,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-11-23 00:34:13,451 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-23 00:34:13,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-11-23 00:34:14,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-11-23 00:34:14,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-23 00:34:15,331 [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-11-23 00:34:15,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-11-23 00:34:16,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-11-23 00:34:16,225 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-11-23 00:34:16,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-11-23 00:34:17,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-11-23 00:34:17,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-11-23 00:34:18,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-11-23 00:34:18,244 [ scc.repo] DEBUG ## Branches found:
2024-11-23 00:34:18,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-23 00:34:18,245 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:34:18,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:18,250 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-23 00:34:18,254 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-23 00:34:18,254 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-23 00:34:18,258 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-23 00:34:18,267 [ scc.git] DEBUG Updating 4fd72efa..578334c3
2024-11-23 00:34:18,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls/434 HTTP/1.1" 200 None
2024-11-23 00:34:18,818 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-11-23 00:34:19,350 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-23 00:34:19,350 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-11-23 00:34:19,355 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-11-23 00:34:19,676 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-23 00:34:19,676 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-11-23 00:34:19,682 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-11-23 00:34:19,990 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-23 00:34:19,991 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-11-23 00:34:19,997 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-11-23 00:34:20,401 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-23 00:34:20,401 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-11-23 00:34:20,406 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-11-23 00:34:20,740 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-23 00:34:20,740 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-11-23 00:34:20,745 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-11-23 00:34:21,064 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-23 00:34:21,064 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-11-23 00:34:21,069 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-11-23 00:34:21,345 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-23 00:34:21,345 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-11-23 00:34:21,350 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-11-23 00:34:21,658 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-23 00:34:21,658 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-11-23 00:34:21,662 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-11-23 00:34:22,440 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-23 00:34:22,440 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-11-23 00:34:22,445 [ scc.git] DEBUG Calling 'git fetch origin pull/431/head'
2024-11-23 00:34:22,900 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-11-23 00:34:22,900 [ scc.git] DEBUG * branch refs/pull/431/head -> FETCH_HEAD
2024-11-23 00:34:22,905 [ scc.git] DEBUG ## Unique users: []
2024-11-23 00:34:22,905 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:34:22,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:22,910 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-23 00:34:22,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:22,924 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-11-23 00:34:23,111 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-11-23 00:34:23,111 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-11-23 00:34:23,112 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:34:23,117 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-11-23 00:34:23,117 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-11-23 00:34:23,117 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-11-23 00:34:23,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:34:23,260 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-23 00:34:23,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:23,277 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-11-23 00:34:23,311 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-23 00:34:23,311 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-11-23 00:34:23,311 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:34:23,319 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-11-23 00:34:23,319 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-11-23 00:34:23,319 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-11-23 00:34:23,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:34:23,659 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-11-23 00:34:23,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:23,676 [ 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-11-23 00:34:23,754 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-11-23 00:34:23,754 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:34:23,758 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-11-23 00:34:23,758 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-11-23 00:34:24,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:34:24,038 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-11-23 00:34:24,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:24,055 [ 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-11-23 00:34:24,220 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-11-23 00:34:24,220 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-11-23 00:34:24,221 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:34:24,225 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-11-23 00:34:24,225 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-11-23 00:34:24,225 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-11-23 00:34:24,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:34:24,441 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-23 00:34:24,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:24,457 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-11-23 00:34:24,476 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:34:24,478 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-11-23 00:34:24,478 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-11-23 00:34:24,478 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-11-23 00:34:24,478 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-11-23 00:34:24,478 [ scc.git] DEBUG create mode 100644 connect.py
2024-11-23 00:34:24,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:34:24,825 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-11-23 00:34:24,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:24,842 [ 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-11-23 00:34:25,026 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-11-23 00:34:25,028 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:34:25,032 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-11-23 00:34:25,032 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-11-23 00:34:25,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:34:25,205 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-11-23 00:34:25,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:25,223 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-11-23 00:34:25,392 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-11-23 00:34:25,393 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:34:25,398 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-11-23 00:34:25,398 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-11-23 00:34:25,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:34:25,581 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-23 00:34:25,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:25,598 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-11-23 00:34:25,798 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-11-23 00:34:25,799 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:34:25,806 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-11-23 00:34:25,806 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-11-23 00:34:25,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:34:25,977 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-23 00:34:25,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:25,995 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Add fileset folder creation) ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-11-23 00:34:26,053 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:34:26,057 [ scc.git] DEBUG .gitignore | 1 +
2024-11-23 00:34:26,057 [ scc.git] DEBUG src/omero/plugins/download.py | 17 ++++++++++++-----
2024-11-23 00:34:26,057 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 5 deletions(-)
2024-11-23 00:34:26,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:34:26,378 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0e500ec05bf9227b66b28a480b40e0936241d953'
2024-11-23 00:34:26,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:26,396 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 431 (omero.HdfStorage.update: add size check on data.rowNumbers) 0e500ec05bf9227b66b28a480b40e0936241d953'
2024-11-23 00:34:26,517 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:34:26,521 [ scc.git] DEBUG src/omero/hdfstorageV2.py | 1 +
2024-11-23 00:34:26,521 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2024-11-23 00:34:26,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:34:26,771 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-23 00:34:26,815 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:34:26,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:26,822 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-23 00:34:26,867 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-23 00:34:26,875 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f86e0290700> has no local changes
2024-11-23 00:34:26,875 [ 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)
Updating 4fd72efa..578334c3
Previously merged:
- PR 434 sbesson 'Remove Python 3.8 from the testing matrix'
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'
- PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
Generated by OMERO-python-superbuild-push#242 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/242/)'
2024-11-23 00:34:26,886 [ scc.git] DEBUG [detached HEAD 1fa1918a] merge master -Dorg -Ssuccess-only
2024-11-23 00:34:26,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:34:26,887 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-23 00:34:26,887 [ scc.repo] DEBUG ## PRs found:
2024-11-23 00:34:27,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-23 00:34:27,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-23 00:34:28,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-23 00:34:28,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-23 00:34:29,276 [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-11-23 00:34:29,756 [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-11-23 00:34:30,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-23 00:34:30,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-11-23 00:34:30,637 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-23 00:34:31,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-23 00:34:31,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-23 00:34:32,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-23 00:34:32,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-23 00:34:33,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-23 00:34:33,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-23 00:34:33,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-23 00:34:34,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-23 00:34:34,916 [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-11-23 00:34:35,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-23 00:34:35,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-11-23 00:34:35,791 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-23 00:34:36,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-23 00:34:36,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-23 00:34:37,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-23 00:34:37,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-23 00:34:37,761 [ scc.repo] DEBUG ## Branches found:
2024-11-23 00:34:37,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-23 00:34:37,761 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:34:37,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:37,766 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-23 00:34:37,770 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-23 00:34:37,770 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-23 00:34:37,774 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-23 00:34:37,778 [ scc.git] DEBUG Already up to date.
2024-11-23 00:34:37,779 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-23 00:34:38,481 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-23 00:34:38,481 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-23 00:34:38,486 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-23 00:34:38,883 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-11-23 00:34:38,883 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-23 00:34:38,888 [ scc.git] DEBUG ## Unique users: []
2024-11-23 00:34:38,888 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:34:38,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:38,893 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-23 00:34:38,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:38,902 [ 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-11-23 00:34:38,933 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-23 00:34:38,935 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-23 00:34:38,936 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-23 00:34:38,937 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-23 00:34:38,943 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-23 00:34:38,948 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-23 00:34:39,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:34:39,090 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-23 00:34:39,097 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-23 00:34:39,101 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#242](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/242/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/242/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-23 00:34:39,105 [ scc.config] DEBUG Found github.token
2024-11-23 00:34:39,105 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-23 00:34:39,106 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-23 00:34:39,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:39,114 [ 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-11-23 00:34:39,130 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:34:39,133 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-23 00:34:39,134 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-23 00:34:39,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:34:39,476 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-23 00:34:39,517 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:34:39,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:34:39,522 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-23 00:34:39,562 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-23 00:34:39,568 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f86e02905e0> has no local changes
2024-11-23 00:34:39,568 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-python-superbuild-push#242 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/242/)'
2024-11-23 00:34:39,578 [ scc.git] DEBUG [detached HEAD a4c7ae4] merge master -Dorg -Ssuccess-only
2024-11-23 00:34:39,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:34:39,578 [ scc.repo] DEBUG ## PRs found:
2024-11-23 00:34:40,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-11-23 00:34:40,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/600 HTTP/1.1" 200 None
2024-11-23 00:34:41,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4 HTTP/1.1" 200 None
2024-11-23 00:34:41,537 [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-11-23 00:34:41,978 [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-11-23 00:34:42,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4 HTTP/1.1" 200 None
2024-11-23 00:34:42,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/f8a449a16e16db1d32aa2e3f703b35e26852c6e4?per_page=1 HTTP/1.1" 200 None
2024-11-23 00:34:43,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4 HTTP/1.1" 200 None
2024-11-23 00:34:43,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4/status HTTP/1.1" 200 None
2024-11-23 00:34:43,727 [ scc.repo] DEBUG - PR 600 sbesson 'Remove Python 3.8 from the testing matrix'
2024-11-23 00:34:44,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/598 HTTP/1.1" 200 None
2024-11-23 00:34:44,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/598/comments HTTP/1.1" 200 None
2024-11-23 00:34:45,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6 HTTP/1.1" 200 None
2024-11-23 00:34:45,650 [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-11-23 00:34:46,088 [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-11-23 00:34:46,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6 HTTP/1.1" 200 None
2024-11-23 00:34:46,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/6f07268f880d6159be0bb56eacb20557305152b6?per_page=1 HTTP/1.1" 200 None
2024-11-23 00:34:47,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6 HTTP/1.1" 200 None
2024-11-23 00:34:47,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6/status HTTP/1.1" 200 None
2024-11-23 00:34:47,868 [ scc.repo] DEBUG - PR 598 will-moore 'Fix display of ContrastMethod'
2024-11-23 00:34:48,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596 HTTP/1.1" 200 None
2024-11-23 00:34:48,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596/comments HTTP/1.1" 200 None
2024-11-23 00:34:49,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-11-23 00:34:49,776 [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-11-23 00:34:50,246 [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-11-23 00:34:50,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-11-23 00:34:51,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/3aae48f586d7b412538a45b34ddc471a26a286e8?per_page=1 HTTP/1.1" 200 None
2024-11-23 00:34:51,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-11-23 00:34:51,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/status HTTP/1.1" 200 None
2024-11-23 00:34:51,990 [ scc.repo] DEBUG - PR 596 sukunis 'Linkify can parse anchor tag'
2024-11-23 00:34:52,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595 HTTP/1.1" 200 None
2024-11-23 00:34:52,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595/comments HTTP/1.1" 200 None
2024-11-23 00:34:53,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-11-23 00:34:53,903 [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-11-23 00:34:54,409 [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-11-23 00:34:54,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-11-23 00:34:55,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/30278b64bb39134a3f1101b600d4a82256e6eaeb?per_page=1 HTTP/1.1" 200 None
2024-11-23 00:34:55,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-11-23 00:34:56,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/status HTTP/1.1" 200 None
2024-11-23 00:34:56,181 [ scc.repo] DEBUG - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2024-11-23 00:34:56,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/585 HTTP/1.1" 200 None
2024-11-23 00:34:57,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-11-23 00:34:57,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-11-23 00:34:57,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-11-23 00:34:58,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-11-23 00:34:58,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-23 00:34:59,431 [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-11-23 00:34:59,869 [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-11-23 00:35:00,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-23 00:35:00,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-11-23 00:35:01,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-11-23 00:35:01,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-11-23 00:35:01,662 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-23 00:35:02,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-11-23 00:35:02,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-11-23 00:35:03,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-23 00:35:03,574 [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-11-23 00:35:04,044 [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-11-23 00:35:04,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-23 00:35:04,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-11-23 00:35:05,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-11-23 00:35:05,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-11-23 00:35:05,878 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-23 00:35:06,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-11-23 00:35:06,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-11-23 00:35:07,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-11-23 00:35:07,770 [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-11-23 00:35:08,265 [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-11-23 00:35:08,267 [ scc.repo] DEBUG ## Branches found:
2024-11-23 00:35:08,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-23 00:35:08,267 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:35:08,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:35:08,272 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-23 00:35:08,276 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-23 00:35:08,276 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-23 00:35:08,281 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-23 00:35:08,292 [ scc.git] DEBUG Updating cbf973052..a1483bf00
2024-11-23 00:35:08,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/599 HTTP/1.1" 200 None
2024-11-23 00:35:08,816 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-11-23 00:35:09,362 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-23 00:35:09,363 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-11-23 00:35:09,368 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-11-23 00:35:09,681 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-23 00:35:09,681 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-11-23 00:35:09,687 [ scc.git] DEBUG Calling 'git fetch origin pull/595/head'
2024-11-23 00:35:10,071 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-23 00:35:10,071 [ scc.git] DEBUG * branch refs/pull/595/head -> FETCH_HEAD
2024-11-23 00:35:10,077 [ scc.git] DEBUG Calling 'git fetch origin pull/596/head'
2024-11-23 00:35:10,370 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-23 00:35:10,370 [ scc.git] DEBUG * branch refs/pull/596/head -> FETCH_HEAD
2024-11-23 00:35:10,375 [ scc.git] DEBUG Calling 'git fetch origin pull/598/head'
2024-11-23 00:35:10,667 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-23 00:35:10,667 [ scc.git] DEBUG * branch refs/pull/598/head -> FETCH_HEAD
2024-11-23 00:35:10,672 [ scc.git] DEBUG Calling 'git fetch origin pull/600/head'
2024-11-23 00:35:10,954 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-11-23 00:35:10,954 [ scc.git] DEBUG * branch refs/pull/600/head -> FETCH_HEAD
2024-11-23 00:35:10,958 [ scc.git] DEBUG ## Unique users: []
2024-11-23 00:35:10,958 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:35:10,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:35:10,962 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-11-23 00:35:10,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:35:10,974 [ 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-11-23 00:35:11,147 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-11-23 00:35:11,147 [ scc.git] DEBUG Auto-merging setup.py
2024-11-23 00:35:11,148 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:35:11,153 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-11-23 00:35:11,153 [ scc.git] DEBUG setup.py | 1 +
2024-11-23 00:35:11,153 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-11-23 00:35:11,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:35:11,291 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-11-23 00:35:11,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:35:11,303 [ 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-11-23 00:35:11,325 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-11-23 00:35:11,326 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-11-23 00:35:11,327 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:35:11,339 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-11-23 00:35:11,339 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-11-23 00:35:11,340 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-11-23 00:35:11,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:35:11,675 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...30278b64bb39134a3f1101b600d4a82256e6eaeb'
2024-11-23 00:35:11,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:35:11,688 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 595 (linkify supports urls that include {}[] characters) 30278b64bb39134a3f1101b600d4a82256e6eaeb'
2024-11-23 00:35:11,707 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:35:11,711 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.webclient.actions.js | 2 +-
2024-11-23 00:35:11,711 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-23 00:35:12,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:35:12,059 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3aae48f586d7b412538a45b34ddc471a26a286e8'
2024-11-23 00:35:12,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:35:12,073 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 596 (Linkify can parse anchor tag) 3aae48f586d7b412538a45b34ddc471a26a286e8'
2024-11-23 00:35:12,094 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:35:12,098 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 26 ++++++++++++++++++++--
2024-11-23 00:35:12,098 [ scc.git] DEBUG 1 file changed, 24 insertions(+), 2 deletions(-)
2024-11-23 00:35:12,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:35:12,444 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6f07268f880d6159be0bb56eacb20557305152b6'
2024-11-23 00:35:12,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:35:12,458 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 598 (Fix display of ContrastMethod) 6f07268f880d6159be0bb56eacb20557305152b6'
2024-11-23 00:35:12,596 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:35:12,600 [ scc.git] DEBUG omeroweb/webclient/forms.py | 2 +-
2024-11-23 00:35:12,600 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-23 00:35:12,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:35:12,842 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f8a449a16e16db1d32aa2e3f703b35e26852c6e4'
2024-11-23 00:35:12,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:35:12,857 [ 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-11-23 00:35:13,052 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-23 00:35:13,056 [ scc.git] DEBUG .github/workflows/tox.yml | 1 -
2024-11-23 00:35:13,056 [ scc.git] DEBUG tox.ini | 3 +--
2024-11-23 00:35:13,056 [ scc.git] DEBUG 2 files changed, 1 insertion(+), 3 deletions(-)
2024-11-23 00:35:13,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:35:13,233 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-23 00:35:13,274 [ scc.git] DEBUG Get sha1 of %s
2024-11-23 00:35:13,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-23 00:35:13,279 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-23 00:35:13,324 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-23 00:35:13,335 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f86e02a2bb0> has no local changes
2024-11-23 00:35:13,336 [ 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 cbf973052..a1483bf00
Previously merged:
- PR 599 knabar 'Update PyPI publish workflow to use build instead 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'
Generated by OMERO-python-superbuild-push#242 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/242/)'
2024-11-23 00:35:13,350 [ scc.git] DEBUG [detached HEAD e1ad46797] merge master -Dorg -Ssuccess-only
2024-11-23 00:35:13,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:35:13,350 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-23 00:35:13,403 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-11-23 00:35:13,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:35:13,640 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-11-23 00:35:14,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:35:14,037 [ scc.config] DEBUG Found submodule.omero-py.url
2024-11-23 00:35:14,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:35:14,423 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-11-23 00:35:14,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:35:14,833 [ scc.config] DEBUG Found submodule.omero-web.url
2024-11-23 00:35:15,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-23 00:35:15,215 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-23 00:35:15,241 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f86e15c8a60> has local changes
2024-11-23 00:35:15,241 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
- PR 82 jburel 'Build'
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)
Updating 4fd72efa..578334c3
Previously merged:
- PR 434 sbesson 'Remove Python 3.8 from the testing matrix'
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'
- PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 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 cbf973052..a1483bf00
Previously merged:
- PR 599 knabar 'Update PyPI publish workflow to use build instead 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'
Generated by OMERO-python-superbuild-push#242 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/242/)'
2024-11-23 00:35:15,251 [ scc.git] DEBUG [detached HEAD 2808bac] merge master -Dorg -Ssuccess-only
2024-11-23 00:35:15,251 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-11-23 00:35:15,251 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-11-23 00:35:15,251 [ scc.merge] INFO Already up to date.
2024-11-23 00:35:15,251 [ scc.merge] INFO
2024-11-23 00:35:15,251 [ scc.merge] INFO
2024-11-23 00:35:15,251 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-11-23 00:35:15,251 [ scc.merge] INFO Already up to date.
2024-11-23 00:35:15,251 [ scc.merge] INFO
2024-11-23 00:35:15,251 [ scc.merge] INFO Merged PRs:
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-11-23 00:35:15,252 [ scc.merge] INFO
2024-11-23 00:35:15,252 [ scc.merge] INFO Repository: ome/omero-marshal
2024-11-23 00:35:15,252 [ scc.merge] INFO Excluded PRs:
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-11-23 00:35:15,252 [ scc.merge] INFO Already up to date.
2024-11-23 00:35:15,252 [ scc.merge] INFO
2024-11-23 00:35:15,252 [ scc.merge] INFO Merged PRs:
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 82 jburel 'Build'
2024-11-23 00:35:15,252 [ scc.merge] INFO
2024-11-23 00:35:15,252 [ scc.merge] INFO Repository: ome/omero-py
2024-11-23 00:35:15,252 [ scc.merge] INFO Excluded PRs:
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-11-23 00:35:15,252 [ scc.merge] INFO Updating 4fd72efa..578334c3
2024-11-23 00:35:15,252 [ scc.merge] INFO Previously merged:
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 434 sbesson 'Remove Python 3.8 from the testing matrix'
2024-11-23 00:35:15,252 [ scc.merge] INFO
2024-11-23 00:35:15,252 [ scc.merge] INFO Merged PRs:
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation'
2024-11-23 00:35:15,252 [ scc.merge] INFO - PR 431 sbesson 'omero.HdfStorage.update: add size check on data.rowNumbers'
2024-11-23 00:35:15,252 [ scc.merge] INFO
2024-11-23 00:35:15,252 [ scc.merge] INFO Repository: ome/omero-scripts
2024-11-23 00:35:15,252 [ scc.merge] INFO Excluded PRs:
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-23 00:35:15,253 [ scc.merge] INFO Already up to date.
2024-11-23 00:35:15,253 [ scc.merge] INFO
2024-11-23 00:35:15,253 [ scc.merge] INFO Merged PRs:
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-23 00:35:15,253 [ scc.merge] INFO
2024-11-23 00:35:15,253 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-23 00:35:15,253 [ scc.merge] INFO
2024-11-23 00:35:15,253 [ scc.merge] INFO Repository: ome/omero-web
2024-11-23 00:35:15,253 [ scc.merge] INFO Excluded PRs:
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-11-23 00:35:15,253 [ scc.merge] INFO Updating cbf973052..a1483bf00
2024-11-23 00:35:15,253 [ scc.merge] INFO Previously merged:
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 599 knabar 'Update PyPI publish workflow to use build instead of sdist'
2024-11-23 00:35:15,253 [ scc.merge] INFO
2024-11-23 00:35:15,253 [ scc.merge] INFO Merged PRs:
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 596 sukunis 'Linkify can parse anchor tag'
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 598 will-moore 'Fix display of ContrastMethod'
2024-11-23 00:35:15,253 [ scc.merge] INFO - PR 600 sbesson 'Remove Python 3.8 from the testing matrix'
2024-11-23 00:35:15,253 [ scc.merge] INFO
2024-11-23 00:35:15,253 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-23 00:35:15,253 [ scc.git] DEBUG Calling 'git remote'
2024-11-23 00:35:15,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-11-23 00:35:15,258 [ scc.git] DEBUG Calling 'git remote'
2024-11-23 00:35:15,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:35:15,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-11-23 00:35:15,262 [ scc.git] DEBUG Calling 'git remote'
2024-11-23 00:35:15,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:35:15,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-11-23 00:35:15,266 [ scc.git] DEBUG Calling 'git remote'
2024-11-23 00:35:15,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:35:15,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-11-23 00:35:15,270 [ scc.git] DEBUG Calling 'git remote'
2024-11-23 00:35:15,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-11-23 00:35:15,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-11-23 00:35:15,274 [ scc.git] DEBUG Calling 'git remote'
2024-11-23 00:35:15,278 [ 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 0e829fa
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 4fd72efa
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from cbf973052
nothing to commit, working tree clean
HEAD detached from 41a3326
nothing to commit, working tree clean
2024-11-23 00:35:42,375 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
