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-05-18 00:34:14,878 [ scc.config] DEBUG Found github.token
2024-05-18 00:34:14,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-18 00:34:15,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:34:15,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:34:15,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-18 00:34:15,918 [ scc.gh] DEBUG 3023 remaining from 5000 (Reset at 00:05
2024-05-18 00:34:15,919 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-18 00:34:15,924 [ scc.git] DEBUG Check current status
2024-05-18 00:34:15,924 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-18 00:34:15,928 [ scc.git] DEBUG ee4b0ba Merge pull request #278 from ome/dependabot/submodules/omero-py-53a327b
2024-05-18 00:34:15,928 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-18 00:34:15,991 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-05-18 00:34:15,994 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-18 00:34:16,032 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-18 00:34:16,036 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-18 00:34:16,167 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-18 00:34:16,174 [ scc.config] DEBUG Found remote.origin.url
2024-05-18 00:34:16,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-18 00:34:16,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-18 00:34:17,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-18 00:34:17,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-18 00:34:18,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-18 00:34:18,104 [ scc.git] DEBUG Resetting...
2024-05-18 00:34:18,104 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-18 00:34:18,110 [ scc.git] DEBUG HEAD is now at ee4b0ba Merge pull request #278 from ome/dependabot/submodules/omero-py-53a327b
2024-05-18 00:34:18,111 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-18 00:34:18,167 [ scc.git] DEBUG Check current status
2024-05-18 00:34:18,167 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-18 00:34:18,172 [ scc.git] DEBUG ee4b0ba Merge pull request #278 from ome/dependabot/submodules/omero-py-53a327b
2024-05-18 00:34:18,172 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-18 00:34:18,215 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-05-18 00:34:18,218 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-18 00:34:18,222 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-18 00:34:18,226 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-18 00:34:18,229 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-18 00:34:18,230 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-18 00:34:18,230 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-18 00:34:18,230 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-18 00:34:18,230 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-18 00:34:18,230 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-18 00:34:18,231 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:34:18,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-05-18 00:34:18,533 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:34:18,533 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:34:18,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:18,537 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:34:18,541 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:34:18,541 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:34:18,545 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:34:18,550 [ scc.git] DEBUG Already up to date.
2024-05-18 00:34:18,550 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:34:18,550 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:34:18,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:18,554 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:34:18,594 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:34:18,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:18,599 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:34:18,813 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa04a768460> has no local changes
2024-05-18 00:34:18,814 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/65/)'
2024-05-18 00:34:18,842 [ scc.git] DEBUG [detached HEAD c6c9c3d] merge master -Dorg -Snone
2024-05-18 00:34:18,842 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-18 00:34:18,842 [ scc.merge] INFO Already up to date.
2024-05-18 00:34:18,842 [ scc.merge] INFO
2024-05-18 00:34:18,842 [ scc.merge] INFO
2024-05-18 00:34:18,842 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-18 00:34:18,842 [ 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
e1b1355eb..c6314d8a9 master -> origin/master
Submodule path 'omero-web': checked out 'c6314d8a9917ba4112696d683516d89be8fafcb0'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-05-18 00:34:23,275 [ scc.config] DEBUG Found github.token
2024-05-18 00:34:23,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-18 00:34:23,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:34:23,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:34:24,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-18 00:34:24,326 [ scc.gh] DEBUG 2996 remaining from 5000 (Reset at 00:05
2024-05-18 00:34:24,327 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-18 00:34:24,332 [ scc.git] DEBUG Check current status
2024-05-18 00:34:24,332 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-18 00:34:24,335 [ scc.git] DEBUG c6c9c3d merge master -Dorg -Snone
2024-05-18 00:34:24,336 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-18 00:34:24,375 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-05-18 00:34:24,379 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-18 00:34:24,382 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-18 00:34:24,386 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-18 00:34:24,390 [ scc.git] DEBUG +c6314d8a9917ba4112696d683516d89be8fafcb0 omero-web (v5.25.0-43-gc6314d8a9)
2024-05-18 00:34:24,395 [ scc.config] DEBUG Found remote.origin.url
2024-05-18 00:34:24,395 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-05-18 00:34:24,397 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-05-18 00:34:24,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-18 00:34:25,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-18 00:34:25,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-18 00:34:26,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-18 00:34:26,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-18 00:34:26,513 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:34:26,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-18 00:34:26,565 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-18 00:34:26,569 [ scc.git] DEBUG Check current status
2024-05-18 00:34:26,570 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-18 00:34:26,574 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-05-18 00:34:26,574 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-18 00:34:26,618 [ scc.config] DEBUG Found remote.origin.url
2024-05-18 00:34:27,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-05-18 00:34:27,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-18 00:34:27,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-18 00:34:28,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-18 00:34:28,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-18 00:34:28,775 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:34:28,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:34:28,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-18 00:34:28,817 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-18 00:34:28,821 [ scc.git] DEBUG Check current status
2024-05-18 00:34:28,821 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-18 00:34:28,825 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-05-18 00:34:28,825 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-18 00:34:28,869 [ scc.config] DEBUG Found remote.origin.url
2024-05-18 00:34:29,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-05-18 00:34:29,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-18 00:34:30,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-18 00:34:30,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-18 00:34:30,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-18 00:34:30,955 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:34:30,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:34:30,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-18 00:34:30,999 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-18 00:34:31,003 [ scc.git] DEBUG Check current status
2024-05-18 00:34:31,003 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-18 00:34:31,025 [ scc.git] DEBUG 53a327b8 Merge pull request #407 from jburel/install_conda_forge
2024-05-18 00:34:31,025 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-18 00:34:31,073 [ scc.config] DEBUG Found remote.origin.url
2024-05-18 00:34:31,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-05-18 00:34:31,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-18 00:34:32,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-18 00:34:32,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-18 00:34:33,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-18 00:34:33,134 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:34:33,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:34:33,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-18 00:34:33,182 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-18 00:34:33,187 [ scc.git] DEBUG Check current status
2024-05-18 00:34:33,187 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-18 00:34:33,191 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-18 00:34:33,191 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-18 00:34:33,233 [ scc.config] DEBUG Found remote.origin.url
2024-05-18 00:34:33,234 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-05-18 00:34:33,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-05-18 00:34:34,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-18 00:34:34,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-18 00:34:34,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-18 00:34:35,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-18 00:34:35,323 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:34:35,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:34:35,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-18 00:34:35,369 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-18 00:34:35,374 [ scc.git] DEBUG Check current status
2024-05-18 00:34:35,374 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-18 00:34:35,394 [ scc.git] DEBUG c6314d8a9 Merge pull request #553 from ome/pre-commit-ci-update-config
2024-05-18 00:34:35,394 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-18 00:34:35,436 [ scc.config] DEBUG Found remote.origin.url
2024-05-18 00:34:35,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-05-18 00:34:36,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-18 00:34:36,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-18 00:34:37,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-18 00:34:37,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-18 00:34:37,523 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:34:37,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:34:37,565 [ scc.git] DEBUG Resetting...
2024-05-18 00:34:37,565 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-18 00:34:37,572 [ scc.git] DEBUG HEAD is now at c6c9c3d merge master -Dorg -Snone
2024-05-18 00:34:37,572 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-18 00:34:37,650 [ scc.git] DEBUG Submodule path 'omero-web': checked out 'e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-05-18 00:34:37,654 [ scc.git] DEBUG Check current status
2024-05-18 00:34:37,654 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-18 00:34:37,659 [ scc.git] DEBUG c6c9c3d merge master -Dorg -Snone
2024-05-18 00:34:37,659 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-18 00:34:37,703 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-05-18 00:34:37,706 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-18 00:34:37,710 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-18 00:34:37,714 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-18 00:34:37,718 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-18 00:34:37,719 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-18 00:34:37,719 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-18 00:34:37,719 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-18 00:34:37,719 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-18 00:34:37,719 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-18 00:34:37,719 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-05-18 00:34:37,719 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:34:37,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-05-18 00:34:37,939 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:34:37,939 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:34:37,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:37,945 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:34:37,953 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:34:37,954 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:34:37,963 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:34:37,970 [ scc.git] DEBUG Already up to date.
2024-05-18 00:34:37,970 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:34:37,970 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:34:37,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:37,975 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:34:38,025 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:34:38,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:38,029 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:34:38,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-05-18 00:34:38,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-05-18 00:34:39,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-05-18 00:34:39,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-18 00:34:40,215 [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-05-18 00:34:40,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-18 00:34:41,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-05-18 00:34:41,111 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-18 00:34:41,111 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:34:41,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-18 00:34:41,111 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:34:41,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:41,117 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:34:41,123 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:34:41,123 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:34:41,129 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:34:41,136 [ scc.git] DEBUG Already up to date.
2024-05-18 00:34:41,136 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-05-18 00:34:41,510 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-18 00:34:41,510 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-05-18 00:34:41,515 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:34:41,515 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:34:41,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:41,520 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-05-18 00:34:41,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:41,528 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-05-18 00:34:41,542 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-05-18 00:34:41,542 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-05-18 00:34:41,542 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-05-18 00:34:41,542 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-05-18 00:34:41,542 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-05-18 00:34:41,542 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-05-18 00:34:41,542 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-05-18 00:34:41,542 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-05-18 00:34:41,542 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-05-18 00:34:41,562 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:34:41,565 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-05-18 00:34:41,566 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-05-18 00:34:41,566 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-05-18 00:34:41,566 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-05-18 00:34:41,566 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-05-18 00:34:41,567 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-05-18 00:34:41,567 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-05-18 00:34:41,568 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-05-18 00:34:41,568 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-05-18 00:34:41,568 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-05-18 00:34:41,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:34:41,730 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:34:41,771 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:34:41,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:41,776 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:34:41,812 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:34:41,818 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f783d14fc10> has no local changes
2024-05-18 00:34:41,818 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/65/)'
2024-05-18 00:34:41,826 [ scc.git] DEBUG [detached HEAD 25be8f2] merge master -Dorg -Ssuccess-only
2024-05-18 00:34:41,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:34:41,826 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:34:42,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-05-18 00:34:42,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-05-18 00:34:43,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-05-18 00:34:43,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-18 00:34:44,159 [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-05-18 00:34:44,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-18 00:34:45,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-18 00:34:45,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-05-18 00:34:45,522 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-18 00:34:45,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-05-18 00:34:46,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-05-18 00:34:46,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-05-18 00:34:47,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-05-18 00:34:47,388 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:34:47,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-18 00:34:47,388 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:34:47,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:47,394 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:34:47,398 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:34:47,398 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:34:47,404 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:34:47,409 [ scc.git] DEBUG Already up to date.
2024-05-18 00:34:47,410 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-05-18 00:34:47,810 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-05-18 00:34:47,810 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-05-18 00:34:47,817 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:34:47,817 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:34:47,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:47,823 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-18 00:34:47,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:47,836 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-18 00:34:47,849 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-05-18 00:34:47,850 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:34:47,853 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-05-18 00:34:47,854 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-05-18 00:34:47,854 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-05-18 00:34:48,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:34:48,014 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:34:48,061 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:34:48,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:34:48,067 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:34:48,118 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:34:48,126 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f783d0ea0d0> has no local changes
2024-05-18 00:34:48,126 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/65/)'
2024-05-18 00:34:48,137 [ scc.git] DEBUG [detached HEAD 912985e] merge master -Dorg -Ssuccess-only
2024-05-18 00:34:48,137 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:34:48,137 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:34:48,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-05-18 00:34:49,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-05-18 00:34:49,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-05-18 00:34:49,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-18 00:34:50,452 [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-05-18 00:34:50,900 [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-05-18 00:34:51,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-18 00:34:51,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-05-18 00:34:52,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-18 00:34:52,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-05-18 00:34:52,613 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-05-18 00:34:53,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-05-18 00:34:53,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-05-18 00:34:53,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-05-18 00:34:54,518 [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-05-18 00:34:54,994 [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-05-18 00:34:55,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-05-18 00:34:55,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-18 00:34:56,367 [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-05-18 00:34:56,819 [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-05-18 00:34:57,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-18 00:34:57,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-05-18 00:34:58,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-18 00:34:58,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-05-18 00:34:58,582 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-05-18 00:34:59,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-05-18 00:34:59,057 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-05-18 00:34:59,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-05-18 00:35:00,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-05-18 00:35:00,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-05-18 00:35:00,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-05-18 00:35:01,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-18 00:35:01,935 [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-05-18 00:35:02,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-18 00:35:02,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-05-18 00:35:02,788 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-18 00:35:03,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-05-18 00:35:03,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-05-18 00:35:04,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-18 00:35:04,689 [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-05-18 00:35:05,140 [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-05-18 00:35:05,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-18 00:35:06,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-05-18 00:35:06,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-18 00:35:06,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-05-18 00:35:06,962 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-05-18 00:35:07,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-05-18 00:35:07,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-05-18 00:35:08,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-05-18 00:35:08,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-05-18 00:35:09,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-18 00:35:09,704 [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-05-18 00:35:10,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-18 00:35:10,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-05-18 00:35:10,613 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-18 00:35:11,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-05-18 00:35:11,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-18 00:35:11,941 [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-05-18 00:35:12,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-18 00:35:12,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-05-18 00:35:12,787 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-18 00:35:13,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-05-18 00:35:13,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-05-18 00:35:14,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-18 00:35:14,852 [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-05-18 00:35:15,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-18 00:35:15,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-05-18 00:35:15,828 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-18 00:35:16,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-05-18 00:35:16,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-05-18 00:35:17,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-18 00:35:17,607 [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-05-18 00:35:18,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-18 00:35:18,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-05-18 00:35:18,525 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-05-18 00:35:18,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-05-18 00:35:19,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-05-18 00:35:19,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-05-18 00:35:20,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-05-18 00:35:20,437 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:35:20,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-18 00:35:20,437 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:35:20,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:20,444 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:35:20,449 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:35:20,449 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:35:20,454 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:35:20,460 [ scc.git] DEBUG Already up to date.
2024-05-18 00:35:20,460 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-05-18 00:35:20,967 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-18 00:35:20,967 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-05-18 00:35:20,973 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-05-18 00:35:21,388 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-18 00:35:21,388 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-05-18 00:35:21,394 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-05-18 00:35:21,857 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-18 00:35:21,858 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-05-18 00:35:21,864 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-05-18 00:35:22,305 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-18 00:35:22,306 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-05-18 00:35:22,312 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-05-18 00:35:22,722 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-18 00:35:22,723 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-05-18 00:35:22,730 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-05-18 00:35:23,102 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-18 00:35:23,102 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-05-18 00:35:23,110 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-05-18 00:35:23,491 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-18 00:35:23,491 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-05-18 00:35:23,497 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-05-18 00:35:23,973 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-18 00:35:23,973 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-05-18 00:35:23,979 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:35:23,979 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:35:23,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:23,995 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-18 00:35:24,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:24,023 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-18 00:35:24,132 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-05-18 00:35:24,132 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-05-18 00:35:24,149 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:35:24,153 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-05-18 00:35:24,154 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-05-18 00:35:24,154 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-05-18 00:35:24,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:24,308 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-18 00:35:24,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:24,326 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-18 00:35:24,384 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-18 00:35:24,384 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-05-18 00:35:24,385 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:35:24,392 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-05-18 00:35:24,393 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-05-18 00:35:24,393 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-05-18 00:35:24,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:24,725 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-05-18 00:35:24,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:24,744 [ 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-05-18 00:35:24,797 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-05-18 00:35:24,798 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:35:24,802 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-05-18 00:35:24,802 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-05-18 00:35:25,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:25,137 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-05-18 00:35:25,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:25,157 [ 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-05-18 00:35:25,229 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-05-18 00:35:25,230 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-05-18 00:35:25,231 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:35:25,236 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-05-18 00:35:25,236 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-05-18 00:35:25,236 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-05-18 00:35:25,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:25,537 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-18 00:35:25,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:25,554 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-18 00:35:25,585 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:35:25,588 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-05-18 00:35:25,588 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-05-18 00:35:25,588 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-05-18 00:35:25,588 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-05-18 00:35:25,588 [ scc.git] DEBUG create mode 100644 connect.py
2024-05-18 00:35:25,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:25,938 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-05-18 00:35:25,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:25,963 [ 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-05-18 00:35:26,099 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-05-18 00:35:26,100 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:35:26,103 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-05-18 00:35:26,104 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-18 00:35:26,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:26,344 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-05-18 00:35:26,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:26,360 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-05-18 00:35:26,393 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-05-18 00:35:26,394 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:35:26,399 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-05-18 00:35:26,399 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-05-18 00:35:26,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:26,757 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-18 00:35:26,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:26,775 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-18 00:35:26,892 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-18 00:35:26,893 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:35:26,901 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-05-18 00:35:26,901 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-05-18 00:35:27,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:27,149 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:35:27,190 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:35:27,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:27,194 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:35:27,230 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:35:27,239 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f783c08e760> has no local changes
2024-05-18 00:35:27,239 [ 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 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
- 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/65/)'
2024-05-18 00:35:27,266 [ scc.git] DEBUG [detached HEAD 27ffb73d] merge master -Dorg -Ssuccess-only
2024-05-18 00:35:27,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:35:27,267 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-18 00:35:27,267 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:35:27,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-18 00:35:28,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-18 00:35:28,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-18 00:35:29,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-18 00:35:29,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-18 00:35:30,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-18 00:35:30,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-18 00:35:30,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-18 00:35:31,428 [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-05-18 00:35:31,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-18 00:35:32,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-05-18 00:35:32,328 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-18 00:35:32,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-18 00:35:33,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-18 00:35:33,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-18 00:35:34,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-18 00:35:34,308 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:35:34,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-18 00:35:34,309 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:35:34,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:34,315 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-18 00:35:34,320 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:35:34,320 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-18 00:35:34,326 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-18 00:35:34,331 [ scc.git] DEBUG Already up to date.
2024-05-18 00:35:34,332 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-18 00:35:34,780 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-05-18 00:35:34,780 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-18 00:35:34,787 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:35:34,787 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:35:34,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:34,792 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-18 00:35:34,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:34,812 [ 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-05-18 00:35:34,844 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-18 00:35:34,844 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-18 00:35:34,844 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-18 00:35:34,845 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-18 00:35:34,851 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-18 00:35:34,856 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-18 00:35:35,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:35,015 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-18 00:35:35,022 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-18 00:35:35,026 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#65](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/65/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/65/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-18 00:35:35,031 [ scc.config] DEBUG Found github.token
2024-05-18 00:35:35,031 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-18 00:35:35,031 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:35:35,079 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:35:35,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:35,086 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:35:35,131 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:35:35,138 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f783c08f3a0> has no local changes
2024-05-18 00:35:35,139 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/65/)'
2024-05-18 00:35:35,147 [ scc.git] DEBUG [detached HEAD 42283ca] merge master -Dorg -Ssuccess-only
2024-05-18 00:35:35,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:35:35,147 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:35:35,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-05-18 00:35:36,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555 HTTP/1.1" 200 None
2024-05-18 00:35:36,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555/comments HTTP/1.1" 200 None
2024-05-18 00:35:37,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba35505643d8b5095fba7c47d2b92adf36adc6 HTTP/1.1" 200 None
2024-05-18 00:35:37,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba35505643d8b5095fba7c47d2b92adf36adc6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-18 00:35:37,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba35505643d8b5095fba7c47d2b92adf36adc6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-18 00:35:38,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba35505643d8b5095fba7c47d2b92adf36adc6 HTTP/1.1" 200 None
2024-05-18 00:35:38,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/6bba35505643d8b5095fba7c47d2b92adf36adc6?per_page=1 HTTP/1.1" 200 None
2024-05-18 00:35:39,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba35505643d8b5095fba7c47d2b92adf36adc6 HTTP/1.1" 200 None
2024-05-18 00:35:39,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6bba35505643d8b5095fba7c47d2b92adf36adc6/status HTTP/1.1" 200 None
2024-05-18 00:35:39,660 [ scc.repo] DEBUG - PR 555 chris-allan 'Archive status'
2024-05-18 00:35:40,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/554 HTTP/1.1" 200 None
2024-05-18 00:35:40,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-05-18 00:35:41,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-05-18 00:35:41,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-05-18 00:35:41,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-18 00:35:42,419 [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-05-18 00:35:42,922 [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-05-18 00:35:43,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-18 00:35:43,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-05-18 00:35:44,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-18 00:35:44,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-05-18 00:35:44,695 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-18 00:35:45,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-05-18 00:35:45,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-05-18 00:35:46,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-18 00:35:46,525 [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-05-18 00:35:47,000 [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-05-18 00:35:47,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-18 00:35:47,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-05-18 00:35:48,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-18 00:35:48,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-05-18 00:35:48,753 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-18 00:35:49,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-05-18 00:35:49,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-05-18 00:35:50,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-05-18 00:35:50,630 [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-05-18 00:35:51,108 [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-05-18 00:35:51,112 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:35:51,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-18 00:35:51,113 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:35:51,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:51,119 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:35:51,124 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:35:51,124 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:35:51,129 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:35:51,159 [ scc.git] DEBUG Updating e1b1355eb..c6314d8a9
2024-05-18 00:35:51,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/553 HTTP/1.1" 200 None
2024-05-18 00:35:52,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/533 HTTP/1.1" 200 None
2024-05-18 00:35:52,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/542 HTTP/1.1" 200 None
2024-05-18 00:35:53,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/543 HTTP/1.1" 200 None
2024-05-18 00:35:54,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/549 HTTP/1.1" 200 None
2024-05-18 00:35:54,253 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-05-18 00:35:54,794 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-18 00:35:54,795 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-05-18 00:35:54,800 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-05-18 00:35:55,216 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-18 00:35:55,216 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-05-18 00:35:55,222 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-18 00:35:55,807 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-18 00:35:55,807 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-18 00:35:55,813 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:35:55,813 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:35:55,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:55,820 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-05-18 00:35:55,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:55,832 [ 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-05-18 00:35:55,872 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-05-18 00:35:55,873 [ scc.git] DEBUG Auto-merging setup.py
2024-05-18 00:35:55,874 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:35:55,878 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-05-18 00:35:55,878 [ scc.git] DEBUG setup.py | 1 +
2024-05-18 00:35:55,878 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-05-18 00:35:56,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:56,040 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-05-18 00:35:56,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:56,053 [ 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-05-18 00:35:56,116 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-05-18 00:35:56,116 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-05-18 00:35:56,117 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:35:56,122 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-05-18 00:35:56,122 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-05-18 00:35:56,122 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-05-18 00:35:56,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:56,456 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6bba35505643d8b5095fba7c47d2b92adf36adc6'
2024-05-18 00:35:56,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:56,471 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Archive status) 6bba35505643d8b5095fba7c47d2b92adf36adc6'
2024-05-18 00:35:56,494 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-05-18 00:35:56,496 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:35:56,501 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.tree.js | 2 ++
2024-05-18 00:35:56,501 [ scc.git] DEBUG omeroweb/webclient/tree.py | 7 +++++--
2024-05-18 00:35:56,501 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 1 +
2024-05-18 00:35:56,501 [ scc.git] DEBUG 3 files changed, 8 insertions(+), 2 deletions(-)
2024-05-18 00:35:56,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:56,932 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:35:56,979 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:35:56,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:35:56,984 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:35:57,029 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:35:57,042 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f783c0a0910> has no local changes
2024-05-18 00:35:57,042 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Updating e1b1355eb..c6314d8a9
Previously merged:
- PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
- PR 533 jburel 'use conda-forge channel'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 543 knabar 'Block UI for some long running tasks'
- PR 549 knabar 'Remove webgateway cache'
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'
Generated by OMERO-python-superbuild-push#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/65/)'
2024-05-18 00:35:57,055 [ scc.git] DEBUG [detached HEAD 955be4fa1] merge master -Dorg -Ssuccess-only
2024-05-18 00:35:57,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:35:57,056 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:35:57,117 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-05-18 00:35:57,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:57,357 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-05-18 00:35:57,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:57,777 [ scc.config] DEBUG Found submodule.omero-py.url
2024-05-18 00:35:58,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:58,199 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-05-18 00:35:58,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:58,598 [ scc.config] DEBUG Found submodule.omero-web.url
2024-05-18 00:35:58,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:35:59,010 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:35:59,040 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f783f505460> has local changes
2024-05-18 00:35:59,040 [ 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 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
- 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 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Updating e1b1355eb..c6314d8a9
Previously merged:
- PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
- PR 533 jburel 'use conda-forge channel'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 543 knabar 'Block UI for some long running tasks'
- PR 549 knabar 'Remove webgateway cache'
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'
Generated by OMERO-python-superbuild-push#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/65/)'
2024-05-18 00:35:59,052 [ scc.git] DEBUG [detached HEAD 991afe3] merge master -Dorg -Ssuccess-only
2024-05-18 00:35:59,053 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-05-18 00:35:59,053 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-18 00:35:59,053 [ scc.merge] INFO Already up to date.
2024-05-18 00:35:59,053 [ scc.merge] INFO
2024-05-18 00:35:59,053 [ scc.merge] INFO
2024-05-18 00:35:59,053 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-05-18 00:35:59,053 [ scc.merge] INFO Already up to date.
2024-05-18 00:35:59,053 [ scc.merge] INFO
2024-05-18 00:35:59,053 [ scc.merge] INFO Merged PRs:
2024-05-18 00:35:59,053 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-18 00:35:59,053 [ scc.merge] INFO
2024-05-18 00:35:59,053 [ scc.merge] INFO Repository: ome/omero-marshal
2024-05-18 00:35:59,053 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:35:59,053 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-05-18 00:35:59,053 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-05-18 00:35:59,053 [ scc.merge] INFO Already up to date.
2024-05-18 00:35:59,053 [ scc.merge] INFO
2024-05-18 00:35:59,053 [ scc.merge] INFO Merged PRs:
2024-05-18 00:35:59,053 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-18 00:35:59,053 [ scc.merge] INFO
2024-05-18 00:35:59,053 [ scc.merge] INFO Repository: ome/omero-py
2024-05-18 00:35:59,053 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:35:59,053 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-05-18 00:35:59,054 [ scc.merge] INFO Already up to date.
2024-05-18 00:35:59,054 [ scc.merge] INFO
2024-05-18 00:35:59,054 [ scc.merge] INFO Merged PRs:
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-05-18 00:35:59,054 [ scc.merge] INFO
2024-05-18 00:35:59,054 [ scc.merge] INFO Repository: ome/omero-scripts
2024-05-18 00:35:59,054 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-18 00:35:59,054 [ scc.merge] INFO Already up to date.
2024-05-18 00:35:59,054 [ scc.merge] INFO
2024-05-18 00:35:59,054 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-18 00:35:59,054 [ scc.merge] INFO
2024-05-18 00:35:59,054 [ scc.merge] INFO Repository: ome/omero-web
2024-05-18 00:35:59,054 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft)
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-05-18 00:35:59,054 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-05-18 00:35:59,054 [ scc.merge] INFO Updating e1b1355eb..c6314d8a9
2024-05-18 00:35:59,055 [ scc.merge] INFO Previously merged:
2024-05-18 00:35:59,055 [ scc.merge] INFO - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
2024-05-18 00:35:59,055 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-05-18 00:35:59,055 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-18 00:35:59,055 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks'
2024-05-18 00:35:59,055 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache'
2024-05-18 00:35:59,055 [ scc.merge] INFO
2024-05-18 00:35:59,055 [ scc.merge] INFO Merged PRs:
2024-05-18 00:35:59,055 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-18 00:35:59,055 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-18 00:35:59,055 [ scc.merge] INFO - PR 555 chris-allan 'Archive status'
2024-05-18 00:35:59,055 [ scc.merge] INFO
2024-05-18 00:35:59,055 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-18 00:35:59,055 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:35:59,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-18 00:35:59,061 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:35:59,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:35:59,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-18 00:35:59,065 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:35:59,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:35:59,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-18 00:35:59,070 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:35:59,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:35:59,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-18 00:35:59,075 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:35:59,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-18 00:35:59,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-18 00:35:59,080 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:35:59,084 [ 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 53a327b8
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from e1b1355eb
nothing to commit, working tree clean
HEAD detached from ee4b0ba
nothing to commit, working tree clean
2024-05-18 00:36:29,013 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/b864b239/images/svgs/logo.svg){kind=logo}
