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-07-30 00:32:11,315 [ scc.config] DEBUG Found github.token
2024-07-30 00:32:11,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-30 00:32:11,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:32:11,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:32:12,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-30 00:32:12,293 [ scc.gh] DEBUG 4355 remaining from 5000 (Reset at 00:07
2024-07-30 00:32:12,294 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-30 00:32:12,299 [ scc.git] DEBUG Check current status
2024-07-30 00:32:12,299 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-30 00:32:12,303 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-07-30 00:32:12,304 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-30 00:32:12,345 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-30 00:32:12,348 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-30 00:32:12,352 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-30 00:32:12,356 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-07-30 00:32:12,564 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-30 00:32:12,570 [ scc.config] DEBUG Found remote.origin.url
2024-07-30 00:32:12,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-30 00:32:13,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-30 00:32:13,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-30 00:32:14,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-30 00:32:14,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-30 00:32:14,452 [ scc.git] DEBUG Resetting...
2024-07-30 00:32:14,453 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-30 00:32:14,459 [ scc.git] DEBUG HEAD is now at 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-07-30 00:32:14,459 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-30 00:32:14,509 [ scc.git] DEBUG Check current status
2024-07-30 00:32:14,510 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-30 00:32:14,513 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-07-30 00:32:14,514 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-30 00:32:14,551 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-30 00:32:14,553 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-30 00:32:14,556 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-30 00:32:14,560 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-07-30 00:32:14,565 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-30 00:32:14,565 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-30 00:32:14,566 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-30 00:32:14,566 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-30 00:32:14,566 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-30 00:32:14,566 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-30 00:32:14,566 [ scc.repo] DEBUG ## PRs found:
2024-07-30 00:32:14,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-30 00:32:14,862 [ scc.repo] DEBUG ## Branches found:
2024-07-30 00:32:14,862 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:32:14,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:14,867 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-30 00:32:14,871 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-30 00:32:14,872 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-30 00:32:14,877 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-30 00:32:14,882 [ scc.git] DEBUG Already up to date.
2024-07-30 00:32:14,882 [ scc.git] DEBUG ## Unique users: []
2024-07-30 00:32:14,882 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:32:14,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:14,887 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-30 00:32:14,950 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:32:14,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:14,954 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-30 00:32:15,110 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2189f01310> has no local changes
2024-07-30 00:32:15,110 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Generated by OMERO-python-superbuild-push#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/129/)'
2024-07-30 00:32:15,161 [ scc.git] DEBUG [detached HEAD a0103d2] merge master -Dorg -Snone
2024-07-30 00:32:15,161 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-30 00:32:15,161 [ scc.merge] INFO Already up to date.
2024-07-30 00:32:15,161 [ scc.merge] INFO
2024-07-30 00:32:15,161 [ scc.merge] INFO
2024-07-30 00:32:15,161 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-30 00:32:15,161 [ 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
ba8c7e23c..7cd445ce3 master -> origin/master
* [new tag] v5.27.0 -> v5.27.0
Submodule path 'omero-web': checked out '7cd445ce3cc018efb4327eac5fc74701cffdc578'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-30 00:32:18,810 [ scc.config] DEBUG Found github.token
2024-07-30 00:32:18,813 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-30 00:32:18,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:32:19,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:32:19,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-30 00:32:19,770 [ scc.gh] DEBUG 4347 remaining from 5000 (Reset at 00:07
2024-07-30 00:32:19,771 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-30 00:32:19,776 [ scc.git] DEBUG Check current status
2024-07-30 00:32:19,776 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-30 00:32:19,780 [ scc.git] DEBUG a0103d2 merge master -Dorg -Snone
2024-07-30 00:32:19,781 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-30 00:32:19,827 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-30 00:32:19,831 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-30 00:32:19,835 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-30 00:32:19,839 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-07-30 00:32:19,843 [ scc.git] DEBUG +7cd445ce3cc018efb4327eac5fc74701cffdc578 omero-web (v5.27.0-1-g7cd445ce3)
2024-07-30 00:32:19,848 [ scc.config] DEBUG Found remote.origin.url
2024-07-30 00:32:19,848 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-07-30 00:32:19,850 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-30 00:32:20,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-30 00:32:20,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-30 00:32:21,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-30 00:32:21,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-30 00:32:21,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-30 00:32:21,887 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-30 00:32:21,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-30 00:32:21,953 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-30 00:32:21,958 [ scc.git] DEBUG Check current status
2024-07-30 00:32:21,958 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-30 00:32:21,972 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-07-30 00:32:21,972 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-30 00:32:22,053 [ scc.config] DEBUG Found remote.origin.url
2024-07-30 00:32:22,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-07-30 00:32:22,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-30 00:32:23,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-30 00:32:23,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-30 00:32:24,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-30 00:32:24,012 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-30 00:32:24,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:32:24,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-30 00:32:24,058 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-30 00:32:24,062 [ scc.git] DEBUG Check current status
2024-07-30 00:32:24,062 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-30 00:32:24,067 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-07-30 00:32:24,067 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-30 00:32:24,119 [ scc.config] DEBUG Found remote.origin.url
2024-07-30 00:32:24,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-07-30 00:32:24,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-30 00:32:25,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-30 00:32:25,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-30 00:32:26,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-30 00:32:26,112 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-30 00:32:26,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:32:26,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-30 00:32:26,156 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-30 00:32:26,161 [ scc.git] DEBUG Check current status
2024-07-30 00:32:26,161 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-30 00:32:26,179 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-07-30 00:32:26,179 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-30 00:32:26,227 [ scc.config] DEBUG Found remote.origin.url
2024-07-30 00:32:26,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-07-30 00:32:27,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-30 00:32:27,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-30 00:32:27,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-30 00:32:28,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-30 00:32:28,212 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-30 00:32:28,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:32:28,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-30 00:32:28,254 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-30 00:32:28,259 [ scc.git] DEBUG Check current status
2024-07-30 00:32:28,260 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-30 00:32:28,316 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-07-30 00:32:28,316 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-30 00:32:28,363 [ scc.config] DEBUG Found remote.origin.url
2024-07-30 00:32:28,365 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-07-30 00:32:28,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-07-30 00:32:29,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-30 00:32:29,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-30 00:32:29,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-30 00:32:30,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-30 00:32:30,311 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-30 00:32:30,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:32:30,352 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-30 00:32:30,352 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-30 00:32:30,357 [ scc.git] DEBUG Check current status
2024-07-30 00:32:30,357 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-30 00:32:30,368 [ scc.git] DEBUG 7cd445ce3 Bump version: 5.27.0 → 5.27.1.dev0
2024-07-30 00:32:30,368 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-30 00:32:30,410 [ scc.config] DEBUG Found remote.origin.url
2024-07-30 00:32:30,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-07-30 00:32:31,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-30 00:32:31,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-30 00:32:32,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-30 00:32:32,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-30 00:32:32,415 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-30 00:32:32,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:32:32,456 [ scc.git] DEBUG Resetting...
2024-07-30 00:32:32,456 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-30 00:32:32,463 [ scc.git] DEBUG HEAD is now at a0103d2 merge master -Dorg -Snone
2024-07-30 00:32:32,463 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-30 00:32:32,541 [ scc.git] DEBUG Submodule path 'omero-web': checked out 'ba8c7e23c5d3343992812b7579e8d2cf30eb5374'
2024-07-30 00:32:32,545 [ scc.git] DEBUG Check current status
2024-07-30 00:32:32,545 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-30 00:32:32,550 [ scc.git] DEBUG a0103d2 merge master -Dorg -Snone
2024-07-30 00:32:32,550 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-30 00:32:32,592 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-30 00:32:32,595 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-30 00:32:32,598 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-30 00:32:32,602 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-07-30 00:32:32,607 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-30 00:32:32,608 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-30 00:32:32,608 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-30 00:32:32,608 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-30 00:32:32,608 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-30 00:32:32,608 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-30 00:32:32,608 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-07-30 00:32:32,608 [ scc.repo] DEBUG ## PRs found:
2024-07-30 00:32:32,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-30 00:32:32,829 [ scc.repo] DEBUG ## Branches found:
2024-07-30 00:32:32,829 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:32:32,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:32,834 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-30 00:32:32,838 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-30 00:32:32,839 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-30 00:32:32,844 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-30 00:32:32,849 [ scc.git] DEBUG Already up to date.
2024-07-30 00:32:32,849 [ scc.git] DEBUG ## Unique users: []
2024-07-30 00:32:32,850 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:32:32,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:32,854 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-30 00:32:32,896 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:32:32,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:32,901 [ scc.repo] DEBUG ## PRs found:
2024-07-30 00:32:33,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-07-30 00:32:33,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-07-30 00:32:34,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-07-30 00:32:34,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-30 00:32:35,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:32:35,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-30 00:32:36,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-07-30 00:32:36,056 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-30 00:32:36,056 [ scc.repo] DEBUG ## Branches found:
2024-07-30 00:32:36,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-30 00:32:36,057 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:32:36,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:36,062 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-30 00:32:36,066 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-30 00:32:36,067 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-30 00:32:36,071 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-30 00:32:36,075 [ scc.git] DEBUG Already up to date.
2024-07-30 00:32:36,076 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-07-30 00:32:36,415 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-07-30 00:32:36,416 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-07-30 00:32:36,421 [ scc.git] DEBUG ## Unique users: []
2024-07-30 00:32:36,421 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:32:36,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:36,426 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-30 00:32:36,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:36,434 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-30 00:32:36,511 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-07-30 00:32:36,512 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-07-30 00:32:36,512 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-07-30 00:32:36,512 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-07-30 00:32:36,512 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-07-30 00:32:36,512 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-07-30 00:32:36,512 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-07-30 00:32:36,512 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-07-30 00:32:36,512 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-07-30 00:32:36,513 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-30 00:32:36,517 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-07-30 00:32:36,517 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-07-30 00:32:36,517 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-07-30 00:32:36,517 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-07-30 00:32:36,517 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-07-30 00:32:36,517 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-07-30 00:32:36,517 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-07-30 00:32:36,517 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-07-30 00:32:36,517 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-07-30 00:32:36,517 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-07-30 00:32:36,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:32:36,648 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-30 00:32:36,687 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:32:36,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:36,692 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-30 00:32:36,735 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-30 00:32:36,740 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e42c0d6d0> has no local changes
2024-07-30 00:32:36,741 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/129/)'
2024-07-30 00:32:36,748 [ scc.git] DEBUG [detached HEAD 2f89b25] merge master -Dorg -Ssuccess-only
2024-07-30 00:32:36,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:32:36,749 [ scc.repo] DEBUG ## PRs found:
2024-07-30 00:32:37,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-07-30 00:32:37,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-07-30 00:32:38,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-07-30 00:32:38,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-30 00:32:39,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:32:39,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-30 00:32:39,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-07-30 00:32:39,865 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-30 00:32:40,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-07-30 00:32:40,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-07-30 00:32:41,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-07-30 00:32:41,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-07-30 00:32:41,679 [ scc.repo] DEBUG ## Branches found:
2024-07-30 00:32:41,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-30 00:32:41,679 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:32:41,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:41,685 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-30 00:32:41,690 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-30 00:32:41,690 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-30 00:32:41,696 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-30 00:32:41,702 [ scc.git] DEBUG Already up to date.
2024-07-30 00:32:41,702 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-07-30 00:32:42,128 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-07-30 00:32:42,129 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-07-30 00:32:42,134 [ scc.git] DEBUG ## Unique users: []
2024-07-30 00:32:42,134 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:32:42,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:42,142 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-30 00:32:42,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:42,155 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-30 00:32:42,168 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-07-30 00:32:42,168 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-30 00:32:42,172 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-07-30 00:32:42,172 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-07-30 00:32:42,172 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-07-30 00:32:42,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:32:42,311 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-30 00:32:42,351 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:32:42,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:32:42,356 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-30 00:32:42,400 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-30 00:32:42,406 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e430ec1c0> has no local changes
2024-07-30 00:32:42,407 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/129/)'
2024-07-30 00:32:42,415 [ scc.git] DEBUG [detached HEAD 266208d] merge master -Dorg -Ssuccess-only
2024-07-30 00:32:42,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:32:42,415 [ scc.repo] DEBUG ## PRs found:
2024-07-30 00:32:42,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-07-30 00:32:43,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-07-30 00:32:43,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-07-30 00:32:44,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-30 00:32:44,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:32:45,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-30 00:32:45,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-30 00:32:46,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-07-30 00:32:46,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-30 00:32:47,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-07-30 00:32:47,161 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-07-30 00:32:47,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-07-30 00:32:48,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-07-30 00:32:48,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-07-30 00:32:49,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:32:49,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-30 00:32:49,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-07-30 00:32:50,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-30 00:32:50,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:32:51,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-30 00:32:51,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-30 00:32:52,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-07-30 00:32:52,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-30 00:32:53,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-07-30 00:32:53,167 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-07-30 00:32:53,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-07-30 00:32:53,624 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-07-30 00:32:54,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-07-30 00:32:54,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-07-30 00:32:54,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-30 00:32:55,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:32:55,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-30 00:32:56,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-07-30 00:32:56,225 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-30 00:32:56,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-07-30 00:32:57,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-07-30 00:32:57,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-30 00:32:58,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:32:58,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-30 00:32:59,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-30 00:32:59,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-07-30 00:32:59,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-30 00:33:00,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-07-30 00:33:00,357 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-07-30 00:33:00,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-07-30 00:33:01,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-07-30 00:33:01,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-07-30 00:33:02,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-07-30 00:33:02,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-30 00:33:03,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:33:03,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-30 00:33:04,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-07-30 00:33:04,073 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-30 00:33:04,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-07-30 00:33:05,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-30 00:33:05,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:33:05,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-30 00:33:06,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-07-30 00:33:06,302 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-30 00:33:06,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-07-30 00:33:07,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-07-30 00:33:07,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-30 00:33:08,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:33:08,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-30 00:33:09,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-07-30 00:33:09,399 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-30 00:33:09,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-07-30 00:33:10,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-07-30 00:33:10,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-30 00:33:11,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:33:11,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-30 00:33:12,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-07-30 00:33:12,152 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-07-30 00:33:12,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-07-30 00:33:13,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-07-30 00:33:13,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-07-30 00:33:14,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-07-30 00:33:14,040 [ scc.repo] DEBUG ## Branches found:
2024-07-30 00:33:14,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-30 00:33:14,040 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:33:14,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:14,046 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-30 00:33:14,050 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-30 00:33:14,051 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-30 00:33:14,057 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-30 00:33:14,063 [ scc.git] DEBUG Already up to date.
2024-07-30 00:33:14,063 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-07-30 00:33:14,797 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-30 00:33:14,797 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-07-30 00:33:14,802 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-07-30 00:33:15,119 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-30 00:33:15,119 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-07-30 00:33:15,124 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-07-30 00:33:15,428 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-30 00:33:15,429 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-07-30 00:33:15,434 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-07-30 00:33:15,722 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-30 00:33:15,723 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-07-30 00:33:15,728 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-07-30 00:33:16,071 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-30 00:33:16,071 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-07-30 00:33:16,076 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-07-30 00:33:16,362 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-30 00:33:16,363 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-07-30 00:33:16,368 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-07-30 00:33:16,650 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-30 00:33:16,651 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-07-30 00:33:16,656 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-07-30 00:33:17,026 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-30 00:33:17,026 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-07-30 00:33:17,031 [ scc.git] DEBUG ## Unique users: []
2024-07-30 00:33:17,031 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:33:17,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:17,035 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-30 00:33:17,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:17,051 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-30 00:33:17,119 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-07-30 00:33:17,119 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-07-30 00:33:17,121 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-30 00:33:17,125 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-07-30 00:33:17,126 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-07-30 00:33:17,126 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-07-30 00:33:17,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:17,263 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-30 00:33:17,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:17,279 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-30 00:33:17,395 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-30 00:33:17,395 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-07-30 00:33:17,412 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-30 00:33:17,419 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-07-30 00:33:17,419 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-07-30 00:33:17,419 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-07-30 00:33:17,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:17,646 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-07-30 00:33:17,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:17,663 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-07-30 00:33:17,782 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-07-30 00:33:17,795 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-30 00:33:17,798 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-07-30 00:33:17,798 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-07-30 00:33:18,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:18,034 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-07-30 00:33:18,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:18,052 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2024-07-30 00:33:18,245 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-07-30 00:33:18,245 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-07-30 00:33:18,262 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-30 00:33:18,265 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-30 00:33:18,265 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-07-30 00:33:18,266 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-07-30 00:33:18,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:18,445 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-30 00:33:18,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:18,462 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-30 00:33:18,493 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-30 00:33:18,496 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-07-30 00:33:18,496 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-07-30 00:33:18,496 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-07-30 00:33:18,496 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-07-30 00:33:18,496 [ scc.git] DEBUG create mode 100644 connect.py
2024-07-30 00:33:18,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:18,826 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-07-30 00:33:18,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:18,843 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-07-30 00:33:18,911 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-07-30 00:33:18,913 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-30 00:33:18,916 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-07-30 00:33:18,916 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-30 00:33:19,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:19,209 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-07-30 00:33:19,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:19,225 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-07-30 00:33:19,323 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-07-30 00:33:19,342 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-30 00:33:19,346 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-07-30 00:33:19,346 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-07-30 00:33:19,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:19,594 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-30 00:33:19,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:19,611 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-30 00:33:19,676 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-30 00:33:19,676 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-30 00:33:19,684 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-07-30 00:33:19,684 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-07-30 00:33:19,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:19,979 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-30 00:33:20,020 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:33:20,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:20,025 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-30 00:33:20,061 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-30 00:33:20,070 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e41b3ef10> has no local changes
2024-07-30 00:33:20,070 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
Generated by OMERO-python-superbuild-push#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/129/)'
2024-07-30 00:33:20,079 [ scc.git] DEBUG [detached HEAD 3fa38f23] merge master -Dorg -Ssuccess-only
2024-07-30 00:33:20,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:33:20,079 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-30 00:33:20,079 [ scc.repo] DEBUG ## PRs found:
2024-07-30 00:33:20,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-30 00:33:21,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-30 00:33:21,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-30 00:33:22,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-30 00:33:22,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-30 00:33:23,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-30 00:33:23,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-30 00:33:24,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-30 00:33:25,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:33:25,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-30 00:33:26,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-30 00:33:26,014 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-30 00:33:26,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-30 00:33:27,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-30 00:33:27,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-30 00:33:27,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-30 00:33:28,001 [ scc.repo] DEBUG ## Branches found:
2024-07-30 00:33:28,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-30 00:33:28,001 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:33:28,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:28,008 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-30 00:33:28,012 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-30 00:33:28,012 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-30 00:33:28,017 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-30 00:33:28,022 [ scc.git] DEBUG Already up to date.
2024-07-30 00:33:28,022 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-30 00:33:28,452 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-07-30 00:33:28,453 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-30 00:33:28,460 [ scc.git] DEBUG ## Unique users: []
2024-07-30 00:33:28,460 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:33:28,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:28,467 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-30 00:33:28,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:28,483 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-30 00:33:28,536 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-30 00:33:28,536 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-30 00:33:28,536 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-30 00:33:28,537 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-30 00:33:28,543 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-07-30 00:33:28,551 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-07-30 00:33:28,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:28,699 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-30 00:33:28,707 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-07-30 00:33:28,714 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#129](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/129/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/129/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-30 00:33:28,719 [ scc.config] DEBUG Found github.token
2024-07-30 00:33:28,719 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-30 00:33:28,720 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-30 00:33:28,764 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:33:28,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:28,771 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-30 00:33:28,817 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-30 00:33:28,824 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e41af4640> has no local changes
2024-07-30 00:33:28,824 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/129/)'
2024-07-30 00:33:28,834 [ scc.git] DEBUG [detached HEAD 6440ff7] merge master -Dorg -Ssuccess-only
2024-07-30 00:33:28,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:33:28,835 [ scc.repo] DEBUG ## PRs found:
2024-07-30 00:33:29,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-07-30 00:33:29,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-07-30 00:33:30,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-07-30 00:33:30,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-07-30 00:33:31,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-07-30 00:33:31,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-07-30 00:33:32,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-07-30 00:33:32,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-30 00:33:33,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:33:33,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-30 00:33:33,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-30 00:33:34,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-07-30 00:33:34,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-30 00:33:35,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-07-30 00:33:35,229 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-30 00:33:35,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-07-30 00:33:36,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-07-30 00:33:36,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-30 00:33:37,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:33:37,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-30 00:33:38,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-30 00:33:38,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-07-30 00:33:39,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-30 00:33:39,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-07-30 00:33:39,463 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-30 00:33:39,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-07-30 00:33:40,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-07-30 00:33:40,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-07-30 00:33:41,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-30 00:33:41,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-30 00:33:41,825 [ scc.repo] DEBUG ## Branches found:
2024-07-30 00:33:41,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-30 00:33:41,826 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:33:41,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:41,833 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-30 00:33:41,839 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-30 00:33:41,839 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-30 00:33:41,845 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-30 00:33:41,871 [ scc.git] DEBUG Updating ba8c7e23c..7cd445ce3
2024-07-30 00:33:42,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/569 HTTP/1.1" 200 None
2024-07-30 00:33:43,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/564 HTTP/1.1" 200 None
2024-07-30 00:33:43,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/555 HTTP/1.1" 200 None
2024-07-30 00:33:43,720 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-07-30 00:33:44,171 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-30 00:33:44,171 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-07-30 00:33:44,176 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-07-30 00:33:44,600 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-30 00:33:44,600 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-07-30 00:33:44,605 [ scc.git] DEBUG ## Unique users: []
2024-07-30 00:33:44,605 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:33:44,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:44,610 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-07-30 00:33:44,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:44,623 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-07-30 00:33:44,708 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-30 00:33:44,709 [ scc.git] DEBUG Auto-merging setup.py
2024-07-30 00:33:44,709 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-30 00:33:44,713 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-07-30 00:33:44,714 [ scc.git] DEBUG setup.py | 1 +
2024-07-30 00:33:44,714 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-07-30 00:33:44,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:44,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-07-30 00:33:44,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:44,864 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-07-30 00:33:44,928 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-07-30 00:33:44,928 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-30 00:33:44,929 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-30 00:33:44,934 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-07-30 00:33:44,934 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-07-30 00:33:44,934 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-07-30 00:33:45,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:45,245 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-30 00:33:45,287 [ scc.git] DEBUG Get sha1 of %s
2024-07-30 00:33:45,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-30 00:33:45,292 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-30 00:33:45,330 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-30 00:33:45,345 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e41b0a4f0> has no local changes
2024-07-30 00:33:45,345 [ 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 ba8c7e23c..7cd445ce3
Previously merged:
- PR 569 knabar 'Update changelog for 5.27.0 release'
- PR 564 knabar 'New table API endpoints for lower level table access'
- PR 555 chris-allan 'Archive status'
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'
Generated by OMERO-python-superbuild-push#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/129/)'
2024-07-30 00:33:45,358 [ scc.git] DEBUG [detached HEAD dd1a976f0] merge master -Dorg -Ssuccess-only
2024-07-30 00:33:45,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:33:45,358 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-30 00:33:45,414 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-07-30 00:33:45,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:45,653 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-07-30 00:33:46,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:46,041 [ scc.config] DEBUG Found submodule.omero-py.url
2024-07-30 00:33:46,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:46,422 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-07-30 00:33:46,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:46,808 [ scc.config] DEBUG Found submodule.omero-web.url
2024-07-30 00:33:47,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-30 00:33:47,179 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-30 00:33:47,209 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e42c01310> has local changes
2024-07-30 00:33:47,209 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Updating ba8c7e23c..7cd445ce3
Previously merged:
- PR 569 knabar 'Update changelog for 5.27.0 release'
- PR 564 knabar 'New table API endpoints for lower level table access'
- PR 555 chris-allan 'Archive status'
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'
Generated by OMERO-python-superbuild-push#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/129/)'
2024-07-30 00:33:47,224 [ scc.git] DEBUG [detached HEAD 22db84e] merge master -Dorg -Ssuccess-only
2024-07-30 00:33:47,224 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-07-30 00:33:47,225 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-30 00:33:47,225 [ scc.merge] INFO Already up to date.
2024-07-30 00:33:47,225 [ scc.merge] INFO
2024-07-30 00:33:47,225 [ scc.merge] INFO
2024-07-30 00:33:47,225 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-07-30 00:33:47,225 [ scc.merge] INFO Already up to date.
2024-07-30 00:33:47,225 [ scc.merge] INFO
2024-07-30 00:33:47,225 [ scc.merge] INFO Merged PRs:
2024-07-30 00:33:47,225 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-30 00:33:47,225 [ scc.merge] INFO
2024-07-30 00:33:47,225 [ scc.merge] INFO Repository: ome/omero-marshal
2024-07-30 00:33:47,225 [ scc.merge] INFO Excluded PRs:
2024-07-30 00:33:47,225 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-07-30 00:33:47,225 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-07-30 00:33:47,225 [ scc.merge] INFO Already up to date.
2024-07-30 00:33:47,225 [ scc.merge] INFO
2024-07-30 00:33:47,225 [ scc.merge] INFO Merged PRs:
2024-07-30 00:33:47,225 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-30 00:33:47,225 [ scc.merge] INFO
2024-07-30 00:33:47,226 [ scc.merge] INFO Repository: ome/omero-py
2024-07-30 00:33:47,226 [ scc.merge] INFO Excluded PRs:
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-07-30 00:33:47,226 [ scc.merge] INFO Already up to date.
2024-07-30 00:33:47,226 [ scc.merge] INFO
2024-07-30 00:33:47,226 [ scc.merge] INFO Merged PRs:
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-07-30 00:33:47,226 [ scc.merge] INFO
2024-07-30 00:33:47,226 [ scc.merge] INFO Repository: ome/omero-scripts
2024-07-30 00:33:47,226 [ scc.merge] INFO Excluded PRs:
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-30 00:33:47,226 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-30 00:33:47,227 [ scc.merge] INFO Already up to date.
2024-07-30 00:33:47,227 [ scc.merge] INFO
2024-07-30 00:33:47,227 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-30 00:33:47,227 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-30 00:33:47,227 [ scc.merge] INFO
2024-07-30 00:33:47,227 [ scc.merge] INFO Repository: ome/omero-web
2024-07-30 00:33:47,227 [ scc.merge] INFO Excluded PRs:
2024-07-30 00:33:47,227 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-07-30 00:33:47,227 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-07-30 00:33:47,227 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-07-30 00:33:47,227 [ scc.merge] INFO Updating ba8c7e23c..7cd445ce3
2024-07-30 00:33:47,227 [ scc.merge] INFO Previously merged:
2024-07-30 00:33:47,227 [ scc.merge] INFO - PR 569 knabar 'Update changelog for 5.27.0 release'
2024-07-30 00:33:47,227 [ scc.merge] INFO - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-30 00:33:47,227 [ scc.merge] INFO - PR 555 chris-allan 'Archive status'
2024-07-30 00:33:47,227 [ scc.merge] INFO
2024-07-30 00:33:47,227 [ scc.merge] INFO Merged PRs:
2024-07-30 00:33:47,227 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-30 00:33:47,227 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-30 00:33:47,227 [ scc.merge] INFO
2024-07-30 00:33:47,227 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-30 00:33:47,228 [ scc.git] DEBUG Calling 'git remote'
2024-07-30 00:33:47,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-30 00:33:47,234 [ scc.git] DEBUG Calling 'git remote'
2024-07-30 00:33:47,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:33:47,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-30 00:33:47,240 [ scc.git] DEBUG Calling 'git remote'
2024-07-30 00:33:47,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:33:47,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-30 00:33:47,246 [ scc.git] DEBUG Calling 'git remote'
2024-07-30 00:33:47,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:33:47,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-30 00:33:47,251 [ scc.git] DEBUG Calling 'git remote'
2024-07-30 00:33:47,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-30 00:33:47,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-30 00:33:47,255 [ scc.git] DEBUG Calling 'git remote'
2024-07-30 00:33:47,259 [ 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 ba8c7e23c
nothing to commit, working tree clean
HEAD detached from 18cc8a4
nothing to commit, working tree clean
2024-07-30 00:34:15,242 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/9ed1fe1f/images/svgs/logo.svg){kind=logo}
