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-08-31 00:32:39,485 [ scc.config] DEBUG Found github.token
2024-08-31 00:32:39,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-08-31 00:32:39,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:32:40,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:32:40,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-08-31 00:32:40,485 [ scc.gh] DEBUG 4636 remaining from 5000 (Reset at 01:08
2024-08-31 00:32:40,486 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:32:40,490 [ scc.git] DEBUG Check current status
2024-08-31 00:32:40,490 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:32:40,495 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-08-31 00:32:40,495 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:32:40,540 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-08-31 00:32:40,543 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-08-31 00:32:40,547 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-08-31 00:32:40,551 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-08-31 00:32:40,697 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-08-31 00:32:40,704 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:32:40,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-08-31 00:32:41,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:32:41,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:32:42,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:32:42,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:32:42,610 [ scc.git] DEBUG Resetting...
2024-08-31 00:32:42,610 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-08-31 00:32:42,616 [ scc.git] DEBUG HEAD is now at 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-08-31 00:32:42,616 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-08-31 00:32:42,676 [ scc.git] DEBUG Check current status
2024-08-31 00:32:42,676 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:32:42,680 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-08-31 00:32:42,681 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:32:42,726 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-08-31 00:32:42,728 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-08-31 00:32:42,732 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-08-31 00:32:42,736 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-08-31 00:32:42,741 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-08-31 00:32:42,742 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-08-31 00:32:42,742 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-08-31 00:32:42,742 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-08-31 00:32:42,742 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-08-31 00:32:42,743 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-08-31 00:32:42,743 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:32:43,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-08-31 00:32:43,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/290 HTTP/1.1" 200 None
2024-08-31 00:32:43,548 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-31 00:32:43,548 [ scc.repo] DEBUG - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-08-31 00:32:43,548 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:32:43,548 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:32:43,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:32:43,554 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:32:43,559 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:32:43,559 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:32:43,564 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:32:43,570 [ scc.git] DEBUG Already up to date.
2024-08-31 00:32:43,570 [ scc.git] DEBUG Calling 'git fetch origin pull/290/head'
2024-08-31 00:32:43,867 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-08-31 00:32:43,867 [ scc.git] DEBUG * branch refs/pull/290/head -> FETCH_HEAD
2024-08-31 00:32:43,874 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:32:43,874 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:32:43,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:32:43,879 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-08-31 00:32:43,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:32:43,905 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 290 (Bump omero-web from `ba8c7e2` to `7cd445c`) 43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-08-31 00:32:43,916 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:32:43,919 [ scc.git] DEBUG omero-web | 2 +-
2024-08-31 00:32:43,919 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-31 00:32:44,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:32:44,065 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:32:44,140 [ scc.git] DEBUG Submodule path 'omero-web': checked out '7cd445ce3cc018efb4327eac5fc74701cffdc578'
2024-08-31 00:32:44,141 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:32:44,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:32:44,146 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:32:44,337 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3dbd7d5e20> has no local changes
2024-08-31 00:32:44,337 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
Generated by OMERO-python-superbuild-push#159 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/159/)'
2024-08-31 00:32:44,368 [ scc.git] DEBUG [detached HEAD 101b7fd] merge master -Dorg -Snone
2024-08-31 00:32:44,368 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-08-31 00:32:44,368 [ scc.merge] INFO Already up to date.
2024-08-31 00:32:44,368 [ scc.merge] INFO
2024-08-31 00:32:44,368 [ scc.merge] INFO Merged PRs:
2024-08-31 00:32:44,368 [ scc.merge] INFO - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-08-31 00:32:44,368 [ scc.merge] INFO
2024-08-31 00:32:44,368 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-31 00:32:44,368 [ 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-web
7cd445ce3..2b30141f0 master -> origin/master
* [new tag] v5.27.1 -> v5.27.1
Submodule path 'omero-web': checked out '2b30141f008dbb3ef72cc06a3600f4a64f324c70'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-08-31 00:32:47,046 [ scc.config] DEBUG Found github.token
2024-08-31 00:32:47,049 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-08-31 00:32:47,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:32:47,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:32:48,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-08-31 00:32:48,050 [ scc.gh] DEBUG 4626 remaining from 5000 (Reset at 01:08
2024-08-31 00:32:48,051 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:32:48,057 [ scc.git] DEBUG Check current status
2024-08-31 00:32:48,057 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:32:48,062 [ scc.git] DEBUG 101b7fd merge master -Dorg -Snone
2024-08-31 00:32:48,062 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:32:48,107 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-08-31 00:32:48,110 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-08-31 00:32:48,114 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-08-31 00:32:48,118 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-08-31 00:32:48,122 [ scc.git] DEBUG +2b30141f008dbb3ef72cc06a3600f4a64f324c70 omero-web (v5.27.1-1-g2b30141f0)
2024-08-31 00:32:48,127 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:32:48,127 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-08-31 00:32:48,130 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-08-31 00:32:48,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-08-31 00:32:48,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:32:49,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:32:49,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:32:50,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:32:50,216 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:32:50,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-08-31 00:32:50,279 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:32:50,283 [ scc.git] DEBUG Check current status
2024-08-31 00:32:50,283 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:32:50,287 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-08-31 00:32:50,287 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:32:50,355 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:32:50,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-08-31 00:32:51,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:32:51,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:32:51,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:32:52,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:32:52,341 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:32:52,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:32:52,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-08-31 00:32:52,390 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:32:52,395 [ scc.git] DEBUG Check current status
2024-08-31 00:32:52,395 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:32:52,400 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-08-31 00:32:52,400 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:32:52,449 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:32:52,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-08-31 00:32:53,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:32:53,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:32:54,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:32:54,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:32:54,535 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:32:54,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:32:54,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-08-31 00:32:54,578 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:32:54,583 [ scc.git] DEBUG Check current status
2024-08-31 00:32:54,584 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:32:54,588 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-08-31 00:32:54,588 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:32:54,636 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:32:55,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-08-31 00:32:55,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:32:55,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:32:56,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:32:56,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:32:56,828 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:32:56,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:32:56,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-08-31 00:32:56,879 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:32:56,894 [ scc.git] DEBUG Check current status
2024-08-31 00:32:56,895 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:32:56,915 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-31 00:32:56,916 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:32:56,959 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:32:56,959 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-08-31 00:32:57,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-08-31 00:32:57,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:32:58,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:32:58,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:32:58,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:32:58,930 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:32:58,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:32:58,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-08-31 00:32:58,978 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:32:58,990 [ scc.git] DEBUG Check current status
2024-08-31 00:32:58,992 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:32:59,029 [ scc.git] DEBUG 2b30141f0 Bump version: 5.27.1 → 5.27.2.dev0
2024-08-31 00:32:59,030 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:32:59,086 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:32:59,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-08-31 00:32:59,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:33:00,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:33:00,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:33:01,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:33:01,099 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:33:01,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:33:01,164 [ scc.git] DEBUG Resetting...
2024-08-31 00:33:01,164 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-08-31 00:33:01,188 [ scc.git] DEBUG HEAD is now at 101b7fd merge master -Dorg -Snone
2024-08-31 00:33:01,190 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-08-31 00:33:01,303 [ scc.git] DEBUG Submodule path 'omero-web': checked out '7cd445ce3cc018efb4327eac5fc74701cffdc578'
2024-08-31 00:33:01,307 [ scc.git] DEBUG Check current status
2024-08-31 00:33:01,308 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:33:01,314 [ scc.git] DEBUG 101b7fd merge master -Dorg -Snone
2024-08-31 00:33:01,315 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:33:01,363 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-08-31 00:33:01,367 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-08-31 00:33:01,371 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-08-31 00:33:01,376 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-08-31 00:33:01,380 [ scc.git] DEBUG 7cd445ce3cc018efb4327eac5fc74701cffdc578 omero-web (v5.27.0-1-g7cd445ce3)
2024-08-31 00:33:01,381 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-08-31 00:33:01,382 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-08-31 00:33:01,382 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-08-31 00:33:01,382 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-08-31 00:33:01,382 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-08-31 00:33:01,382 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-08-31 00:33:01,382 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:33:01,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-08-31 00:33:02,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/290 HTTP/1.1" 200 None
2024-08-31 00:33:02,068 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-31 00:33:02,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e HTTP/1.1" 200 None
2024-08-31 00:33:03,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:33:03,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e HTTP/1.1" 200 None
2024-08-31 00:33:03,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/43005729b7a6c8fd86894b00183ee7806d5fec7e?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:33:03,985 [ scc.repo] DEBUG - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-08-31 00:33:03,985 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:33:03,986 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:33:03,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:03,990 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:33:03,995 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:33:03,995 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:33:04,000 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:33:04,006 [ scc.git] DEBUG Already up to date.
2024-08-31 00:33:04,006 [ scc.git] DEBUG Calling 'git fetch origin pull/290/head'
2024-08-31 00:33:04,325 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-08-31 00:33:04,326 [ scc.git] DEBUG * branch refs/pull/290/head -> FETCH_HEAD
2024-08-31 00:33:04,331 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:33:04,331 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:33:04,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:04,336 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-08-31 00:33:04,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:04,348 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 290 (Bump omero-web from `ba8c7e2` to `7cd445c`) 43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-08-31 00:33:04,353 [ scc.git] DEBUG Already up to date.
2024-08-31 00:33:04,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:33:04,516 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:33:04,565 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:33:04,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:04,572 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:33:05,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-08-31 00:33:05,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-08-31 00:33:05,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-08-31 00:33:06,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-08-31 00:33:06,932 [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-08-31 00:33:07,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-08-31 00:33:07,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:33:07,836 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-08-31 00:33:07,836 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:33:07,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-08-31 00:33:07,836 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:33:07,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:07,842 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:33:07,847 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:33:07,847 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:33:07,853 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:33:07,859 [ scc.git] DEBUG Already up to date.
2024-08-31 00:33:07,860 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-08-31 00:33:08,174 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-08-31 00:33:08,174 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-08-31 00:33:08,180 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:33:08,181 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:33:08,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:08,187 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-08-31 00:33:08,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:08,199 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-08-31 00:33:08,213 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-08-31 00:33:08,213 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-08-31 00:33:08,213 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-08-31 00:33:08,213 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-08-31 00:33:08,213 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-08-31 00:33:08,213 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-08-31 00:33:08,214 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-08-31 00:33:08,214 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-08-31 00:33:08,214 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-08-31 00:33:08,214 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:33:08,218 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-08-31 00:33:08,218 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-08-31 00:33:08,218 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-08-31 00:33:08,218 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-08-31 00:33:08,218 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-08-31 00:33:08,218 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-08-31 00:33:08,218 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-08-31 00:33:08,220 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-08-31 00:33:08,220 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-08-31 00:33:08,220 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-08-31 00:33:08,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:33:08,348 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:33:08,395 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:33:08,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:08,400 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:33:08,451 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:33:08,459 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc524ee81c0> has no local changes
2024-08-31 00:33:08,459 [ 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#159 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/159/)'
2024-08-31 00:33:08,471 [ scc.git] DEBUG [detached HEAD 52d3c56] merge master -Dorg -Ssuccess-only
2024-08-31 00:33:08,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:33:08,472 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:33:08,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-08-31 00:33:09,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-08-31 00:33:09,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-08-31 00:33:10,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-08-31 00:33:10,726 [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-08-31 00:33:11,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-08-31 00:33:11,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:33:11,551 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-08-31 00:33:12,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-08-31 00:33:12,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-08-31 00:33:12,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-08-31 00:33:13,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-08-31 00:33:13,384 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:33:13,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-08-31 00:33:13,385 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:33:13,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:13,390 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:33:13,394 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:33:13,394 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:33:13,398 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:33:13,402 [ scc.git] DEBUG Already up to date.
2024-08-31 00:33:13,402 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-08-31 00:33:13,714 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-08-31 00:33:13,715 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-08-31 00:33:13,720 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:33:13,720 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:33:13,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:13,724 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-08-31 00:33:13,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:13,734 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-08-31 00:33:13,744 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-08-31 00:33:13,745 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:33:13,748 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-08-31 00:33:13,748 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-08-31 00:33:13,748 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-08-31 00:33:13,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:33:13,899 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:33:13,945 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:33:13,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:13,950 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:33:13,989 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:33:13,995 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc5245be730> has no local changes
2024-08-31 00:33:13,996 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Generated by OMERO-python-superbuild-push#159 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/159/)'
2024-08-31 00:33:14,003 [ scc.git] DEBUG [detached HEAD 9b73551] merge master -Dorg -Ssuccess-only
2024-08-31 00:33:14,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:33:14,004 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:33:14,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-08-31 00:33:15,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-08-31 00:33:15,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424 HTTP/1.1" 200 None
2024-08-31 00:33:16,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424/comments HTTP/1.1" 200 None
2024-08-31 00:33:16,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-08-31 00:33:17,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:33:17,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:33:18,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-08-31 00:33:18,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec?per_page=1 HTTP/1.1" 200 None
2024-08-31 00:33:18,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-08-31 00:33:19,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/status HTTP/1.1" 200 None
2024-08-31 00:33:19,412 [ scc.repo] DEBUG - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-08-31 00:33:19,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-08-31 00:33:20,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-08-31 00:33:20,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-08-31 00:33:21,405 [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-08-31 00:33:21,901 [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-08-31 00:33:22,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-08-31 00:33:22,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-08-31 00:33:23,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-08-31 00:33:23,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-08-31 00:33:23,571 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-08-31 00:33:24,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-08-31 00:33:24,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-08-31 00:33:25,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-08-31 00:33:25,493 [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-08-31 00:33:25,915 [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-08-31 00:33:26,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-08-31 00:33:26,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-08-31 00:33:27,362 [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-08-31 00:33:27,851 [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-08-31 00:33:28,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-08-31 00:33:28,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-08-31 00:33:29,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-08-31 00:33:29,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-08-31 00:33:29,825 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-08-31 00:33:30,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-08-31 00:33:30,282 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-08-31 00:33:30,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-08-31 00:33:31,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-08-31 00:33:31,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-08-31 00:33:32,093 [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-08-31 00:33:32,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-08-31 00:33:32,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:33:32,912 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-08-31 00:33:33,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-08-31 00:33:33,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-08-31 00:33:34,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-08-31 00:33:34,734 [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-08-31 00:33:35,184 [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-08-31 00:33:35,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-08-31 00:33:36,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-08-31 00:33:36,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-08-31 00:33:36,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-08-31 00:33:36,905 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-08-31 00:33:37,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-08-31 00:33:37,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-08-31 00:33:38,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-08-31 00:33:38,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-08-31 00:33:39,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-08-31 00:33:39,809 [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-08-31 00:33:40,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-08-31 00:33:40,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:33:40,698 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-08-31 00:33:41,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-08-31 00:33:41,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-08-31 00:33:42,062 [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-08-31 00:33:42,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-08-31 00:33:42,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:33:42,886 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-08-31 00:33:43,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-08-31 00:33:43,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-08-31 00:33:44,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-08-31 00:33:44,795 [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-08-31 00:33:45,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-08-31 00:33:45,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:33:45,710 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-08-31 00:33:46,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-08-31 00:33:46,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-08-31 00:33:47,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-08-31 00:33:47,542 [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-08-31 00:33:48,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-08-31 00:33:48,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:33:48,446 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-08-31 00:33:48,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-08-31 00:33:49,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-08-31 00:33:49,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-08-31 00:33:50,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-08-31 00:33:50,280 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:33:50,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-08-31 00:33:50,281 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:33:50,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:50,286 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:33:50,291 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:33:50,291 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:33:50,296 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:33:50,301 [ scc.git] DEBUG Already up to date.
2024-08-31 00:33:50,301 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-08-31 00:33:50,616 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-31 00:33:50,616 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-08-31 00:33:50,623 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-08-31 00:33:50,993 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-31 00:33:50,993 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-08-31 00:33:50,999 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-08-31 00:33:51,308 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-31 00:33:51,308 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-08-31 00:33:51,314 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-08-31 00:33:51,597 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-31 00:33:51,597 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-08-31 00:33:51,602 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-08-31 00:33:51,964 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-31 00:33:51,964 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-08-31 00:33:51,970 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-08-31 00:33:52,264 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-31 00:33:52,264 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-08-31 00:33:52,269 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-08-31 00:33:52,551 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-31 00:33:52,551 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-08-31 00:33:52,556 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-08-31 00:33:52,909 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-31 00:33:52,910 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-08-31 00:33:52,915 [ scc.git] DEBUG Calling 'git fetch origin pull/424/head'
2024-08-31 00:33:53,241 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-08-31 00:33:53,241 [ scc.git] DEBUG * branch refs/pull/424/head -> FETCH_HEAD
2024-08-31 00:33:53,246 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:33:53,246 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:33:53,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:53,251 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-08-31 00:33:53,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:53,269 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-08-31 00:33:53,358 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-08-31 00:33:53,359 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-08-31 00:33:53,377 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:33:53,385 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-08-31 00:33:53,385 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-08-31 00:33:53,385 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-08-31 00:33:53,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:33:53,528 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-08-31 00:33:53,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:53,547 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-08-31 00:33:53,609 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-08-31 00:33:53,609 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-08-31 00:33:53,610 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:33:53,618 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-08-31 00:33:53,619 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-08-31 00:33:53,619 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-08-31 00:33:53,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:33:53,910 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-08-31 00:33:53,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:53,927 [ 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-08-31 00:33:53,968 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-08-31 00:33:53,969 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:33:53,973 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-08-31 00:33:53,973 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-08-31 00:33:54,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:33:54,299 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-08-31 00:33:54,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:54,317 [ 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-08-31 00:33:54,359 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-08-31 00:33:54,359 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-08-31 00:33:54,360 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:33:54,376 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-08-31 00:33:54,377 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-08-31 00:33:54,378 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-08-31 00:33:54,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:33:54,691 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-08-31 00:33:54,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:54,709 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-08-31 00:33:54,741 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:33:54,744 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-08-31 00:33:54,744 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-08-31 00:33:54,744 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-08-31 00:33:54,744 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-08-31 00:33:54,744 [ scc.git] DEBUG create mode 100644 connect.py
2024-08-31 00:33:55,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:33:55,074 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-08-31 00:33:55,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:55,093 [ 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-08-31 00:33:55,135 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-08-31 00:33:55,136 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:33:55,140 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-08-31 00:33:55,140 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-31 00:33:55,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:33:55,456 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-08-31 00:33:55,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:55,475 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-08-31 00:33:55,497 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-08-31 00:33:55,497 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:33:55,502 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-08-31 00:33:55,502 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-08-31 00:33:55,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:33:55,844 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-08-31 00:33:55,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:55,861 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-08-31 00:33:55,957 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-08-31 00:33:55,958 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:33:55,969 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-08-31 00:33:55,969 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-08-31 00:33:56,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:33:56,227 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec'
2024-08-31 00:33:56,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:56,246 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 424 (Prevent hang on exit while omero.client keepalive is active) 0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec'
2024-08-31 00:33:56,276 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:33:56,279 [ scc.git] DEBUG src/omero/util/__init__.py | 8 +-------
2024-08-31 00:33:56,280 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 7 deletions(-)
2024-08-31 00:33:56,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:33:56,611 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:33:56,653 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:33:56,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:33:56,659 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:33:56,703 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:33:56,710 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc5245be5e0> has no local changes
2024-08-31 00:33:56,710 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
- PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
Generated by OMERO-python-superbuild-push#159 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/159/)'
2024-08-31 00:33:56,720 [ scc.git] DEBUG [detached HEAD ef09f2cb] merge master -Dorg -Ssuccess-only
2024-08-31 00:33:56,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:33:56,720 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-31 00:33:56,720 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:33:57,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-31 00:33:57,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-31 00:33:58,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-31 00:33:58,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-31 00:33:59,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-31 00:33:59,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-31 00:33:59,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-31 00:34:00,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-31 00:34:00,842 [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-08-31 00:34:01,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-31 00:34:01,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:34:01,731 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-31 00:34:02,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-31 00:34:02,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-31 00:34:03,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-31 00:34:03,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-31 00:34:03,601 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:34:03,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-08-31 00:34:03,602 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:34:03,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:34:03,608 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-31 00:34:03,613 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:34:03,613 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-31 00:34:03,619 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-31 00:34:03,624 [ scc.git] DEBUG Already up to date.
2024-08-31 00:34:03,624 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-31 00:34:04,051 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-08-31 00:34:04,051 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-31 00:34:04,056 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:34:04,056 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:34:04,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:34:04,061 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-31 00:34:04,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:34:04,073 [ 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-08-31 00:34:04,130 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-31 00:34:04,130 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-31 00:34:04,130 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-31 00:34:04,131 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-31 00:34:04,136 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-31 00:34:04,141 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-31 00:34:04,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:34:04,277 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-31 00:34:04,284 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-31 00:34:04,290 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#159](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/159/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/159/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-31 00:34:04,295 [ scc.config] DEBUG Found github.token
2024-08-31 00:34:04,295 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-31 00:34:04,295 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:34:04,361 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:34:04,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:34:04,367 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:34:04,409 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:34:04,415 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc52461fc70> has no local changes
2024-08-31 00:34:04,416 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-python-superbuild-push#159 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/159/)'
2024-08-31 00:34:04,426 [ scc.git] DEBUG [detached HEAD 8dc75e0] merge master -Dorg -Ssuccess-only
2024-08-31 00:34:04,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:34:04,427 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:34:04,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-08-31 00:34:05,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/576 HTTP/1.1" 200 None
2024-08-31 00:34:05,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-08-31 00:34:06,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:34:06,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:34:07,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-08-31 00:34:07,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/0663a746b95073b4bbb2b7459859a42b0fc4e341?per_page=1 HTTP/1.1" 200 None
2024-08-31 00:34:08,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-08-31 00:34:08,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341/status HTTP/1.1" 200 None
2024-08-31 00:34:08,703 [ scc.repo] DEBUG - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-08-31 00:34:09,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574 HTTP/1.1" 200 None
2024-08-31 00:34:09,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574/comments HTTP/1.1" 200 None
2024-08-31 00:34:10,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-08-31 00:34:10,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:34:11,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:34:11,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-08-31 00:34:11,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c?per_page=1 HTTP/1.1" 200 None
2024-08-31 00:34:12,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-08-31 00:34:12,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/status HTTP/1.1" 200 None
2024-08-31 00:34:12,796 [ scc.repo] DEBUG - PR 574 will-moore 'Fix word wrap for names'
2024-08-31 00:34:13,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-08-31 00:34:13,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-08-31 00:34:14,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-08-31 00:34:14,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-08-31 00:34:15,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-08-31 00:34:15,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-08-31 00:34:15,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-08-31 00:34:16,412 [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-08-31 00:34:16,892 [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-08-31 00:34:17,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-08-31 00:34:17,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-08-31 00:34:18,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-08-31 00:34:18,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-08-31 00:34:18,659 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-08-31 00:34:19,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-08-31 00:34:19,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-08-31 00:34:20,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-08-31 00:34:20,508 [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-08-31 00:34:20,982 [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-08-31 00:34:21,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-08-31 00:34:21,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-08-31 00:34:22,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-08-31 00:34:22,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-08-31 00:34:22,781 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-08-31 00:34:23,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-08-31 00:34:23,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-08-31 00:34:24,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-08-31 00:34:24,691 [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-08-31 00:34:25,197 [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-08-31 00:34:25,200 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:34:25,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-08-31 00:34:25,200 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:34:25,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:34:25,206 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:34:25,211 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:34:25,211 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:34:25,218 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:34:25,236 [ scc.git] DEBUG Updating 7cd445ce3..2b30141f0
2024-08-31 00:34:25,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/578 HTTP/1.1" 200 None
2024-08-31 00:34:26,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/577 HTTP/1.1" 200 None
2024-08-31 00:34:27,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/571 HTTP/1.1" 200 None
2024-08-31 00:34:27,227 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-08-31 00:34:27,628 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-08-31 00:34:27,628 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-08-31 00:34:27,634 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-08-31 00:34:27,985 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-08-31 00:34:27,986 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-08-31 00:34:27,991 [ scc.git] DEBUG Calling 'git fetch origin pull/574/head'
2024-08-31 00:34:28,315 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-08-31 00:34:28,315 [ scc.git] DEBUG * branch refs/pull/574/head -> FETCH_HEAD
2024-08-31 00:34:28,324 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-31 00:34:28,667 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-08-31 00:34:28,668 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-31 00:34:28,673 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:34:28,673 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:34:28,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:34:28,679 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-08-31 00:34:28,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:34:28,692 [ 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-08-31 00:34:28,782 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-08-31 00:34:28,782 [ scc.git] DEBUG Auto-merging setup.py
2024-08-31 00:34:28,783 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:34:28,787 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-08-31 00:34:28,787 [ scc.git] DEBUG setup.py | 1 +
2024-08-31 00:34:28,787 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-08-31 00:34:28,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:34:28,918 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-08-31 00:34:28,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:34:28,933 [ 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-08-31 00:34:29,031 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-08-31 00:34:29,031 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-08-31 00:34:29,032 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:34:29,036 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-08-31 00:34:29,036 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-08-31 00:34:29,036 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-08-31 00:34:29,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:34:29,312 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-08-31 00:34:29,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:34:29,326 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 574 (Fix word wrap for names) ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-08-31 00:34:29,357 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:34:29,362 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/layout.css | 2 ++
2024-08-31 00:34:29,362 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/includes/name.html | 4 ++--
2024-08-31 00:34:29,362 [ scc.git] DEBUG 2 files changed, 4 insertions(+), 2 deletions(-)
2024-08-31 00:34:29,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:34:29,701 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0663a746b95073b4bbb2b7459859a42b0fc4e341'
2024-08-31 00:34:29,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:34:29,717 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (webclient page scaleable, login page device-width) 0663a746b95073b4bbb2b7459859a42b0fc4e341'
2024-08-31 00:34:29,768 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:34:29,772 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/login.html | 3 ++-
2024-08-31 00:34:29,772 [ scc.git] DEBUG omeroweb/webgateway/templates/webgateway/base/base_main.html | 2 --
2024-08-31 00:34:29,772 [ scc.git] DEBUG 2 files changed, 2 insertions(+), 3 deletions(-)
2024-08-31 00:34:30,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:34:30,088 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:34:30,132 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:34:30,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:34:30,138 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:34:30,196 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:34:30,209 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc524581580> has no local changes
2024-08-31 00:34:30,209 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Updating 7cd445ce3..2b30141f0
Previously merged:
- PR 578 knabar 'Update changelog'
- PR 577 chris-allan 'Refactors #555 to allow for backward compatibility'
- PR 571 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
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 574 will-moore 'Fix word wrap for names'
- PR 576 will-moore 'webclient page scaleable, login page device-width'
Generated by OMERO-python-superbuild-push#159 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/159/)'
2024-08-31 00:34:30,221 [ scc.git] DEBUG [detached HEAD cae03d6fb] merge master -Dorg -Ssuccess-only
2024-08-31 00:34:30,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:34:30,221 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:34:30,282 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-08-31 00:34:30,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:34:30,494 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-08-31 00:34:30,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:34:30,881 [ scc.config] DEBUG Found submodule.omero-py.url
2024-08-31 00:34:31,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:34:31,303 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-08-31 00:34:31,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:34:31,716 [ scc.config] DEBUG Found submodule.omero-web.url
2024-08-31 00:34:32,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:34:32,102 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:34:32,139 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc525bc4e20> has local changes
2024-08-31 00:34:32,140 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
- PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Updating 7cd445ce3..2b30141f0
Previously merged:
- PR 578 knabar 'Update changelog'
- PR 577 chris-allan 'Refactors #555 to allow for backward compatibility'
- PR 571 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
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 574 will-moore 'Fix word wrap for names'
- PR 576 will-moore 'webclient page scaleable, login page device-width'
Generated by OMERO-python-superbuild-push#159 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/159/)'
2024-08-31 00:34:32,153 [ scc.git] DEBUG [detached HEAD 885c41c] merge master -Dorg -Ssuccess-only
2024-08-31 00:34:32,153 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-08-31 00:34:32,154 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-08-31 00:34:32,154 [ scc.merge] INFO Already up to date.
2024-08-31 00:34:32,154 [ scc.merge] INFO
2024-08-31 00:34:32,154 [ scc.merge] INFO Merged PRs:
2024-08-31 00:34:32,154 [ scc.merge] INFO - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-08-31 00:34:32,154 [ scc.merge] INFO
2024-08-31 00:34:32,154 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-08-31 00:34:32,154 [ scc.merge] INFO Already up to date.
2024-08-31 00:34:32,154 [ scc.merge] INFO
2024-08-31 00:34:32,154 [ scc.merge] INFO Merged PRs:
2024-08-31 00:34:32,154 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-08-31 00:34:32,154 [ scc.merge] INFO
2024-08-31 00:34:32,154 [ scc.merge] INFO Repository: ome/omero-marshal
2024-08-31 00:34:32,154 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:34:32,154 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-08-31 00:34:32,154 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-08-31 00:34:32,154 [ scc.merge] INFO Already up to date.
2024-08-31 00:34:32,154 [ scc.merge] INFO
2024-08-31 00:34:32,154 [ scc.merge] INFO Merged PRs:
2024-08-31 00:34:32,154 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-08-31 00:34:32,154 [ scc.merge] INFO
2024-08-31 00:34:32,154 [ scc.merge] INFO Repository: ome/omero-py
2024-08-31 00:34:32,155 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-08-31 00:34:32,155 [ scc.merge] INFO Already up to date.
2024-08-31 00:34:32,155 [ scc.merge] INFO
2024-08-31 00:34:32,155 [ scc.merge] INFO Merged PRs:
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-08-31 00:34:32,155 [ scc.merge] INFO
2024-08-31 00:34:32,155 [ scc.merge] INFO Repository: ome/omero-scripts
2024-08-31 00:34:32,155 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-31 00:34:32,155 [ scc.merge] INFO Already up to date.
2024-08-31 00:34:32,155 [ scc.merge] INFO
2024-08-31 00:34:32,155 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-31 00:34:32,155 [ scc.merge] INFO
2024-08-31 00:34:32,155 [ scc.merge] INFO Repository: ome/omero-web
2024-08-31 00:34:32,155 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:34:32,155 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-08-31 00:34:32,156 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-08-31 00:34:32,156 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-08-31 00:34:32,156 [ scc.merge] INFO Updating 7cd445ce3..2b30141f0
2024-08-31 00:34:32,156 [ scc.merge] INFO Previously merged:
2024-08-31 00:34:32,156 [ scc.merge] INFO - PR 578 knabar 'Update changelog'
2024-08-31 00:34:32,156 [ scc.merge] INFO - PR 577 chris-allan 'Refactors #555 to allow for backward compatibility'
2024-08-31 00:34:32,156 [ scc.merge] INFO - PR 571 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
2024-08-31 00:34:32,156 [ scc.merge] INFO
2024-08-31 00:34:32,156 [ scc.merge] INFO Merged PRs:
2024-08-31 00:34:32,156 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-08-31 00:34:32,156 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-08-31 00:34:32,156 [ scc.merge] INFO - PR 574 will-moore 'Fix word wrap for names'
2024-08-31 00:34:32,156 [ scc.merge] INFO - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-08-31 00:34:32,156 [ scc.merge] INFO
2024-08-31 00:34:32,156 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-31 00:34:32,156 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:34:32,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-08-31 00:34:32,161 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:34:32,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:34:32,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-08-31 00:34:32,166 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:34:32,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:34:32,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-08-31 00:34:32,172 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:34:32,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:34:32,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-08-31 00:34:32,177 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:34:32,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-08-31 00:34:32,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-08-31 00:34:32,182 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:34:32,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
Update component versions
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'omero-dropbox'
Entering 'omero-marshal'
Entering 'omero-py'
Entering 'omero-scripts'
Entering 'omero-web'
Entering 'omero-dropbox'
HEAD detached from a4307f4
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from cca4c2f
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 749a68ac
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from 7cd445ce3
nothing to commit, working tree clean
HEAD detached from 18cc8a4
nothing to commit, working tree clean
2024-08-31 00:34:59,919 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
