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-12 00:33:09,686 [ scc.config] DEBUG Found github.token
2024-05-12 00:33:09,689 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-12 00:33:09,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:33:10,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:33:10,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-12 00:33:10,747 [ scc.gh] DEBUG 3973 remaining from 5000 (Reset at 01:05
2024-05-12 00:33:10,748 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-12 00:33:10,752 [ scc.git] DEBUG Check current status
2024-05-12 00:33:10,752 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-12 00:33:10,756 [ scc.git] DEBUG ee4b0ba Merge pull request #278 from ome/dependabot/submodules/omero-py-53a327b
2024-05-12 00:33:10,756 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-12 00:33:10,798 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-05-12 00:33:10,800 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-12 00:33:10,803 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-12 00:33:10,807 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-12 00:33:10,810 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-12 00:33:10,815 [ scc.config] DEBUG Found remote.origin.url
2024-05-12 00:33:11,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-12 00:33:11,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-12 00:33:12,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-12 00:33:12,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-12 00:33:12,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-12 00:33:12,926 [ scc.git] DEBUG Resetting...
2024-05-12 00:33:12,926 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-12 00:33:12,932 [ scc.git] DEBUG HEAD is now at ee4b0ba Merge pull request #278 from ome/dependabot/submodules/omero-py-53a327b
2024-05-12 00:33:12,933 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-12 00:33:12,990 [ scc.git] DEBUG Check current status
2024-05-12 00:33:12,990 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-12 00:33:12,994 [ scc.git] DEBUG ee4b0ba Merge pull request #278 from ome/dependabot/submodules/omero-py-53a327b
2024-05-12 00:33:12,994 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-12 00:33:13,034 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-05-12 00:33:13,037 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-12 00:33:13,040 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-12 00:33:13,043 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-12 00:33:13,047 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-12 00:33:13,048 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-12 00:33:13,048 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-12 00:33:13,048 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-12 00:33:13,049 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-12 00:33:13,049 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-12 00:33:13,049 [ scc.repo] DEBUG ## PRs found:
2024-05-12 00:33:13,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-05-12 00:33:13,358 [ scc.repo] DEBUG ## Branches found:
2024-05-12 00:33:13,358 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:33:13,358 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:13,362 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-12 00:33:13,367 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-12 00:33:13,367 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-12 00:33:13,371 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-12 00:33:13,376 [ scc.git] DEBUG Already up to date.
2024-05-12 00:33:13,376 [ scc.git] DEBUG ## Unique users: []
2024-05-12 00:33:13,376 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:33:13,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:13,381 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-12 00:33:13,425 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:33:13,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:13,429 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-12 00:33:13,592 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1fd8ab7460> has no local changes
2024-05-12 00:33:13,593 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/59/)'
2024-05-12 00:33:13,620 [ scc.git] DEBUG [detached HEAD bc8f63d] merge master -Dorg -Snone
2024-05-12 00:33:13,620 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-12 00:33:13,620 [ scc.merge] INFO Already up to date.
2024-05-12 00:33:13,620 [ scc.merge] INFO
2024-05-12 00:33:13,620 [ scc.merge] INFO
2024-05-12 00:33:13,620 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-12 00:33:13,620 [ 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-05-12 00:33:16,025 [ scc.config] DEBUG Found github.token
2024-05-12 00:33:16,028 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-12 00:33:16,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:33:16,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:33:17,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-12 00:33:17,054 [ scc.gh] DEBUG 3952 remaining from 5000 (Reset at 01:05
2024-05-12 00:33:17,054 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-12 00:33:17,059 [ scc.git] DEBUG Check current status
2024-05-12 00:33:17,059 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-12 00:33:17,063 [ scc.git] DEBUG bc8f63d merge master -Dorg -Snone
2024-05-12 00:33:17,063 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-12 00:33:17,107 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-05-12 00:33:17,110 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-12 00:33:17,113 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-12 00:33:17,117 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-12 00:33:17,120 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-12 00:33:17,125 [ scc.config] DEBUG Found remote.origin.url
2024-05-12 00:33:17,125 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-05-12 00:33:17,127 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-05-12 00:33:17,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-12 00:33:18,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-12 00:33:18,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-12 00:33:18,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-12 00:33:19,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-12 00:33:19,230 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-12 00:33:19,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-12 00:33:19,279 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-12 00:33:19,284 [ scc.git] DEBUG Check current status
2024-05-12 00:33:19,284 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-12 00:33:19,290 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-05-12 00:33:19,290 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-12 00:33:19,337 [ scc.config] DEBUG Found remote.origin.url
2024-05-12 00:33:19,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-05-12 00:33:20,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-12 00:33:20,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-12 00:33:20,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-12 00:33:21,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-12 00:33:21,416 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-12 00:33:21,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:33:21,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-12 00:33:21,458 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-12 00:33:21,462 [ scc.git] DEBUG Check current status
2024-05-12 00:33:21,462 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-12 00:33:21,466 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-05-12 00:33:21,466 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-12 00:33:21,508 [ scc.config] DEBUG Found remote.origin.url
2024-05-12 00:33:21,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-05-12 00:33:22,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-12 00:33:22,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-12 00:33:23,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-12 00:33:23,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-12 00:33:23,616 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-12 00:33:23,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:33:23,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-12 00:33:23,658 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-12 00:33:23,662 [ scc.git] DEBUG Check current status
2024-05-12 00:33:23,662 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-12 00:33:23,696 [ scc.git] DEBUG 53a327b8 Merge pull request #407 from jburel/install_conda_forge
2024-05-12 00:33:23,696 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-12 00:33:23,742 [ scc.config] DEBUG Found remote.origin.url
2024-05-12 00:33:24,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-05-12 00:33:24,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-12 00:33:24,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-12 00:33:25,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-12 00:33:25,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-12 00:33:25,815 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-12 00:33:25,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:33:25,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-12 00:33:25,858 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-12 00:33:25,862 [ scc.git] DEBUG Check current status
2024-05-12 00:33:25,862 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-12 00:33:25,876 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-12 00:33:25,876 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-12 00:33:25,923 [ scc.config] DEBUG Found remote.origin.url
2024-05-12 00:33:25,923 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-05-12 00:33:26,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-05-12 00:33:26,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-12 00:33:27,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-12 00:33:27,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-12 00:33:27,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-12 00:33:27,969 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-12 00:33:28,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:33:28,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-12 00:33:28,015 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-12 00:33:28,019 [ scc.git] DEBUG Check current status
2024-05-12 00:33:28,019 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-12 00:33:28,037 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-05-12 00:33:28,037 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-12 00:33:28,083 [ scc.config] DEBUG Found remote.origin.url
2024-05-12 00:33:28,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-05-12 00:33:28,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-12 00:33:29,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-12 00:33:29,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-12 00:33:30,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-12 00:33:30,178 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-12 00:33:30,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:33:30,222 [ scc.git] DEBUG Resetting...
2024-05-12 00:33:30,222 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-12 00:33:30,228 [ scc.git] DEBUG HEAD is now at bc8f63d merge master -Dorg -Snone
2024-05-12 00:33:30,229 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-12 00:33:30,300 [ scc.git] DEBUG Check current status
2024-05-12 00:33:30,300 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-12 00:33:30,304 [ scc.git] DEBUG bc8f63d merge master -Dorg -Snone
2024-05-12 00:33:30,304 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-12 00:33:30,347 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-05-12 00:33:30,350 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-12 00:33:30,353 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-12 00:33:30,357 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-12 00:33:30,361 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-12 00:33:30,362 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-12 00:33:30,362 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-12 00:33:30,362 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-12 00:33:30,362 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-12 00:33:30,362 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-12 00:33:30,362 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-05-12 00:33:30,363 [ scc.repo] DEBUG ## PRs found:
2024-05-12 00:33:30,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-05-12 00:33:30,593 [ scc.repo] DEBUG ## Branches found:
2024-05-12 00:33:30,593 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:33:30,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:30,598 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-12 00:33:30,602 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-12 00:33:30,603 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-12 00:33:30,607 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-12 00:33:30,611 [ scc.git] DEBUG Already up to date.
2024-05-12 00:33:30,611 [ scc.git] DEBUG ## Unique users: []
2024-05-12 00:33:30,611 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:33:30,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:30,615 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-12 00:33:30,659 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:33:30,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:30,663 [ scc.repo] DEBUG ## PRs found:
2024-05-12 00:33:31,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-05-12 00:33:31,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-05-12 00:33:32,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-05-12 00:33:32,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-12 00:33:33,028 [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-12 00:33:33,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-12 00:33:33,893 [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-12 00:33:33,893 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-12 00:33:33,894 [ scc.repo] DEBUG ## Branches found:
2024-05-12 00:33:33,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-12 00:33:33,894 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:33:33,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:33,898 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-12 00:33:33,902 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-12 00:33:33,903 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-12 00:33:33,907 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-12 00:33:33,911 [ scc.git] DEBUG Already up to date.
2024-05-12 00:33:33,911 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-05-12 00:33:34,317 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-12 00:33:34,317 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-05-12 00:33:34,322 [ scc.git] DEBUG ## Unique users: []
2024-05-12 00:33:34,322 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:33:34,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:34,326 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-05-12 00:33:34,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:34,336 [ 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-12 00:33:34,462 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-05-12 00:33:34,462 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-05-12 00:33:34,462 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-05-12 00:33:34,462 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-05-12 00:33:34,462 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-05-12 00:33:34,462 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-05-12 00:33:34,462 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-05-12 00:33:34,462 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-05-12 00:33:34,462 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-05-12 00:33:34,462 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:33:34,466 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-05-12 00:33:34,466 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-05-12 00:33:34,466 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-05-12 00:33:34,466 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-05-12 00:33:34,466 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-05-12 00:33:34,466 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-05-12 00:33:34,466 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-05-12 00:33:34,466 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-05-12 00:33:34,466 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-05-12 00:33:34,466 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-05-12 00:33:34,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:33:34,632 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-12 00:33:34,669 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:33:34,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:34,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-12 00:33:34,712 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-12 00:33:34,718 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc9a3183c10> has no local changes
2024-05-12 00:33:34,718 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/59/)'
2024-05-12 00:33:34,737 [ scc.git] DEBUG [detached HEAD 405de47] merge master -Dorg -Ssuccess-only
2024-05-12 00:33:34,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:33:34,738 [ scc.repo] DEBUG ## PRs found:
2024-05-12 00:33:35,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-05-12 00:33:35,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-05-12 00:33:36,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-05-12 00:33:36,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-12 00:33:36,975 [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-12 00:33:37,416 [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-12 00:33:37,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-12 00:33:38,273 [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-12 00:33:38,274 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-12 00:33:38,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-05-12 00:33:39,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-05-12 00:33:39,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-05-12 00:33:40,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-05-12 00:33:40,130 [ scc.repo] DEBUG ## Branches found:
2024-05-12 00:33:40,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-12 00:33:40,130 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:33:40,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:40,135 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-12 00:33:40,139 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-12 00:33:40,139 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-12 00:33:40,143 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-12 00:33:40,147 [ scc.git] DEBUG Already up to date.
2024-05-12 00:33:40,147 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-05-12 00:33:40,581 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-05-12 00:33:40,581 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-05-12 00:33:40,585 [ scc.git] DEBUG ## Unique users: []
2024-05-12 00:33:40,585 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:33:40,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:40,590 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-12 00:33:40,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:40,599 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-12 00:33:40,610 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-05-12 00:33:40,611 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:33:40,614 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-05-12 00:33:40,614 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-05-12 00:33:40,614 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-05-12 00:33:40,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:33:40,767 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-12 00:33:40,811 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:33:40,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:33:40,816 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-12 00:33:40,857 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-12 00:33:40,863 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc9a311e0d0> has no local changes
2024-05-12 00:33:40,864 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/59/)'
2024-05-12 00:33:40,872 [ scc.git] DEBUG [detached HEAD 61bd912] merge master -Dorg -Ssuccess-only
2024-05-12 00:33:40,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:33:40,873 [ scc.repo] DEBUG ## PRs found:
2024-05-12 00:33:41,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-05-12 00:33:41,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-05-12 00:33:42,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-05-12 00:33:42,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-12 00:33:43,331 [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-12 00:33:43,798 [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-12 00:33:44,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-12 00:33:44,650 [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-12 00:33:45,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-12 00:33:45,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-05-12 00:33:45,514 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-05-12 00:33:45,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-05-12 00:33:46,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-05-12 00:33:46,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-05-12 00:33:47,386 [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-12 00:33:47,840 [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-12 00:33:48,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-05-12 00:33:48,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-12 00:33:49,249 [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-12 00:33:49,747 [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-12 00:33:50,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-12 00:33:50,591 [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-12 00:33:51,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-12 00:33:51,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-05-12 00:33:51,493 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-05-12 00:33:51,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-05-12 00:33:51,951 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-05-12 00:33:52,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-05-12 00:33:52,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-05-12 00:33:53,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-05-12 00:33:53,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-05-12 00:33:54,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-12 00:33:54,688 [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-12 00:33:55,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-12 00:33:55,583 [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-12 00:33:55,584 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-12 00:33:56,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-05-12 00:33:56,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-05-12 00:33:56,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-12 00:33:57,457 [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-12 00:33:57,942 [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-12 00:33:58,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-12 00:33:58,805 [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-12 00:33:59,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-12 00:33:59,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-05-12 00:33:59,701 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-05-12 00:34:00,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-05-12 00:34:00,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-05-12 00:34:01,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-05-12 00:34:01,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-05-12 00:34:02,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-12 00:34:02,465 [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-12 00:34:02,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-12 00:34:03,353 [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-12 00:34:03,354 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-12 00:34:03,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-05-12 00:34:04,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-12 00:34:04,776 [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-12 00:34:05,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-12 00:34:05,668 [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-12 00:34:05,669 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-12 00:34:06,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-05-12 00:34:06,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-05-12 00:34:07,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-12 00:34:07,523 [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-12 00:34:08,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-12 00:34:08,453 [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-12 00:34:08,454 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-12 00:34:08,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-05-12 00:34:09,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-05-12 00:34:09,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-12 00:34:10,298 [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-12 00:34:10,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-12 00:34:11,218 [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-12 00:34:11,219 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-05-12 00:34:11,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-05-12 00:34:12,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-05-12 00:34:12,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-05-12 00:34:13,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-05-12 00:34:13,084 [ scc.repo] DEBUG ## Branches found:
2024-05-12 00:34:13,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-12 00:34:13,084 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:34:13,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:13,089 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-12 00:34:13,093 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-12 00:34:13,094 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-12 00:34:13,099 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-12 00:34:13,105 [ scc.git] DEBUG Already up to date.
2024-05-12 00:34:13,106 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-05-12 00:34:13,691 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-12 00:34:13,691 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-05-12 00:34:13,696 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-05-12 00:34:14,109 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-12 00:34:14,109 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-05-12 00:34:14,114 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-05-12 00:34:14,512 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-12 00:34:14,512 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-05-12 00:34:14,517 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-05-12 00:34:14,886 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-12 00:34:14,886 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-05-12 00:34:14,891 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-05-12 00:34:15,269 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-12 00:34:15,270 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-05-12 00:34:15,276 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-05-12 00:34:15,671 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-12 00:34:15,671 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-05-12 00:34:15,676 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-05-12 00:34:16,085 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-12 00:34:16,085 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-05-12 00:34:16,099 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-05-12 00:34:16,480 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-12 00:34:16,480 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-05-12 00:34:16,487 [ scc.git] DEBUG ## Unique users: []
2024-05-12 00:34:16,487 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:34:16,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:16,492 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-12 00:34:16,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:16,508 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-12 00:34:16,542 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-05-12 00:34:16,542 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-05-12 00:34:16,543 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:34:16,548 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-05-12 00:34:16,548 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-05-12 00:34:16,548 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-05-12 00:34:16,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:34:16,719 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-12 00:34:16,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:16,735 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-12 00:34:16,872 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-12 00:34:16,872 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-05-12 00:34:16,873 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:34:16,884 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-05-12 00:34:16,884 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-05-12 00:34:16,884 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-05-12 00:34:17,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:34:17,146 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-05-12 00:34:17,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:17,163 [ 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-12 00:34:17,227 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-05-12 00:34:17,228 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:34:17,231 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-05-12 00:34:17,231 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-05-12 00:34:17,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:34:17,564 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-05-12 00:34:17,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:17,580 [ 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-12 00:34:17,599 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-05-12 00:34:17,600 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-05-12 00:34:17,601 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:34:17,605 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-05-12 00:34:17,605 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-05-12 00:34:17,605 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-05-12 00:34:17,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:34:17,966 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-12 00:34:17,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:17,984 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-12 00:34:18,031 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:34:18,035 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-05-12 00:34:18,035 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-05-12 00:34:18,035 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-05-12 00:34:18,035 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-05-12 00:34:18,035 [ scc.git] DEBUG create mode 100644 connect.py
2024-05-12 00:34:18,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:34:18,375 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-05-12 00:34:18,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:18,392 [ 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-12 00:34:18,419 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-05-12 00:34:18,420 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:34:18,424 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-05-12 00:34:18,424 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-12 00:34:18,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:34:18,784 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-05-12 00:34:18,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:18,801 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-05-12 00:34:18,822 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-05-12 00:34:18,825 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:34:18,829 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-05-12 00:34:18,829 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-05-12 00:34:19,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:34:19,187 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-12 00:34:19,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:19,203 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-12 00:34:19,257 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-12 00:34:19,259 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:34:19,268 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-05-12 00:34:19,268 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-05-12 00:34:19,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:34:19,593 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-12 00:34:19,645 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:34:19,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:19,650 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-12 00:34:19,697 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-12 00:34:19,707 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc9a20c18b0> has no local changes
2024-05-12 00:34:19,708 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/59/)'
2024-05-12 00:34:19,720 [ scc.git] DEBUG [detached HEAD beca9127] merge master -Dorg -Ssuccess-only
2024-05-12 00:34:19,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:34:19,721 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-12 00:34:19,721 [ scc.repo] DEBUG ## PRs found:
2024-05-12 00:34:20,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-12 00:34:20,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-12 00:34:21,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-12 00:34:21,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-12 00:34:22,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-12 00:34:22,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-12 00:34:22,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-12 00:34:23,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-12 00:34:23,889 [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-12 00:34:24,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-12 00:34:24,748 [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-12 00:34:24,749 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-12 00:34:25,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-12 00:34:25,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-12 00:34:26,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-12 00:34:26,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-12 00:34:26,678 [ scc.repo] DEBUG ## Branches found:
2024-05-12 00:34:26,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-12 00:34:26,678 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:34:26,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:26,683 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-12 00:34:26,688 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-12 00:34:26,688 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-12 00:34:26,694 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-12 00:34:26,699 [ scc.git] DEBUG Already up to date.
2024-05-12 00:34:26,699 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-12 00:34:27,140 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-05-12 00:34:27,140 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-12 00:34:27,146 [ scc.git] DEBUG ## Unique users: []
2024-05-12 00:34:27,146 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:34:27,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:27,150 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-12 00:34:27,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:27,162 [ 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-12 00:34:27,208 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-12 00:34:27,208 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-12 00:34:27,208 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-12 00:34:27,209 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-12 00:34:27,214 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-12 00:34:27,221 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-12 00:34:27,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:34:27,368 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-12 00:34:27,375 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-12 00:34:27,380 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#59](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/59/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/59/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-12 00:34:27,385 [ scc.config] DEBUG Found github.token
2024-05-12 00:34:27,385 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-12 00:34:27,386 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-12 00:34:27,440 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:34:27,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:27,445 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-12 00:34:27,487 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-12 00:34:27,493 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc9a20a8640> has no local changes
2024-05-12 00:34:27,494 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/59/)'
2024-05-12 00:34:27,502 [ scc.git] DEBUG [detached HEAD 25afbf7] merge master -Dorg -Ssuccess-only
2024-05-12 00:34:27,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:34:27,502 [ scc.repo] DEBUG ## PRs found:
2024-05-12 00:34:28,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-05-12 00:34:28,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/553 HTTP/1.1" 200 None
2024-05-12 00:34:28,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None
2024-05-12 00:34:29,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None
2024-05-12 00:34:29,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6 HTTP/1.1" 200 None
2024-05-12 00:34:30,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-12 00:34:30,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-12 00:34:31,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6 HTTP/1.1" 200 None
2024-05-12 00:34:31,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/cdfac8b370264c2875799e26a2c49f31482124e6?per_page=1 HTTP/1.1" 200 None
2024-05-12 00:34:32,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6 HTTP/1.1" 200 None
2024-05-12 00:34:32,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6/status HTTP/1.1" 200 None
2024-05-12 00:34:32,544 [ scc.repo] DEBUG - PR 549 knabar 'Remove webgateway cache'
2024-05-12 00:34:32,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None
2024-05-12 00:34:33,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None
2024-05-12 00:34:33,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-12 00:34:34,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-12 00:34:34,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-12 00:34:35,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-12 00:34:35,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4?per_page=1 HTTP/1.1" 200 None
2024-05-12 00:34:36,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-12 00:34:36,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None
2024-05-12 00:34:36,578 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks'
2024-05-12 00:34:37,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None
2024-05-12 00:34:37,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None
2024-05-12 00:34:37,537 [ scc.repo] DEBUG # ... Include label: include
2024-05-12 00:34:38,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-12 00:34:38,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-12 00:34:38,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-12 00:34:39,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-12 00:34:39,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/977f7b65169e6dee479197a9156993bbadd2d2e2?per_page=1 HTTP/1.1" 200 None
2024-05-12 00:34:40,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-12 00:34:40,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None
2024-05-12 00:34:40,702 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-12 00:34:41,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-05-12 00:34:41,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-05-12 00:34:42,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-05-12 00:34:42,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-12 00:34:43,021 [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-12 00:34:43,529 [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-12 00:34:43,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-12 00:34:44,382 [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-12 00:34:44,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-12 00:34:45,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-05-12 00:34:45,347 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-12 00:34:45,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None
2024-05-12 00:34:46,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533/comments HTTP/1.1" 200 None
2024-05-12 00:34:46,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945 HTTP/1.1" 200 None
2024-05-12 00:34:47,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-12 00:34:47,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-12 00:34:48,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945 HTTP/1.1" 200 None
2024-05-12 00:34:48,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/9a13dceec34523f81d5b6059c98b5ed05cada945?per_page=1 HTTP/1.1" 200 None
2024-05-12 00:34:49,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945 HTTP/1.1" 200 None
2024-05-12 00:34:49,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945/status HTTP/1.1" 200 None
2024-05-12 00:34:49,455 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel'
2024-05-12 00:34:49,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-05-12 00:34:50,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-05-12 00:34:50,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-12 00:34:51,412 [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-12 00:34:51,882 [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-12 00:34:52,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-12 00:34:52,747 [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-12 00:34:53,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-12 00:34:53,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-05-12 00:34:53,630 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-12 00:34:54,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-05-12 00:34:54,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-05-12 00:34:55,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-05-12 00:34:55,519 [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-12 00:34:55,986 [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-12 00:34:55,989 [ scc.repo] DEBUG ## Branches found:
2024-05-12 00:34:55,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-12 00:34:55,989 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:34:55,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:55,994 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-12 00:34:55,999 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-12 00:34:55,999 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-12 00:34:56,004 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-12 00:34:56,010 [ scc.git] DEBUG Already up to date.
2024-05-12 00:34:56,010 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-05-12 00:34:56,422 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-12 00:34:56,423 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-05-12 00:34:56,428 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head'
2024-05-12 00:34:56,881 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-12 00:34:56,882 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD
2024-05-12 00:34:56,887 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-05-12 00:34:57,271 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-12 00:34:57,272 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-05-12 00:34:57,277 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head'
2024-05-12 00:34:57,677 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-12 00:34:57,677 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD
2024-05-12 00:34:57,683 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head'
2024-05-12 00:34:58,114 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-12 00:34:58,114 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD
2024-05-12 00:34:58,119 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-12 00:34:58,669 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-12 00:34:58,670 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-12 00:34:58,677 [ scc.git] DEBUG ## Unique users: []
2024-05-12 00:34:58,677 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:34:58,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:58,682 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-05-12 00:34:58,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:58,692 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-05-12 00:34:58,735 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-05-12 00:34:58,735 [ scc.git] DEBUG Auto-merging setup.py
2024-05-12 00:34:58,737 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:34:58,741 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-05-12 00:34:58,741 [ scc.git] DEBUG setup.py | 1 +
2024-05-12 00:34:58,741 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-05-12 00:34:58,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:34:58,894 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9a13dceec34523f81d5b6059c98b5ed05cada945'
2024-05-12 00:34:58,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:58,914 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) 9a13dceec34523f81d5b6059c98b5ed05cada945'
2024-05-12 00:34:58,989 [ scc.git] DEBUG Auto-merging README.rst
2024-05-12 00:34:58,993 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:34:58,999 [ scc.git] DEBUG README.rst | 5 ++---
2024-05-12 00:34:59,000 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 3 deletions(-)
2024-05-12 00:34:59,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:34:59,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-05-12 00:34:59,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:59,319 [ 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-12 00:34:59,351 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-05-12 00:34:59,351 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-05-12 00:34:59,352 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:34:59,356 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-05-12 00:34:59,356 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-05-12 00:34:59,356 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-05-12 00:34:59,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:34:59,718 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-05-12 00:34:59,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:34:59,730 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-05-12 00:34:59,934 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-05-12 00:34:59,935 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:34:59,943 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++-------
2024-05-12 00:34:59,943 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++----
2024-05-12 00:34:59,943 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++
2024-05-12 00:34:59,943 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++---
2024-05-12 00:34:59,943 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++-----
2024-05-12 00:34:59,943 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +-
2024-05-12 00:34:59,943 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++--
2024-05-12 00:34:59,943 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-)
2024-05-12 00:35:00,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:35:00,129 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-05-12 00:35:00,136 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:35:00,141 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 543 (Block UI for some long running tasks) 8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-05-12 00:35:00,254 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html
2024-05-12 00:35:00,256 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:35:00,262 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++
2024-05-12 00:35:00,262 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++-----
2024-05-12 00:35:00,262 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++---
2024-05-12 00:35:00,262 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 +
2024-05-12 00:35:00,262 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +-
2024-05-12 00:35:00,262 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +-
2024-05-12 00:35:00,262 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 ---------------------
2024-05-12 00:35:00,262 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 -
2024-05-12 00:35:00,262 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++--
2024-05-12 00:35:00,262 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-)
2024-05-12 00:35:00,262 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js
2024-05-12 00:35:00,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:35:00,537 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cdfac8b370264c2875799e26a2c49f31482124e6'
2024-05-12 00:35:00,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:35:00,551 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Remove webgateway cache) cdfac8b370264c2875799e26a2c49f31482124e6'
2024-05-12 00:35:00,616 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-05-12 00:35:00,616 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py
2024-05-12 00:35:00,617 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-12 00:35:00,624 [ scc.git] DEBUG omeroweb/settings.py | 1 -
2024-05-12 00:35:00,624 [ scc.git] DEBUG omeroweb/webgateway/views.py | 118 +---
2024-05-12 00:35:00,624 [ scc.git] DEBUG omeroweb/webgateway/webgateway_cache.py | 1043 ----------------------------
2024-05-12 00:35:00,624 [ scc.git] DEBUG omeroweb/webgateway/webgateway_tempfile.py | 200 ++++++
2024-05-12 00:35:00,624 [ scc.git] DEBUG test/unit/test_webgateway.py | 271 +-------
2024-05-12 00:35:00,625 [ scc.git] DEBUG 5 files changed, 231 insertions(+), 1402 deletions(-)
2024-05-12 00:35:00,625 [ scc.git] DEBUG delete mode 100644 omeroweb/webgateway/webgateway_cache.py
2024-05-12 00:35:00,625 [ scc.git] DEBUG create mode 100644 omeroweb/webgateway/webgateway_tempfile.py
2024-05-12 00:35:00,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:35:00,945 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-12 00:35:00,988 [ scc.git] DEBUG Get sha1 of %s
2024-05-12 00:35:00,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-12 00:35:00,993 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-12 00:35:01,034 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-12 00:35:01,045 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc9a20d4910> has no local changes
2024-05-12 00:35:01,045 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- 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'
Generated by OMERO-python-superbuild-push#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/59/)'
2024-05-12 00:35:01,057 [ scc.git] DEBUG [detached HEAD 628e23803] merge master -Dorg -Ssuccess-only
2024-05-12 00:35:01,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:35:01,057 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-12 00:35:01,109 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-05-12 00:35:01,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:35:01,371 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-05-12 00:35:01,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:35:01,790 [ scc.config] DEBUG Found submodule.omero-py.url
2024-05-12 00:35:02,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:35:02,199 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-05-12 00:35:02,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:35:02,621 [ scc.config] DEBUG Found submodule.omero-web.url
2024-05-12 00:35:03,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-12 00:35:03,033 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-12 00:35:03,066 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc9a5542460> has local changes
2024-05-12 00:35:03,066 [ 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 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- 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'
Generated by OMERO-python-superbuild-push#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/59/)'
2024-05-12 00:35:03,079 [ scc.git] DEBUG [detached HEAD 18c1b12] merge master -Dorg -Ssuccess-only
2024-05-12 00:35:03,079 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-12 00:35:03,079 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-05-12 00:35:03,080 [ scc.merge] INFO Already up to date.
2024-05-12 00:35:03,080 [ scc.merge] INFO
2024-05-12 00:35:03,080 [ scc.merge] INFO
2024-05-12 00:35:03,080 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-05-12 00:35:03,080 [ scc.merge] INFO Already up to date.
2024-05-12 00:35:03,080 [ scc.merge] INFO
2024-05-12 00:35:03,080 [ scc.merge] INFO Merged PRs:
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-12 00:35:03,080 [ scc.merge] INFO
2024-05-12 00:35:03,080 [ scc.merge] INFO Repository: ome/omero-marshal
2024-05-12 00:35:03,080 [ scc.merge] INFO Excluded PRs:
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-05-12 00:35:03,080 [ scc.merge] INFO Already up to date.
2024-05-12 00:35:03,080 [ scc.merge] INFO
2024-05-12 00:35:03,080 [ scc.merge] INFO Merged PRs:
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-12 00:35:03,080 [ scc.merge] INFO
2024-05-12 00:35:03,080 [ scc.merge] INFO Repository: ome/omero-py
2024-05-12 00:35:03,080 [ scc.merge] INFO Excluded PRs:
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-05-12 00:35:03,080 [ scc.merge] INFO Already up to date.
2024-05-12 00:35:03,080 [ scc.merge] INFO
2024-05-12 00:35:03,080 [ scc.merge] INFO Merged PRs:
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-12 00:35:03,080 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-05-12 00:35:03,081 [ scc.merge] INFO
2024-05-12 00:35:03,081 [ scc.merge] INFO Repository: ome/omero-scripts
2024-05-12 00:35:03,081 [ scc.merge] INFO Excluded PRs:
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-12 00:35:03,081 [ scc.merge] INFO Already up to date.
2024-05-12 00:35:03,081 [ scc.merge] INFO
2024-05-12 00:35:03,081 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-12 00:35:03,081 [ scc.merge] INFO
2024-05-12 00:35:03,081 [ scc.merge] INFO Repository: ome/omero-web
2024-05-12 00:35:03,081 [ scc.merge] INFO Excluded PRs:
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-05-12 00:35:03,081 [ scc.merge] INFO Already up to date.
2024-05-12 00:35:03,081 [ scc.merge] INFO
2024-05-12 00:35:03,081 [ scc.merge] INFO Merged PRs:
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks'
2024-05-12 00:35:03,081 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache'
2024-05-12 00:35:03,081 [ scc.merge] INFO
2024-05-12 00:35:03,081 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-12 00:35:03,082 [ scc.git] DEBUG Calling 'git remote'
2024-05-12 00:35:03,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-12 00:35:03,086 [ scc.git] DEBUG Calling 'git remote'
2024-05-12 00:35:03,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:35:03,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-12 00:35:03,090 [ scc.git] DEBUG Calling 'git remote'
2024-05-12 00:35:03,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:35:03,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-12 00:35:03,095 [ scc.git] DEBUG Calling 'git remote'
2024-05-12 00:35:03,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:35:03,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-12 00:35:03,100 [ scc.git] DEBUG Calling 'git remote'
2024-05-12 00:35:03,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-12 00:35:03,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-12 00:35:03,105 [ scc.git] DEBUG Calling 'git remote'
2024-05-12 00:35:03,110 [ 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-12 00:35:32,606 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/9ed1fe1f/images/svgs/logo.svg){kind=logo}
