Console Output
+ export BASE_REPO=omero-python-superbuild.git
+ BASE_REPO=omero-python-superbuild.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-07-14 00:32:42,624 [ scc.config] DEBUG Found github.token
2024-07-14 00:32:42,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-14 00:32:42,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:32:43,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:32:43,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-14 00:32:43,653 [ scc.gh] DEBUG 4998 remaining from 5000 (Reset at 01:07
2024-07-14 00:32:43,654 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-14 00:32:43,658 [ scc.git] DEBUG Check current status
2024-07-14 00:32:43,658 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-14 00:32:43,662 [ scc.git] DEBUG 2f19665 Merge pull request #286 from ome/dependabot/submodules/omero-py-2891df1
2024-07-14 00:32:43,663 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-14 00:32:43,709 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-14 00:32:43,712 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-14 00:32:43,804 [ scc.git] DEBUG 2891df1bfebe0e9878a0c9f7ff84509d5b7d7093 omero-py (v5.19.3-11-g2891df1b)
2024-07-14 00:32:43,808 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-14 00:32:43,856 [ scc.git] DEBUG 5a2cd79d7cb7847d560e98f1d11240794e7be47f omero-web (v5.26.0-3-g5a2cd79d7)
2024-07-14 00:32:43,862 [ scc.config] DEBUG Found remote.origin.url
2024-07-14 00:32:44,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-14 00:32:44,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-14 00:32:45,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-14 00:32:45,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-14 00:32:45,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-14 00:32:45,837 [ scc.git] DEBUG Resetting...
2024-07-14 00:32:45,837 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-14 00:32:45,843 [ scc.git] DEBUG HEAD is now at 2f19665 Merge pull request #286 from ome/dependabot/submodules/omero-py-2891df1
2024-07-14 00:32:45,843 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-14 00:32:45,903 [ scc.git] DEBUG Check current status
2024-07-14 00:32:45,903 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-14 00:32:45,908 [ scc.git] DEBUG 2f19665 Merge pull request #286 from ome/dependabot/submodules/omero-py-2891df1
2024-07-14 00:32:45,908 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-14 00:32:45,955 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-14 00:32:45,958 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-14 00:32:45,962 [ scc.git] DEBUG 2891df1bfebe0e9878a0c9f7ff84509d5b7d7093 omero-py (v5.19.3-11-g2891df1b)
2024-07-14 00:32:45,967 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-14 00:32:45,971 [ scc.git] DEBUG 5a2cd79d7cb7847d560e98f1d11240794e7be47f omero-web (v5.26.0-3-g5a2cd79d7)
2024-07-14 00:32:45,972 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-14 00:32:45,972 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-14 00:32:45,972 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-14 00:32:45,972 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-14 00:32:45,972 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-14 00:32:45,972 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:32:46,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-14 00:32:46,258 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:32:46,258 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:32:46,258 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:32:46,262 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:32:46,266 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:32:46,267 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:32:46,271 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:32:46,276 [ scc.git] DEBUG Already up to date.
2024-07-14 00:32:46,276 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:32:46,276 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:32:46,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:32:46,281 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:32:46,325 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:32:46,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:32:46,330 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:32:46,533 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd1073eda00> has no local changes
2024-07-14 00:32:46,533 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/115/)'
2024-07-14 00:32:46,563 [ scc.git] DEBUG [detached HEAD bbab7e2] merge master -Dorg -Snone
2024-07-14 00:32:46,563 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-14 00:32:46,563 [ scc.merge] INFO Already up to date.
2024-07-14 00:32:46,563 [ scc.merge] INFO
2024-07-14 00:32:46,563 [ scc.merge] INFO
2024-07-14 00:32:46,563 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-14 00:32:46,564 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-14 00:32:49,127 [ scc.config] DEBUG Found github.token
2024-07-14 00:32:49,129 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-14 00:32:49,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:32:49,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:32:50,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-14 00:32:50,141 [ scc.gh] DEBUG 4990 remaining from 5000 (Reset at 01:07
2024-07-14 00:32:50,142 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-14 00:32:50,147 [ scc.git] DEBUG Check current status
2024-07-14 00:32:50,148 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-14 00:32:50,151 [ scc.git] DEBUG bbab7e2 merge master -Dorg -Snone
2024-07-14 00:32:50,151 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-14 00:32:50,188 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-14 00:32:50,191 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-14 00:32:50,195 [ scc.git] DEBUG 2891df1bfebe0e9878a0c9f7ff84509d5b7d7093 omero-py (v5.19.3-11-g2891df1b)
2024-07-14 00:32:50,198 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-14 00:32:50,201 [ scc.git] DEBUG 5a2cd79d7cb7847d560e98f1d11240794e7be47f omero-web (v5.26.0-3-g5a2cd79d7)
2024-07-14 00:32:50,205 [ scc.config] DEBUG Found remote.origin.url
2024-07-14 00:32:50,206 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-07-14 00:32:50,207 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-14 00:32:50,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-14 00:32:51,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-14 00:32:51,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-14 00:32:51,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-14 00:32:52,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-14 00:32:52,377 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:32:52,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-14 00:32:52,439 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-14 00:32:52,445 [ scc.git] DEBUG Check current status
2024-07-14 00:32:52,445 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-14 00:32:52,450 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-07-14 00:32:52,450 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-14 00:32:52,498 [ scc.config] DEBUG Found remote.origin.url
2024-07-14 00:32:52,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-07-14 00:32:53,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-14 00:32:53,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-14 00:32:54,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-14 00:32:54,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-14 00:32:54,618 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:32:54,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:32:54,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-14 00:32:54,662 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-14 00:32:54,667 [ scc.git] DEBUG Check current status
2024-07-14 00:32:54,667 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-14 00:32:54,672 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-07-14 00:32:54,673 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-14 00:32:54,720 [ scc.config] DEBUG Found remote.origin.url
2024-07-14 00:32:55,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-07-14 00:32:55,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-14 00:32:56,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-14 00:32:56,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-14 00:32:56,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-14 00:32:56,904 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:32:56,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:32:56,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-14 00:32:56,964 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-14 00:32:56,969 [ scc.git] DEBUG Check current status
2024-07-14 00:32:56,969 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-14 00:32:56,978 [ scc.git] DEBUG 2891df1b Merge pull request #416 from sbesson/logging_config_parse
2024-07-14 00:32:56,978 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-14 00:32:57,026 [ scc.config] DEBUG Found remote.origin.url
2024-07-14 00:32:57,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-07-14 00:32:57,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-14 00:32:58,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-14 00:32:58,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-14 00:32:59,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-14 00:32:59,166 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:32:59,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:32:59,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-14 00:32:59,210 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-14 00:32:59,216 [ scc.git] DEBUG Check current status
2024-07-14 00:32:59,216 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-14 00:32:59,231 [ scc.git] DEBUG c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-14 00:32:59,231 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-14 00:32:59,277 [ scc.config] DEBUG Found remote.origin.url
2024-07-14 00:32:59,278 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-07-14 00:32:59,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-07-14 00:33:00,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-14 00:33:00,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-14 00:33:00,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-14 00:33:01,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-14 00:33:01,430 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:33:01,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:33:01,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-14 00:33:01,478 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-14 00:33:01,483 [ scc.git] DEBUG Check current status
2024-07-14 00:33:01,483 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-14 00:33:01,488 [ scc.git] DEBUG 5a2cd79d7 Merge pull request #561 from jburel/numpy_less_than_2
2024-07-14 00:33:01,488 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-14 00:33:01,536 [ scc.config] DEBUG Found remote.origin.url
2024-07-14 00:33:01,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-07-14 00:33:02,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-14 00:33:02,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-14 00:33:03,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-14 00:33:03,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-14 00:33:03,622 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:33:03,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:33:03,678 [ scc.git] DEBUG Resetting...
2024-07-14 00:33:03,678 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-14 00:33:03,686 [ scc.git] DEBUG HEAD is now at bbab7e2 merge master -Dorg -Snone
2024-07-14 00:33:03,686 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-14 00:33:03,756 [ scc.git] DEBUG Check current status
2024-07-14 00:33:03,756 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-14 00:33:03,763 [ scc.git] DEBUG bbab7e2 merge master -Dorg -Snone
2024-07-14 00:33:03,763 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-14 00:33:03,814 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-14 00:33:03,818 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-14 00:33:03,822 [ scc.git] DEBUG 2891df1bfebe0e9878a0c9f7ff84509d5b7d7093 omero-py (v5.19.3-11-g2891df1b)
2024-07-14 00:33:03,827 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-14 00:33:03,831 [ scc.git] DEBUG 5a2cd79d7cb7847d560e98f1d11240794e7be47f omero-web (v5.26.0-3-g5a2cd79d7)
2024-07-14 00:33:03,832 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-14 00:33:03,832 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-14 00:33:03,832 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-14 00:33:03,832 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-14 00:33:03,832 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-14 00:33:03,832 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-07-14 00:33:03,832 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:33:04,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-14 00:33:04,067 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:33:04,067 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:33:04,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:04,073 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:33:04,079 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:33:04,079 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:33:04,086 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:33:04,093 [ scc.git] DEBUG Already up to date.
2024-07-14 00:33:04,094 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:33:04,094 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:33:04,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:04,100 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:33:04,151 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:33:04,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:04,156 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:33:04,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-07-14 00:33:04,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-07-14 00:33:05,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-07-14 00:33:06,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-14 00:33:06,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:06,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-14 00:33:07,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-07-14 00:33:07,327 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-14 00:33:07,327 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:33:07,327 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-14 00:33:07,327 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:33:07,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:07,334 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:33:07,341 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:33:07,342 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:33:07,349 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:33:07,357 [ scc.git] DEBUG Already up to date.
2024-07-14 00:33:07,357 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-07-14 00:33:07,741 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-07-14 00:33:07,741 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-07-14 00:33:07,746 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:33:07,746 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:33:07,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:07,752 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-14 00:33:07,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:07,766 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-14 00:33:07,882 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-07-14 00:33:07,882 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-07-14 00:33:07,882 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-07-14 00:33:07,882 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-07-14 00:33:07,882 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-07-14 00:33:07,882 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-07-14 00:33:07,882 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-07-14 00:33:07,882 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-07-14 00:33:07,882 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-07-14 00:33:07,883 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:33:07,888 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-07-14 00:33:07,888 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-07-14 00:33:07,888 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-07-14 00:33:07,888 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-07-14 00:33:07,888 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-07-14 00:33:07,888 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-07-14 00:33:07,888 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-07-14 00:33:07,888 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-07-14 00:33:07,888 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-07-14 00:33:07,888 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-07-14 00:33:08,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:33:08,057 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:33:08,097 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:33:08,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:08,101 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:33:08,139 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:33:08,145 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4af81792e0> has no local changes
2024-07-14 00:33:08,145 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/115/)'
2024-07-14 00:33:08,153 [ scc.git] DEBUG [detached HEAD b9cdf14] merge master -Dorg -Ssuccess-only
2024-07-14 00:33:08,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:33:08,154 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:33:08,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-07-14 00:33:09,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-07-14 00:33:09,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-07-14 00:33:10,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-14 00:33:10,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:11,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-14 00:33:11,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-07-14 00:33:11,449 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-14 00:33:11,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-07-14 00:33:12,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-07-14 00:33:12,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-07-14 00:33:13,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-07-14 00:33:13,363 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:33:13,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-14 00:33:13,363 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:33:13,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:13,369 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:33:13,373 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:33:13,374 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:33:13,379 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:33:13,384 [ scc.git] DEBUG Already up to date.
2024-07-14 00:33:13,385 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-07-14 00:33:13,811 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-07-14 00:33:13,811 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-07-14 00:33:13,816 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:33:13,817 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:33:13,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:13,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-14 00:33:13,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:13,835 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-14 00:33:13,846 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-07-14 00:33:13,847 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:33:13,850 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-07-14 00:33:13,851 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-07-14 00:33:13,851 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-07-14 00:33:14,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:33:14,011 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:33:14,056 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:33:14,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:14,062 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:33:14,104 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:33:14,111 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4af81795b0> has no local changes
2024-07-14 00:33:14,111 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/115/)'
2024-07-14 00:33:14,123 [ scc.git] DEBUG [detached HEAD abc7bb9] merge master -Dorg -Ssuccess-only
2024-07-14 00:33:14,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:33:14,123 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:33:14,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-07-14 00:33:15,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-07-14 00:33:15,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-07-14 00:33:16,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-14 00:33:16,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:17,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:33:17,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-14 00:33:18,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:18,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-14 00:33:19,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-07-14 00:33:19,071 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-07-14 00:33:19,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-07-14 00:33:19,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-07-14 00:33:20,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-07-14 00:33:21,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:21,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:33:21,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-07-14 00:33:22,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-14 00:33:23,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:23,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:33:23,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-14 00:33:24,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:24,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-14 00:33:25,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-07-14 00:33:25,355 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-07-14 00:33:25,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-07-14 00:33:25,821 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-07-14 00:33:26,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-07-14 00:33:26,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-07-14 00:33:27,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-14 00:33:27,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:28,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-14 00:33:28,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-07-14 00:33:28,639 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-14 00:33:29,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-07-14 00:33:29,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-07-14 00:33:30,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-14 00:33:30,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:31,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:33:31,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-14 00:33:31,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:32,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-14 00:33:32,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-07-14 00:33:32,844 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-07-14 00:33:33,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-07-14 00:33:33,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-07-14 00:33:34,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-07-14 00:33:34,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-07-14 00:33:35,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-14 00:33:35,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:36,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-14 00:33:36,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-07-14 00:33:36,690 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-14 00:33:37,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-07-14 00:33:37,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-14 00:33:38,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:38,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-14 00:33:39,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-07-14 00:33:39,031 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-14 00:33:39,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-07-14 00:33:40,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-07-14 00:33:40,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-14 00:33:40,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:41,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-14 00:33:41,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-07-14 00:33:41,915 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-14 00:33:42,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-07-14 00:33:42,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-07-14 00:33:43,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-14 00:33:43,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:44,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-14 00:33:44,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-07-14 00:33:44,784 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-07-14 00:33:45,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-07-14 00:33:45,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-07-14 00:33:46,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-07-14 00:33:46,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-07-14 00:33:46,655 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:33:46,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-14 00:33:46,655 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:33:46,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:46,663 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:33:46,667 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:33:46,668 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:33:46,672 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:33:46,677 [ scc.git] DEBUG Already up to date.
2024-07-14 00:33:46,678 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-07-14 00:33:47,326 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-14 00:33:47,326 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-07-14 00:33:47,333 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-07-14 00:33:47,752 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-14 00:33:47,752 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-07-14 00:33:47,759 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-07-14 00:33:48,170 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-14 00:33:48,170 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-07-14 00:33:48,176 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-07-14 00:33:48,542 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-14 00:33:48,542 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-07-14 00:33:48,548 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-07-14 00:33:48,951 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-14 00:33:48,951 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-07-14 00:33:48,959 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-07-14 00:33:49,312 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-14 00:33:49,312 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-07-14 00:33:49,318 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-07-14 00:33:49,671 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-14 00:33:49,671 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-07-14 00:33:49,677 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-07-14 00:33:50,070 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-14 00:33:50,070 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-07-14 00:33:50,076 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:33:50,077 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:33:50,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:50,082 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-14 00:33:50,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:50,099 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-14 00:33:50,157 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-07-14 00:33:50,157 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-07-14 00:33:50,158 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:33:50,162 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-07-14 00:33:50,162 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-07-14 00:33:50,162 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-07-14 00:33:50,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:33:50,338 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-14 00:33:50,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:50,355 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-14 00:33:50,496 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-14 00:33:50,496 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-07-14 00:33:50,497 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:33:50,504 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-07-14 00:33:50,504 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-07-14 00:33:50,504 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-07-14 00:33:50,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:33:50,793 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-07-14 00:33:50,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:50,810 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-07-14 00:33:50,902 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-07-14 00:33:50,923 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:33:50,926 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-07-14 00:33:50,926 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-07-14 00:33:51,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:33:51,190 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-07-14 00:33:51,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:51,208 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2024-07-14 00:33:51,283 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-07-14 00:33:51,283 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-07-14 00:33:51,289 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:33:51,293 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-14 00:33:51,293 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-07-14 00:33:51,293 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-07-14 00:33:51,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:33:51,597 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-14 00:33:51,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:51,614 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-14 00:33:51,651 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:33:51,654 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-07-14 00:33:51,655 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-07-14 00:33:51,655 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-07-14 00:33:51,655 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-07-14 00:33:51,655 [ scc.git] DEBUG create mode 100644 connect.py
2024-07-14 00:33:52,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:33:52,013 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-07-14 00:33:52,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:52,030 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-07-14 00:33:52,087 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-07-14 00:33:52,088 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:33:52,092 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-07-14 00:33:52,092 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-14 00:33:52,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:33:52,408 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-07-14 00:33:52,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:52,430 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-07-14 00:33:52,503 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-07-14 00:33:52,504 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:33:52,508 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-07-14 00:33:52,508 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-07-14 00:33:52,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:33:52,824 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-14 00:33:52,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:52,842 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-14 00:33:52,909 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-14 00:33:52,919 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:33:52,927 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-07-14 00:33:52,927 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-07-14 00:33:53,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:33:53,241 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:33:53,285 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:33:53,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:33:53,294 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:33:53,335 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:33:53,345 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4af7098cd0> has no local changes
2024-07-14 00:33:53,346 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
Generated by OMERO-python-superbuild-push#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/115/)'
2024-07-14 00:33:53,356 [ scc.git] DEBUG [detached HEAD ece3f509] merge master -Dorg -Ssuccess-only
2024-07-14 00:33:53,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:33:53,357 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-14 00:33:53,357 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:33:53,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-14 00:33:54,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-14 00:33:54,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-14 00:33:55,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-14 00:33:55,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-14 00:33:56,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-14 00:33:56,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-14 00:33:57,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-14 00:33:57,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:33:58,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-14 00:33:58,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-14 00:33:58,714 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-14 00:33:59,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-14 00:33:59,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-14 00:34:00,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-14 00:34:00,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-14 00:34:00,692 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:34:00,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-14 00:34:00,692 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:34:00,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:00,698 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-14 00:34:00,702 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:34:00,703 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-14 00:34:00,707 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-14 00:34:00,712 [ scc.git] DEBUG Already up to date.
2024-07-14 00:34:00,712 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-14 00:34:01,230 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-07-14 00:34:01,230 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-14 00:34:01,235 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:34:01,235 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:34:01,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:01,243 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-14 00:34:01,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:01,257 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-14 00:34:01,305 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-14 00:34:01,305 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-14 00:34:01,305 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-14 00:34:01,306 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-14 00:34:01,311 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-14 00:34:01,316 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-14 00:34:01,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:01,482 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-14 00:34:01,489 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-14 00:34:01,495 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#115](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/115/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/115/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-14 00:34:01,501 [ scc.config] DEBUG Found github.token
2024-07-14 00:34:01,501 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-14 00:34:01,502 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:34:01,542 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:34:01,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:01,547 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:34:01,586 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:34:01,592 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4af70b1bb0> has no local changes
2024-07-14 00:34:01,593 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/115/)'
2024-07-14 00:34:01,600 [ scc.git] DEBUG [detached HEAD a493421] merge master -Dorg -Ssuccess-only
2024-07-14 00:34:01,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:34:01,601 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:34:02,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-07-14 00:34:02,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564 HTTP/1.1" 200 None
2024-07-14 00:34:03,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564/comments HTTP/1.1" 200 None
2024-07-14 00:34:03,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-14 00:34:04,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:04,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:34:05,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-14 00:34:05,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/091e5fc2d35212271ac71fd66b42c611299d6fde?per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:06,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-14 00:34:06,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/status HTTP/1.1" 200 None
2024-07-14 00:34:06,458 [ scc.repo] DEBUG - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-14 00:34:06,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/563 HTTP/1.1" 200 None
2024-07-14 00:34:07,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/563/comments HTTP/1.1" 200 None
2024-07-14 00:34:07,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/af88a0cd2aa7d15d9b0dca1ce369060284551de7 HTTP/1.1" 200 None
2024-07-14 00:34:08,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/af88a0cd2aa7d15d9b0dca1ce369060284551de7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:08,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/af88a0cd2aa7d15d9b0dca1ce369060284551de7/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:34:09,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/af88a0cd2aa7d15d9b0dca1ce369060284551de7 HTTP/1.1" 200 None
2024-07-14 00:34:09,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/af88a0cd2aa7d15d9b0dca1ce369060284551de7?per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:10,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/af88a0cd2aa7d15d9b0dca1ce369060284551de7 HTTP/1.1" 200 None
2024-07-14 00:34:10,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/af88a0cd2aa7d15d9b0dca1ce369060284551de7/status HTTP/1.1" 200 None
2024-07-14 00:34:10,692 [ scc.repo] DEBUG - PR 563 chris-allan 'Batch by MAX_TABLE_DOWNLOAD_ROWS'
2024-07-14 00:34:11,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/562 HTTP/1.1" 200 None
2024-07-14 00:34:11,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/560 HTTP/1.1" 200 None
2024-07-14 00:34:12,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/560/comments HTTP/1.1" 200 None
2024-07-14 00:34:12,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f92a4e2764982ace46474a82af4ad25bee9d8823 HTTP/1.1" 200 None
2024-07-14 00:34:13,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f92a4e2764982ace46474a82af4ad25bee9d8823/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:13,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f92a4e2764982ace46474a82af4ad25bee9d8823/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:34:14,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f92a4e2764982ace46474a82af4ad25bee9d8823 HTTP/1.1" 200 None
2024-07-14 00:34:14,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/f92a4e2764982ace46474a82af4ad25bee9d8823?per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:15,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f92a4e2764982ace46474a82af4ad25bee9d8823 HTTP/1.1" 200 None
2024-07-14 00:34:15,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f92a4e2764982ace46474a82af4ad25bee9d8823/status HTTP/1.1" 200 None
2024-07-14 00:34:15,501 [ scc.repo] DEBUG - PR 560 will-moore 'linkify supports urls that include $ character'
2024-07-14 00:34:15,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/558 HTTP/1.1" 200 None
2024-07-14 00:34:16,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/558/comments HTTP/1.1" 200 None
2024-07-14 00:34:16,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/835cfbc948305ce221d873b2a8beb5be288ca9f8 HTTP/1.1" 200 None
2024-07-14 00:34:17,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/835cfbc948305ce221d873b2a8beb5be288ca9f8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:17,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/835cfbc948305ce221d873b2a8beb5be288ca9f8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:34:18,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/835cfbc948305ce221d873b2a8beb5be288ca9f8 HTTP/1.1" 200 None
2024-07-14 00:34:18,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/835cfbc948305ce221d873b2a8beb5be288ca9f8?per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:19,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/835cfbc948305ce221d873b2a8beb5be288ca9f8 HTTP/1.1" 200 None
2024-07-14 00:34:19,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/835cfbc948305ce221d873b2a8beb5be288ca9f8/status HTTP/1.1" 200 None
2024-07-14 00:34:19,602 [ scc.repo] DEBUG - PR 558 jburel 'Update readme'
2024-07-14 00:34:20,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555 HTTP/1.1" 200 None
2024-07-14 00:34:20,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555/comments HTTP/1.1" 200 None
2024-07-14 00:34:21,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-14 00:34:21,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:22,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:34:22,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-14 00:34:22,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/97e479b717e34179eceea2507d3e69a04b2fec1e?per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:23,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-14 00:34:23,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/status HTTP/1.1" 200 None
2024-07-14 00:34:23,913 [ scc.repo] DEBUG - PR 555 chris-allan 'Archive status'
2024-07-14 00:34:24,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/554 HTTP/1.1" 200 None
2024-07-14 00:34:24,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/554/comments HTTP/1.1" 200 None
2024-07-14 00:34:25,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/79c23056136bc929e4ebd57d24600780c92921c5 HTTP/1.1" 200 None
2024-07-14 00:34:25,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/79c23056136bc929e4ebd57d24600780c92921c5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:26,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/79c23056136bc929e4ebd57d24600780c92921c5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:34:26,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/79c23056136bc929e4ebd57d24600780c92921c5 HTTP/1.1" 200 None
2024-07-14 00:34:27,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/79c23056136bc929e4ebd57d24600780c92921c5?per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:27,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/79c23056136bc929e4ebd57d24600780c92921c5 HTTP/1.1" 200 None
2024-07-14 00:34:28,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/79c23056136bc929e4ebd57d24600780c92921c5/status HTTP/1.1" 200 None
2024-07-14 00:34:28,146 [ scc.repo] DEBUG - PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query'
2024-07-14 00:34:28,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-07-14 00:34:29,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-07-14 00:34:29,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-07-14 00:34:30,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-07-14 00:34:30,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-14 00:34:30,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:31,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:34:31,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-14 00:34:32,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:33,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-14 00:34:33,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-07-14 00:34:33,483 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-14 00:34:33,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-07-14 00:34:34,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-07-14 00:34:34,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-14 00:34:35,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:35,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:34:36,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-14 00:34:36,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:37,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-14 00:34:37,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-07-14 00:34:37,907 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-14 00:34:38,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-07-14 00:34:38,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-07-14 00:34:39,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-07-14 00:34:39,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-14 00:34:40,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-14 00:34:40,384 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:34:40,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-14 00:34:40,385 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:34:40,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:40,390 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:34:40,396 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:34:40,397 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:34:40,411 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:34:40,417 [ scc.git] DEBUG Already up to date.
2024-07-14 00:34:40,418 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-07-14 00:34:41,162 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-14 00:34:41,163 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-07-14 00:34:41,168 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-07-14 00:34:41,564 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-14 00:34:41,564 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-07-14 00:34:41,569 [ scc.git] DEBUG Calling 'git fetch origin pull/554/head'
2024-07-14 00:34:42,285 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-14 00:34:42,285 [ scc.git] DEBUG * branch refs/pull/554/head -> FETCH_HEAD
2024-07-14 00:34:42,290 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-14 00:34:43,015 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-14 00:34:43,015 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-14 00:34:43,020 [ scc.git] DEBUG Calling 'git fetch origin pull/558/head'
2024-07-14 00:34:43,476 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-14 00:34:43,476 [ scc.git] DEBUG * branch refs/pull/558/head -> FETCH_HEAD
2024-07-14 00:34:43,482 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-14 00:34:43,874 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-14 00:34:43,874 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-14 00:34:43,880 [ scc.git] DEBUG Calling 'git fetch origin pull/563/head'
2024-07-14 00:34:44,290 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-14 00:34:44,290 [ scc.git] DEBUG * branch refs/pull/563/head -> FETCH_HEAD
2024-07-14 00:34:44,295 [ scc.git] DEBUG Calling 'git fetch origin pull/564/head'
2024-07-14 00:34:44,644 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-14 00:34:44,645 [ scc.git] DEBUG * branch refs/pull/564/head -> FETCH_HEAD
2024-07-14 00:34:44,651 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:34:44,652 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:34:44,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:44,659 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-07-14 00:34:44,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:44,670 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-07-14 00:34:44,776 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-14 00:34:44,776 [ scc.git] DEBUG Auto-merging setup.py
2024-07-14 00:34:44,799 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:34:44,803 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-07-14 00:34:44,803 [ scc.git] DEBUG setup.py | 1 +
2024-07-14 00:34:44,803 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-07-14 00:34:44,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:44,977 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-07-14 00:34:44,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:44,989 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-07-14 00:34:45,091 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-07-14 00:34:45,091 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-14 00:34:45,092 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:34:45,096 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-07-14 00:34:45,096 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-07-14 00:34:45,097 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-07-14 00:34:45,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:45,393 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...79c23056136bc929e4ebd57d24600780c92921c5'
2024-07-14 00:34:45,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:45,407 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Optimize obj_id_bitmask by using its own query) 79c23056136bc929e4ebd57d24600780c92921c5'
2024-07-14 00:34:45,455 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:34:45,459 [ scc.git] DEBUG omeroweb/webgateway/views.py | 77 ++++++++++++++++++++++++++------------------
2024-07-14 00:34:45,459 [ scc.git] DEBUG test/unit/test_webgateway.py | 9 ++++--
2024-07-14 00:34:45,460 [ scc.git] DEBUG 2 files changed, 51 insertions(+), 35 deletions(-)
2024-07-14 00:34:45,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:45,799 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-14 00:34:45,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:45,815 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Archive status) 97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-14 00:34:46,031 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-14 00:34:46,032 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:34:46,037 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.tree.js | 3 +++
2024-07-14 00:34:46,037 [ scc.git] DEBUG .../webclient/annotations/includes/core_metadata.html | 6 ++++++
2024-07-14 00:34:46,037 [ scc.git] DEBUG omeroweb/webclient/tree.py | 10 ++++++++--
2024-07-14 00:34:46,037 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 1 +
2024-07-14 00:34:46,037 [ scc.git] DEBUG 4 files changed, 18 insertions(+), 2 deletions(-)
2024-07-14 00:34:46,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:46,242 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...835cfbc948305ce221d873b2a8beb5be288ca9f8'
2024-07-14 00:34:46,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:46,254 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 558 (Update readme) 835cfbc948305ce221d873b2a8beb5be288ca9f8'
2024-07-14 00:34:46,309 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:34:46,312 [ scc.git] DEBUG README.rst | 42 +++++++++++++++++++++---------------------
2024-07-14 00:34:46,312 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 21 deletions(-)
2024-07-14 00:34:46,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:46,657 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f92a4e2764982ace46474a82af4ad25bee9d8823'
2024-07-14 00:34:46,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:46,672 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (linkify supports urls that include $ character) f92a4e2764982ace46474a82af4ad25bee9d8823'
2024-07-14 00:34:46,700 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:34:46,704 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.webclient.actions.js | 2 +-
2024-07-14 00:34:46,705 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-14 00:34:47,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:47,059 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...af88a0cd2aa7d15d9b0dca1ce369060284551de7'
2024-07-14 00:34:47,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:47,073 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 563 (Batch by MAX_TABLE_DOWNLOAD_ROWS) af88a0cd2aa7d15d9b0dca1ce369060284551de7'
2024-07-14 00:34:47,152 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py
2024-07-14 00:34:47,165 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:34:47,170 [ scc.git] DEBUG omeroweb/webgateway/views.py | 2 +-
2024-07-14 00:34:47,170 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-14 00:34:47,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:47,466 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...091e5fc2d35212271ac71fd66b42c611299d6fde'
2024-07-14 00:34:47,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:47,480 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 564 (New table API endpoints for lower level table access) 091e5fc2d35212271ac71fd66b42c611299d6fde'
2024-07-14 00:34:47,532 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-14 00:34:47,532 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py
2024-07-14 00:34:47,555 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:34:47,561 [ scc.git] DEBUG omeroweb/settings.py | 7 ++
2024-07-14 00:34:47,561 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 29 +++++++
2024-07-14 00:34:47,561 [ scc.git] DEBUG omeroweb/webgateway/views.py | 175 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-14 00:34:47,561 [ scc.git] DEBUG 3 files changed, 210 insertions(+), 1 deletion(-)
2024-07-14 00:34:47,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:47,873 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:34:47,921 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:34:47,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:34:47,926 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:34:47,967 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:34:47,977 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4ad7fc84f0> has no local changes
2024-07-14 00:34:47,977 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 562 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 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query'
- PR 555 chris-allan 'Archive status'
- PR 558 jburel 'Update readme'
- PR 560 will-moore 'linkify supports urls that include $ character'
- PR 563 chris-allan 'Batch by MAX_TABLE_DOWNLOAD_ROWS'
- PR 564 knabar 'New table API endpoints for lower level table access'
Generated by OMERO-python-superbuild-push#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/115/)'
2024-07-14 00:34:47,989 [ scc.git] DEBUG [detached HEAD d9d66ab49] merge master -Dorg -Ssuccess-only
2024-07-14 00:34:47,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:34:47,989 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:34:48,040 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-07-14 00:34:48,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:48,301 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-07-14 00:34:48,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:48,708 [ scc.config] DEBUG Found submodule.omero-py.url
2024-07-14 00:34:49,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:49,107 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-07-14 00:34:49,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:49,527 [ scc.config] DEBUG Found submodule.omero-web.url
2024-07-14 00:34:49,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:34:49,958 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:34:49,989 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4af816da00> has local changes
2024-07-14 00:34:49,989 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 562 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 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query'
- PR 555 chris-allan 'Archive status'
- PR 558 jburel 'Update readme'
- PR 560 will-moore 'linkify supports urls that include $ character'
- PR 563 chris-allan 'Batch by MAX_TABLE_DOWNLOAD_ROWS'
- PR 564 knabar 'New table API endpoints for lower level table access'
Generated by OMERO-python-superbuild-push#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/115/)'
2024-07-14 00:34:49,999 [ scc.git] DEBUG [detached HEAD 6635ac0] merge master -Dorg -Ssuccess-only
2024-07-14 00:34:50,000 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-14 00:34:50,000 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-07-14 00:34:50,000 [ scc.merge] INFO Already up to date.
2024-07-14 00:34:50,000 [ scc.merge] INFO
2024-07-14 00:34:50,000 [ scc.merge] INFO
2024-07-14 00:34:50,000 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-07-14 00:34:50,000 [ scc.merge] INFO Already up to date.
2024-07-14 00:34:50,000 [ scc.merge] INFO
2024-07-14 00:34:50,000 [ scc.merge] INFO Merged PRs:
2024-07-14 00:34:50,000 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-14 00:34:50,000 [ scc.merge] INFO
2024-07-14 00:34:50,000 [ scc.merge] INFO Repository: ome/omero-marshal
2024-07-14 00:34:50,000 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:34:50,000 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-07-14 00:34:50,001 [ scc.merge] INFO Already up to date.
2024-07-14 00:34:50,001 [ scc.merge] INFO
2024-07-14 00:34:50,001 [ scc.merge] INFO Merged PRs:
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-14 00:34:50,001 [ scc.merge] INFO
2024-07-14 00:34:50,001 [ scc.merge] INFO Repository: ome/omero-py
2024-07-14 00:34:50,001 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-07-14 00:34:50,001 [ scc.merge] INFO Already up to date.
2024-07-14 00:34:50,001 [ scc.merge] INFO
2024-07-14 00:34:50,001 [ scc.merge] INFO Merged PRs:
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-07-14 00:34:50,001 [ scc.merge] INFO
2024-07-14 00:34:50,001 [ scc.merge] INFO Repository: ome/omero-scripts
2024-07-14 00:34:50,001 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-14 00:34:50,001 [ scc.merge] INFO Already up to date.
2024-07-14 00:34:50,001 [ scc.merge] INFO
2024-07-14 00:34:50,001 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-14 00:34:50,001 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-14 00:34:50,001 [ scc.merge] INFO
2024-07-14 00:34:50,002 [ scc.merge] INFO Repository: ome/omero-web
2024-07-14 00:34:50,002 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:34:50,002 [ scc.merge] INFO - PR 562 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-14 00:34:50,002 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-07-14 00:34:50,002 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-07-14 00:34:50,002 [ scc.merge] INFO Already up to date.
2024-07-14 00:34:50,002 [ scc.merge] INFO
2024-07-14 00:34:50,002 [ scc.merge] INFO Merged PRs:
2024-07-14 00:34:50,002 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-14 00:34:50,002 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-14 00:34:50,002 [ scc.merge] INFO - PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query'
2024-07-14 00:34:50,002 [ scc.merge] INFO - PR 555 chris-allan 'Archive status'
2024-07-14 00:34:50,002 [ scc.merge] INFO - PR 558 jburel 'Update readme'
2024-07-14 00:34:50,002 [ scc.merge] INFO - PR 560 will-moore 'linkify supports urls that include $ character'
2024-07-14 00:34:50,002 [ scc.merge] INFO - PR 563 chris-allan 'Batch by MAX_TABLE_DOWNLOAD_ROWS'
2024-07-14 00:34:50,002 [ scc.merge] INFO - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-14 00:34:50,002 [ scc.merge] INFO
2024-07-14 00:34:50,002 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-14 00:34:50,002 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:34:50,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-14 00:34:50,008 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:34:50,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:34:50,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-14 00:34:50,012 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:34:50,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:34:50,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-14 00:34:50,016 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:34:50,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:34:50,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-14 00:34:50,020 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:34:50,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-14 00:34:50,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-14 00:34:50,025 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:34:50,029 [ 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 2891df1b
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from c20d273
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from 5a2cd79d7
nothing to commit, working tree clean
HEAD detached from 2f19665
nothing to commit, working tree clean
2024-07-14 00:35:20,276 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
