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-24 00:33:11,362 [ scc.config] DEBUG Found github.token
2024-07-24 00:33:11,365 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-24 00:33:11,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:33:12,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:33:12,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-24 00:33:12,424 [ scc.gh] DEBUG 4772 remaining from 5000 (Reset at 01:07
2024-07-24 00:33:12,426 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 00:33:12,431 [ scc.git] DEBUG Check current status
2024-07-24 00:33:12,431 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 00:33:12,436 [ scc.git] DEBUG 508496f Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2
2024-07-24 00:33:12,436 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 00:33:12,481 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-24 00:33:12,483 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-24 00:33:12,487 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-24 00:33:12,490 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-24 00:33:12,888 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-24 00:33:12,893 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 00:33:13,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-24 00:33:13,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 00:33:14,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 00:33:14,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 00:33:14,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 00:33:14,869 [ scc.git] DEBUG Resetting...
2024-07-24 00:33:14,869 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-24 00:33:14,876 [ scc.git] DEBUG HEAD is now at 508496f Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2
2024-07-24 00:33:14,877 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-24 00:33:14,937 [ scc.git] DEBUG Check current status
2024-07-24 00:33:14,937 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 00:33:14,942 [ scc.git] DEBUG 508496f Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2
2024-07-24 00:33:14,942 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 00:33:14,993 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-24 00:33:14,997 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-24 00:33:15,001 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-24 00:33:15,006 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-24 00:33:15,011 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-24 00:33:15,012 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-24 00:33:15,012 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-24 00:33:15,012 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-24 00:33:15,012 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-24 00:33:15,012 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-24 00:33:15,012 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:33:15,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-24 00:33:15,340 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:33:15,341 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:33:15,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:15,346 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:33:15,349 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:33:15,350 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:33:15,355 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:33:15,360 [ scc.git] DEBUG Already up to date.
2024-07-24 00:33:15,360 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:33:15,360 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:33:15,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:15,364 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:33:15,405 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:33:15,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:15,410 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:33:15,823 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d100fb310> has no local changes
2024-07-24 00:33:15,823 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/125/)'
2024-07-24 00:33:15,854 [ scc.git] DEBUG [detached HEAD 6b9cafa] merge master -Dorg -Snone
2024-07-24 00:33:15,854 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-24 00:33:15,854 [ scc.merge] INFO Already up to date.
2024-07-24 00:33:15,854 [ scc.merge] INFO
2024-07-24 00:33:15,854 [ scc.merge] INFO
2024-07-24 00:33:15,855 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-24 00:33:15,855 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-24 00:33:18,415 [ scc.config] DEBUG Found github.token
2024-07-24 00:33:18,417 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-24 00:33:18,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:33:19,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:33:19,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-24 00:33:19,446 [ scc.gh] DEBUG 4764 remaining from 5000 (Reset at 01:07
2024-07-24 00:33:19,447 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 00:33:19,451 [ scc.git] DEBUG Check current status
2024-07-24 00:33:19,451 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 00:33:19,455 [ scc.git] DEBUG 6b9cafa merge master -Dorg -Snone
2024-07-24 00:33:19,455 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 00:33:19,504 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-24 00:33:19,507 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-24 00:33:19,511 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-24 00:33:19,515 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-24 00:33:19,522 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-24 00:33:19,528 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 00:33:19,528 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-07-24 00:33:19,530 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-24 00:33:19,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-24 00:33:20,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 00:33:20,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 00:33:21,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 00:33:21,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 00:33:21,663 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:33:21,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-24 00:33:21,717 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 00:33:21,721 [ scc.git] DEBUG Check current status
2024-07-24 00:33:21,721 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 00:33:21,727 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-07-24 00:33:21,728 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 00:33:21,779 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 00:33:22,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-07-24 00:33:22,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 00:33:22,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 00:33:23,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 00:33:23,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 00:33:23,862 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:33:23,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:33:23,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-24 00:33:23,911 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 00:33:23,915 [ scc.git] DEBUG Check current status
2024-07-24 00:33:23,916 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 00:33:23,920 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-07-24 00:33:23,921 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 00:33:23,970 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 00:33:24,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-07-24 00:33:24,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 00:33:25,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 00:33:25,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 00:33:26,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 00:33:26,162 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:33:26,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:33:26,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-24 00:33:26,211 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 00:33:26,215 [ scc.git] DEBUG Check current status
2024-07-24 00:33:26,215 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 00:33:26,233 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-07-24 00:33:26,233 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 00:33:26,280 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 00:33:26,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-07-24 00:33:27,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 00:33:27,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 00:33:28,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 00:33:28,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 00:33:28,434 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:33:28,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:33:28,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-24 00:33:28,482 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 00:33:28,486 [ scc.git] DEBUG Check current status
2024-07-24 00:33:28,486 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 00:33:28,500 [ scc.git] DEBUG c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-24 00:33:28,500 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 00:33:28,553 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 00:33:28,554 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-07-24 00:33:28,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-07-24 00:33:29,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 00:33:29,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 00:33:30,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 00:33:30,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 00:33:30,682 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:33:30,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:33:30,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-24 00:33:30,727 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 00:33:30,731 [ scc.git] DEBUG Check current status
2024-07-24 00:33:30,731 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 00:33:30,748 [ scc.git] DEBUG ba8c7e23c Merge pull request #563 from chris-allan/batch-by-max-download-rows
2024-07-24 00:33:30,749 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 00:33:30,795 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 00:33:31,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-07-24 00:33:31,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 00:33:32,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 00:33:32,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 00:33:32,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 00:33:32,928 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:33:32,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:33:32,969 [ scc.git] DEBUG Resetting...
2024-07-24 00:33:32,969 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-24 00:33:32,976 [ scc.git] DEBUG HEAD is now at 6b9cafa merge master -Dorg -Snone
2024-07-24 00:33:32,977 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-24 00:33:33,031 [ scc.git] DEBUG Check current status
2024-07-24 00:33:33,031 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 00:33:33,036 [ scc.git] DEBUG 6b9cafa merge master -Dorg -Snone
2024-07-24 00:33:33,036 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 00:33:33,080 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-24 00:33:33,085 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-24 00:33:33,094 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-24 00:33:33,105 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-24 00:33:33,112 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-24 00:33:33,113 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-24 00:33:33,113 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-24 00:33:33,113 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-24 00:33:33,113 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-24 00:33:33,113 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-24 00:33:33,113 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-07-24 00:33:33,114 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:33:33,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-24 00:33:33,365 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:33:33,365 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:33:33,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:33,369 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:33:33,374 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:33:33,374 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:33:33,378 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:33:33,382 [ scc.git] DEBUG Already up to date.
2024-07-24 00:33:33,383 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:33:33,383 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:33:33,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:33,387 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:33:33,431 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:33:33,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:33,435 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:33:33,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-07-24 00:33:34,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-07-24 00:33:34,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-07-24 00:33:35,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-24 00:33:35,805 [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-24 00:33:36,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-24 00:33:36,756 [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-24 00:33:36,757 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-24 00:33:36,757 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:33:36,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-24 00:33:36,758 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:33:36,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:36,762 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:33:36,766 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:33:36,766 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:33:36,771 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:33:36,776 [ scc.git] DEBUG Already up to date.
2024-07-24 00:33:36,776 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-07-24 00:33:37,224 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-07-24 00:33:37,225 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-07-24 00:33:37,230 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:33:37,230 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:33:37,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:37,235 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-24 00:33:37,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:37,245 [ 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-24 00:33:37,454 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-07-24 00:33:37,454 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-07-24 00:33:37,454 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-07-24 00:33:37,454 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-07-24 00:33:37,454 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-07-24 00:33:37,454 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-07-24 00:33:37,454 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-07-24 00:33:37,454 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-07-24 00:33:37,454 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-07-24 00:33:37,456 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:33:37,460 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-07-24 00:33:37,460 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-07-24 00:33:37,460 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-07-24 00:33:37,460 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-07-24 00:33:37,461 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-07-24 00:33:37,461 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-07-24 00:33:37,461 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-07-24 00:33:37,461 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-07-24 00:33:37,461 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-07-24 00:33:37,461 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-07-24 00:33:37,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:33:37,627 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:33:37,674 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:33:37,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:37,679 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:33:37,724 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:33:37,730 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc0ca27b6d0> has no local changes
2024-07-24 00:33:37,730 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/125/)'
2024-07-24 00:33:37,740 [ scc.git] DEBUG [detached HEAD ce45745] merge master -Dorg -Ssuccess-only
2024-07-24 00:33:37,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:33:37,741 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:33:38,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-07-24 00:33:38,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-07-24 00:33:39,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-07-24 00:33:39,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-24 00:33:40,155 [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-24 00:33:40,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-24 00:33:41,040 [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-24 00:33:41,041 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-24 00:33:41,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-07-24 00:33:41,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-07-24 00:33:42,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-07-24 00:33:42,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-07-24 00:33:42,907 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:33:42,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-24 00:33:42,907 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:33:42,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:42,912 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:33:42,917 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:33:42,917 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:33:42,921 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:33:42,926 [ scc.git] DEBUG Already up to date.
2024-07-24 00:33:42,926 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-07-24 00:33:43,346 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-07-24 00:33:43,346 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-07-24 00:33:43,352 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:33:43,352 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:33:43,352 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:43,357 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-24 00:33:43,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:43,367 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-24 00:33:43,379 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-07-24 00:33:43,380 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:33:43,383 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-07-24 00:33:43,383 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-07-24 00:33:43,383 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-07-24 00:33:43,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:33:43,789 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:33:43,828 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:33:43,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:33:43,832 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:33:43,869 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:33:43,876 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc0ca4ba1c0> has no local changes
2024-07-24 00:33:43,876 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/125/)'
2024-07-24 00:33:43,885 [ scc.git] DEBUG [detached HEAD 5bbb670] merge master -Dorg -Ssuccess-only
2024-07-24 00:33:43,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:33:43,886 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:33:44,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-07-24 00:33:45,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-07-24 00:33:45,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-07-24 00:33:45,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-24 00:33:46,491 [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-24 00:33:47,002 [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-24 00:33:47,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-24 00:33:47,901 [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-24 00:33:48,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-24 00:33:48,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-07-24 00:33:48,845 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-07-24 00:33:49,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-07-24 00:33:49,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-07-24 00:33:50,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-07-24 00:33:50,701 [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-24 00:33:51,188 [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-24 00:33:51,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-07-24 00:33:52,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-24 00:33:52,713 [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-24 00:33:53,213 [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-24 00:33:53,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-24 00:33:54,123 [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-24 00:33:54,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-24 00:33:55,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-07-24 00:33:55,003 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-07-24 00:33:55,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-07-24 00:33:55,488 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-07-24 00:33:55,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-07-24 00:33:56,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-07-24 00:33:56,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-24 00:33:57,355 [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-24 00:33:57,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-24 00:33:58,263 [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-24 00:33:58,264 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-24 00:33:58,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-07-24 00:33:59,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-07-24 00:33:59,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-24 00:34:00,225 [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-24 00:34:00,726 [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-24 00:34:01,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-24 00:34:01,636 [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-24 00:34:02,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-24 00:34:02,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-07-24 00:34:02,537 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-07-24 00:34:03,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-07-24 00:34:03,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-07-24 00:34:04,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-07-24 00:34:04,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-07-24 00:34:05,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-24 00:34:05,481 [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-24 00:34:06,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-24 00:34:06,443 [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-24 00:34:06,444 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-24 00:34:06,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-07-24 00:34:07,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-24 00:34:07,864 [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-24 00:34:08,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-24 00:34:08,745 [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-24 00:34:08,748 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-24 00:34:09,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-07-24 00:34:09,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-07-24 00:34:10,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-24 00:34:10,878 [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-24 00:34:11,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-24 00:34:11,891 [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-24 00:34:11,892 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-24 00:34:12,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-07-24 00:34:12,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-07-24 00:34:13,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-24 00:34:13,817 [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-24 00:34:14,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-24 00:34:14,763 [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-24 00:34:14,764 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-07-24 00:34:15,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-07-24 00:34:15,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-07-24 00:34:16,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-07-24 00:34:16,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-07-24 00:34:16,644 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:34:16,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-24 00:34:16,645 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:34:16,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:16,650 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:34:16,653 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:34:16,654 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:34:16,658 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:34:16,662 [ scc.git] DEBUG Already up to date.
2024-07-24 00:34:16,663 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-07-24 00:34:17,523 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 00:34:17,523 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-07-24 00:34:17,529 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-07-24 00:34:17,958 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 00:34:17,958 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-07-24 00:34:17,962 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-07-24 00:34:18,402 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 00:34:18,403 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-07-24 00:34:18,408 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-07-24 00:34:18,845 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 00:34:18,845 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-07-24 00:34:18,850 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-07-24 00:34:19,304 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 00:34:19,304 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-07-24 00:34:19,308 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-07-24 00:34:19,683 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 00:34:19,684 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-07-24 00:34:19,688 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-07-24 00:34:20,109 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 00:34:20,110 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-07-24 00:34:20,114 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-07-24 00:34:20,573 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 00:34:20,574 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-07-24 00:34:20,578 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:34:20,578 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:34:20,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:20,583 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-24 00:34:20,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:20,601 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-24 00:34:20,701 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-07-24 00:34:20,701 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-07-24 00:34:20,717 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:34:20,721 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-07-24 00:34:20,721 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-07-24 00:34:20,722 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-07-24 00:34:20,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:20,902 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-24 00:34:20,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:20,917 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-24 00:34:21,187 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-24 00:34:21,187 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-07-24 00:34:21,198 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:34:21,206 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-07-24 00:34:21,206 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-07-24 00:34:21,206 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-07-24 00:34:21,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:21,394 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-07-24 00:34:21,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:21,409 [ 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-24 00:34:21,507 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-07-24 00:34:21,530 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:34:21,534 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-07-24 00:34:21,534 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-07-24 00:34:21,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:21,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-07-24 00:34:21,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:21,840 [ 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-24 00:34:21,960 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-07-24 00:34:21,960 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-07-24 00:34:21,962 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:34:21,965 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-24 00:34:21,966 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-07-24 00:34:21,966 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-07-24 00:34:22,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:22,249 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-24 00:34:22,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:22,265 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-24 00:34:22,294 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:34:22,297 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-07-24 00:34:22,297 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-07-24 00:34:22,297 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-07-24 00:34:22,297 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-07-24 00:34:22,297 [ scc.git] DEBUG create mode 100644 connect.py
2024-07-24 00:34:22,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:22,666 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-07-24 00:34:22,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:22,684 [ 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-24 00:34:22,771 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-07-24 00:34:22,773 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:34:22,777 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-07-24 00:34:22,777 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-24 00:34:23,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:23,154 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-07-24 00:34:23,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:23,170 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-07-24 00:34:23,298 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-07-24 00:34:23,300 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:34:23,304 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-07-24 00:34:23,304 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-07-24 00:34:23,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:23,584 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-24 00:34:23,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:23,601 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-24 00:34:23,667 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-24 00:34:23,684 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:34:23,692 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-07-24 00:34:23,692 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-07-24 00:34:24,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:24,013 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:34:24,055 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:34:24,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:24,061 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:34:24,104 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:34:24,114 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc0c91adf10> has no local changes
2024-07-24 00:34:24,114 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/125/)'
2024-07-24 00:34:24,124 [ scc.git] DEBUG [detached HEAD 45f47bb0] merge master -Dorg -Ssuccess-only
2024-07-24 00:34:24,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:34:24,125 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-24 00:34:24,125 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:34:24,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-24 00:34:25,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-24 00:34:25,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-24 00:34:26,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-24 00:34:26,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-24 00:34:27,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-24 00:34:27,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-24 00:34:28,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-24 00:34:28,695 [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-24 00:34:29,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-24 00:34:29,648 [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-24 00:34:29,649 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-24 00:34:30,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-24 00:34:30,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-24 00:34:31,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-24 00:34:31,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-24 00:34:31,695 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:34:31,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-24 00:34:31,696 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:34:31,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:31,700 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-24 00:34:31,705 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:34:31,705 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-24 00:34:31,711 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-24 00:34:31,716 [ scc.git] DEBUG Already up to date.
2024-07-24 00:34:31,716 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-24 00:34:32,171 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-07-24 00:34:32,171 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-24 00:34:32,176 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:34:32,176 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:34:32,176 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:32,181 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-24 00:34:32,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:32,190 [ 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-24 00:34:32,257 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-24 00:34:32,257 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-24 00:34:32,257 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 00:34:32,257 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 00:34:32,262 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-24 00:34:32,268 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-24 00:34:32,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:32,438 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-24 00:34:32,445 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-24 00:34:32,449 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#125](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/125/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/125/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-24 00:34:32,453 [ scc.config] DEBUG Found github.token
2024-07-24 00:34:32,453 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-24 00:34:32,453 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:34:32,494 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:34:32,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:32,499 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:34:32,541 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:34:32,547 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc0c9163640> has no local changes
2024-07-24 00:34:32,547 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/125/)'
2024-07-24 00:34:32,557 [ scc.git] DEBUG [detached HEAD b96d029] merge master -Dorg -Ssuccess-only
2024-07-24 00:34:32,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:34:32,558 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:34:33,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-07-24 00:34:33,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-07-24 00:34:34,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564 HTTP/1.1" 200 None
2024-07-24 00:34:34,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564/comments HTTP/1.1" 200 None
2024-07-24 00:34:35,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-24 00:34:35,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 00:34:36,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 00:34:36,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-24 00:34:36,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/091e5fc2d35212271ac71fd66b42c611299d6fde?per_page=1 HTTP/1.1" 200 None
2024-07-24 00:34:37,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-24 00:34:37,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/status HTTP/1.1" 200 None
2024-07-24 00:34:37,977 [ scc.repo] DEBUG - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-24 00:34:38,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555 HTTP/1.1" 200 None
2024-07-24 00:34:39,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555/comments HTTP/1.1" 200 None
2024-07-24 00:34:39,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-24 00:34:40,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 00:34:40,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 00:34:41,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-24 00:34:41,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/97e479b717e34179eceea2507d3e69a04b2fec1e?per_page=1 HTTP/1.1" 200 None
2024-07-24 00:34:42,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-24 00:34:42,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/status HTTP/1.1" 200 None
2024-07-24 00:34:42,449 [ scc.repo] DEBUG - PR 555 chris-allan 'Archive status'
2024-07-24 00:34:42,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-07-24 00:34:43,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-07-24 00:34:43,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-07-24 00:34:44,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-07-24 00:34:44,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-24 00:34:45,352 [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-24 00:34:45,842 [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-24 00:34:46,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-24 00:34:46,806 [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-24 00:34:47,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-24 00:34:47,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-07-24 00:34:47,702 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-24 00:34:48,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-07-24 00:34:48,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-07-24 00:34:49,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-24 00:34:49,673 [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-24 00:34:50,153 [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-24 00:34:50,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-24 00:34:51,062 [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-24 00:34:51,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-24 00:34:51,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-07-24 00:34:51,961 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-24 00:34:52,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-07-24 00:34:52,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-07-24 00:34:53,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-07-24 00:34:53,915 [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-24 00:34:54,416 [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-24 00:34:54,419 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:34:54,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-24 00:34:54,419 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:34:54,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:54,423 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:34:54,427 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:34:54,427 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:34:54,432 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:34:54,437 [ scc.git] DEBUG Already up to date.
2024-07-24 00:34:54,437 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-07-24 00:34:55,271 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-24 00:34:55,271 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-07-24 00:34:55,277 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-07-24 00:34:55,755 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-24 00:34:55,756 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-07-24 00:34:55,760 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-24 00:34:56,789 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-24 00:34:56,790 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-24 00:34:56,796 [ scc.git] DEBUG Calling 'git fetch origin pull/564/head'
2024-07-24 00:34:57,194 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-24 00:34:57,194 [ scc.git] DEBUG * branch refs/pull/564/head -> FETCH_HEAD
2024-07-24 00:34:57,199 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:34:57,199 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:34:57,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:57,204 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-07-24 00:34:57,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:57,213 [ 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-24 00:34:57,288 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-24 00:34:57,288 [ scc.git] DEBUG Auto-merging setup.py
2024-07-24 00:34:57,298 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:34:57,301 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-07-24 00:34:57,301 [ scc.git] DEBUG setup.py | 1 +
2024-07-24 00:34:57,301 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-07-24 00:34:57,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:57,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-07-24 00:34:57,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:57,514 [ 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-24 00:34:57,643 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-07-24 00:34:57,643 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-24 00:34:57,645 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:34:57,649 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-07-24 00:34:57,649 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-07-24 00:34:57,650 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-07-24 00:34:57,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:57,901 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-24 00:34:57,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:57,912 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Archive status) 97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-24 00:34:58,085 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-24 00:34:58,086 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:34:58,091 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.tree.js | 3 +++
2024-07-24 00:34:58,091 [ scc.git] DEBUG .../webclient/annotations/includes/core_metadata.html | 6 ++++++
2024-07-24 00:34:58,091 [ scc.git] DEBUG omeroweb/webclient/tree.py | 10 ++++++++--
2024-07-24 00:34:58,091 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 1 +
2024-07-24 00:34:58,091 [ scc.git] DEBUG 4 files changed, 18 insertions(+), 2 deletions(-)
2024-07-24 00:34:58,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:58,310 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...091e5fc2d35212271ac71fd66b42c611299d6fde'
2024-07-24 00:34:58,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:58,321 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 564 (New table API endpoints for lower level table access) 091e5fc2d35212271ac71fd66b42c611299d6fde'
2024-07-24 00:34:58,369 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-24 00:34:58,370 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py
2024-07-24 00:34:58,371 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:34:58,376 [ scc.git] DEBUG omeroweb/settings.py | 7 ++
2024-07-24 00:34:58,376 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 29 +++++++
2024-07-24 00:34:58,376 [ scc.git] DEBUG omeroweb/webgateway/views.py | 175 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-24 00:34:58,376 [ scc.git] DEBUG 3 files changed, 210 insertions(+), 1 deletion(-)
2024-07-24 00:34:58,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:58,733 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:34:58,777 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:34:58,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:34:58,781 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:34:58,822 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:34:58,846 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc0c91784f0> has no local changes
2024-07-24 00:34:58,846 [ 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)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 555 chris-allan 'Archive status'
- PR 564 knabar 'New table API endpoints for lower level table access'
Generated by OMERO-python-superbuild-push#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/125/)'
2024-07-24 00:34:58,866 [ scc.git] DEBUG [detached HEAD f81284870] merge master -Dorg -Ssuccess-only
2024-07-24 00:34:58,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:34:58,867 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:34:58,915 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-07-24 00:34:59,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:59,149 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-07-24 00:34:59,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:59,577 [ scc.config] DEBUG Found submodule.omero-py.url
2024-07-24 00:34:59,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:34:59,997 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-07-24 00:35:00,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:35:00,408 [ scc.config] DEBUG Found submodule.omero-web.url
2024-07-24 00:35:00,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:35:00,801 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:35:00,831 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc0ca26f310> has local changes
2024-07-24 00:35:00,831 [ 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)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 555 chris-allan 'Archive status'
- PR 564 knabar 'New table API endpoints for lower level table access'
Generated by OMERO-python-superbuild-push#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/125/)'
2024-07-24 00:35:00,841 [ scc.git] DEBUG [detached HEAD 9078d90] merge master -Dorg -Ssuccess-only
2024-07-24 00:35:00,841 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-24 00:35:00,841 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-07-24 00:35:00,841 [ scc.merge] INFO Already up to date.
2024-07-24 00:35:00,841 [ scc.merge] INFO
2024-07-24 00:35:00,841 [ scc.merge] INFO
2024-07-24 00:35:00,842 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-07-24 00:35:00,842 [ scc.merge] INFO Already up to date.
2024-07-24 00:35:00,842 [ scc.merge] INFO
2024-07-24 00:35:00,842 [ scc.merge] INFO Merged PRs:
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-24 00:35:00,842 [ scc.merge] INFO
2024-07-24 00:35:00,842 [ scc.merge] INFO Repository: ome/omero-marshal
2024-07-24 00:35:00,842 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-07-24 00:35:00,842 [ scc.merge] INFO Already up to date.
2024-07-24 00:35:00,842 [ scc.merge] INFO
2024-07-24 00:35:00,842 [ scc.merge] INFO Merged PRs:
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-24 00:35:00,842 [ scc.merge] INFO
2024-07-24 00:35:00,842 [ scc.merge] INFO Repository: ome/omero-py
2024-07-24 00:35:00,842 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-07-24 00:35:00,842 [ scc.merge] INFO Already up to date.
2024-07-24 00:35:00,842 [ scc.merge] INFO
2024-07-24 00:35:00,842 [ scc.merge] INFO Merged PRs:
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-07-24 00:35:00,842 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-07-24 00:35:00,842 [ scc.merge] INFO
2024-07-24 00:35:00,842 [ scc.merge] INFO Repository: ome/omero-scripts
2024-07-24 00:35:00,842 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:35:00,843 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-24 00:35:00,843 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-24 00:35:00,843 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-24 00:35:00,843 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-24 00:35:00,843 [ scc.merge] INFO Already up to date.
2024-07-24 00:35:00,843 [ scc.merge] INFO
2024-07-24 00:35:00,843 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 00:35:00,843 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-24 00:35:00,843 [ scc.merge] INFO
2024-07-24 00:35:00,843 [ scc.merge] INFO Repository: ome/omero-web
2024-07-24 00:35:00,843 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:35:00,843 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-07-24 00:35:00,843 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-07-24 00:35:00,843 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-07-24 00:35:00,843 [ scc.merge] INFO Already up to date.
2024-07-24 00:35:00,843 [ scc.merge] INFO
2024-07-24 00:35:00,843 [ scc.merge] INFO Merged PRs:
2024-07-24 00:35:00,843 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-24 00:35:00,843 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-24 00:35:00,843 [ scc.merge] INFO - PR 555 chris-allan 'Archive status'
2024-07-24 00:35:00,843 [ scc.merge] INFO - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-24 00:35:00,843 [ scc.merge] INFO
2024-07-24 00:35:00,843 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-24 00:35:00,843 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:35:00,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-24 00:35:00,848 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:35:00,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:35:00,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-24 00:35:00,853 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:35:00,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:35:00,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-24 00:35:00,858 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:35:00,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:35:00,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-24 00:35:00,864 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:35:00,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 00:35:00,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-24 00:35:00,870 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:35:00,876 [ 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 c20d273
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from ba8c7e23c
nothing to commit, working tree clean
HEAD detached from 508496f
nothing to commit, working tree clean
2024-07-24 00:35:32,276 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/b04263cd/images/svgs/logo.svg){kind=logo}
