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)
2025-01-09 01:27:59,807 [ scc.config] DEBUG Found github.token
2025-01-09 01:27:59,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-01-09 01:27:59,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:28:00,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:28:00,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2025-01-09 01:28:00,831 [ scc.gh] DEBUG 4472 remaining from 5000 (Reset at 02:01
2025-01-09 01:28:00,832 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-09 01:28:00,837 [ scc.git] DEBUG Check current status
2025-01-09 01:28:00,838 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-09 01:28:00,842 [ scc.git] DEBUG 7d1c1d8 Merge pull request #304 from ome/dependabot/submodules/omero-web-96d1138
2025-01-09 01:28:00,842 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-09 01:28:00,888 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2025-01-09 01:28:00,891 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2025-01-09 01:28:00,944 [ scc.git] DEBUG 7da917a77ea9c1142dc4b992261e79466e897244 omero-py (v5.19.5-11-g7da917a7)
2025-01-09 01:28:00,948 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2025-01-09 01:28:00,979 [ scc.git] DEBUG 96d113830f31142cb272c5a486b048cd185c51bd omero-web (v5.28.0-5-g96d113830)
2025-01-09 01:28:00,985 [ scc.config] DEBUG Found remote.origin.url
2025-01-09 01:28:01,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2025-01-09 01:28:01,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-09 01:28:02,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-09 01:28:02,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-09 01:28:03,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-09 01:28:03,058 [ scc.git] DEBUG Resetting...
2025-01-09 01:28:03,058 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2025-01-09 01:28:03,065 [ scc.git] DEBUG HEAD is now at 7d1c1d8 Merge pull request #304 from ome/dependabot/submodules/omero-web-96d1138
2025-01-09 01:28:03,065 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2025-01-09 01:28:03,122 [ scc.git] DEBUG Check current status
2025-01-09 01:28:03,122 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-09 01:28:03,126 [ scc.git] DEBUG 7d1c1d8 Merge pull request #304 from ome/dependabot/submodules/omero-web-96d1138
2025-01-09 01:28:03,126 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-09 01:28:03,169 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2025-01-09 01:28:03,172 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2025-01-09 01:28:03,176 [ scc.git] DEBUG 7da917a77ea9c1142dc4b992261e79466e897244 omero-py (v5.19.5-11-g7da917a7)
2025-01-09 01:28:03,180 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2025-01-09 01:28:03,184 [ scc.git] DEBUG 96d113830f31142cb272c5a486b048cd185c51bd omero-web (v5.28.0-5-g96d113830)
2025-01-09 01:28:03,185 [ scc.merge] INFO Merging Pull Request(s) based on master
2025-01-09 01:28:03,185 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2025-01-09 01:28:03,185 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2025-01-09 01:28:03,185 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2025-01-09 01:28:03,185 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2025-01-09 01:28:03,185 [ scc.repo] DEBUG ## PRs found:
2025-01-09 01:28:03,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2025-01-09 01:28:04,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/306 HTTP/1.1" 200 None
2025-01-09 01:28:04,053 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-09 01:28:04,053 [ scc.repo] DEBUG - PR 306 dependabot[bot] 'Bump omero-py from `7da917a` to `ad6cef9`'
2025-01-09 01:28:04,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/305 HTTP/1.1" 200 None
2025-01-09 01:28:04,531 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-09 01:28:04,531 [ scc.repo] DEBUG - PR 305 dependabot[bot] 'Bump omero-scripts from `312afbe` to `4b4c755`'
2025-01-09 01:28:04,531 [ scc.repo] DEBUG ## Branches found:
2025-01-09 01:28:04,531 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:28:04,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:04,535 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 01:28:04,539 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 01:28:04,539 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 01:28:04,543 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 01:28:04,547 [ scc.git] DEBUG Already up to date.
2025-01-09 01:28:04,547 [ scc.git] DEBUG Calling 'git fetch origin pull/305/head'
2025-01-09 01:28:04,885 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2025-01-09 01:28:04,885 [ scc.git] DEBUG * branch refs/pull/305/head -> FETCH_HEAD
2025-01-09 01:28:04,891 [ scc.git] DEBUG Calling 'git fetch origin pull/306/head'
2025-01-09 01:28:05,206 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2025-01-09 01:28:05,206 [ scc.git] DEBUG * branch refs/pull/306/head -> FETCH_HEAD
2025-01-09 01:28:05,212 [ scc.git] DEBUG ## Unique users: []
2025-01-09 01:28:05,212 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:28:05,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:05,216 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0173bb48e358fcfca04dff1b8baf725905ca4021'
2025-01-09 01:28:05,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:05,224 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 305 (Bump omero-scripts from `312afbe` to `4b4c755`) 0173bb48e358fcfca04dff1b8baf725905ca4021'
2025-01-09 01:28:05,234 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:28:05,237 [ scc.git] DEBUG omero-scripts | 2 +-
2025-01-09 01:28:05,237 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-01-09 01:28:05,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:28:05,387 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...af666998ee465844cf1828090e152364beb24226'
2025-01-09 01:28:05,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:05,395 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 306 (Bump omero-py from `7da917a` to `ad6cef9`) af666998ee465844cf1828090e152364beb24226'
2025-01-09 01:28:05,405 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:28:05,407 [ scc.git] DEBUG omero-py | 2 +-
2025-01-09 01:28:05,407 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-01-09 01:28:05,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:28:05,790 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 01:28:06,064 [ scc.git] DEBUG Submodule path 'omero-py': checked out 'ad6cef966de46c908b5bb5fa8924867ebb2a3a77'
2025-01-09 01:28:06,079 [ scc.git] DEBUG Submodule path 'omero-scripts': checked out '4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-09 01:28:06,079 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:28:06,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:06,083 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 01:28:06,784 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5c4c03a370> has no local changes
2025-01-09 01:28:06,785 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 305 dependabot[bot] 'Bump omero-scripts from `312afbe` to `4b4c755`'
- PR 306 dependabot[bot] 'Bump omero-py from `7da917a` to `ad6cef9`'
Generated by OMERO-python-superbuild-push#286 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/286/)'
2025-01-09 01:28:06,816 [ scc.git] DEBUG [detached HEAD c65adaf] merge master -Dorg -Snone
2025-01-09 01:28:06,816 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2025-01-09 01:28:06,816 [ scc.merge] INFO Already up to date.
2025-01-09 01:28:06,816 [ scc.merge] INFO
2025-01-09 01:28:06,817 [ scc.merge] INFO Merged PRs:
2025-01-09 01:28:06,817 [ scc.merge] INFO - PR 305 dependabot[bot] 'Bump omero-scripts from `312afbe` to `4b4c755`'
2025-01-09 01:28:06,817 [ scc.merge] INFO - PR 306 dependabot[bot] 'Bump omero-py from `7da917a` to `ad6cef9`'
2025-01-09 01:28:06,817 [ scc.merge] INFO
2025-01-09 01:28:06,817 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-09 01:28:06,817 [ 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
2025-01-09 01:28:08,986 [ scc.config] DEBUG Found github.token
2025-01-09 01:28:08,989 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-01-09 01:28:09,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:28:09,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:28:09,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2025-01-09 01:28:09,958 [ scc.gh] DEBUG 4460 remaining from 5000 (Reset at 02:01
2025-01-09 01:28:09,958 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-09 01:28:09,962 [ scc.git] DEBUG Check current status
2025-01-09 01:28:09,963 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-09 01:28:09,967 [ scc.git] DEBUG c65adaf merge master -Dorg -Snone
2025-01-09 01:28:09,967 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-09 01:28:10,011 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2025-01-09 01:28:10,015 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2025-01-09 01:28:10,019 [ scc.git] DEBUG ad6cef966de46c908b5bb5fa8924867ebb2a3a77 omero-py (v5.19.5-15-gad6cef96)
2025-01-09 01:28:10,024 [ scc.git] DEBUG 4b4c755af4ccf8a5e709548d1f8415fab48a4867 omero-scripts (v5.9.0-1-g4b4c755)
2025-01-09 01:28:10,028 [ scc.git] DEBUG 96d113830f31142cb272c5a486b048cd185c51bd omero-web (v5.28.0-5-g96d113830)
2025-01-09 01:28:10,032 [ scc.config] DEBUG Found remote.origin.url
2025-01-09 01:28:10,032 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2025-01-09 01:28:10,034 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2025-01-09 01:28:10,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2025-01-09 01:28:10,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-09 01:28:11,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-09 01:28:11,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-09 01:28:12,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-09 01:28:12,210 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 01:28:12,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2025-01-09 01:28:12,261 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-09 01:28:12,266 [ scc.git] DEBUG Check current status
2025-01-09 01:28:12,266 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-09 01:28:12,272 [ scc.git] DEBUG 01fa0c5 Merge pull request #24 from jburel/build
2025-01-09 01:28:12,273 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-09 01:28:12,321 [ scc.config] DEBUG Found remote.origin.url
2025-01-09 01:28:12,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2025-01-09 01:28:13,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-09 01:28:13,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-09 01:28:14,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-09 01:28:14,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-09 01:28:14,553 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 01:28:14,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:28:14,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2025-01-09 01:28:14,595 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-09 01:28:14,599 [ scc.git] DEBUG Check current status
2025-01-09 01:28:14,599 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-09 01:28:14,603 [ scc.git] DEBUG 6d44f66 Merge pull request #82 from jburel/build
2025-01-09 01:28:14,603 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-09 01:28:14,648 [ scc.config] DEBUG Found remote.origin.url
2025-01-09 01:28:15,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2025-01-09 01:28:15,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-09 01:28:15,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-09 01:28:16,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-09 01:28:16,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-09 01:28:16,932 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 01:28:16,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:28:16,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2025-01-09 01:28:16,974 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-09 01:28:16,978 [ scc.git] DEBUG Check current status
2025-01-09 01:28:16,978 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-09 01:28:16,994 [ scc.git] DEBUG ad6cef96 Merge pull request #429 from jo-mueller/use_repr_html-only-for-ImageWrapper
2025-01-09 01:28:16,994 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-09 01:28:17,040 [ scc.config] DEBUG Found remote.origin.url
2025-01-09 01:28:17,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2025-01-09 01:28:17,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-09 01:28:18,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-09 01:28:18,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-09 01:28:19,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-09 01:28:19,267 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 01:28:19,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:28:19,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2025-01-09 01:28:19,310 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-09 01:28:19,315 [ scc.git] DEBUG Check current status
2025-01-09 01:28:19,315 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-09 01:28:19,324 [ scc.git] DEBUG 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-09 01:28:19,324 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-09 01:28:19,366 [ scc.config] DEBUG Found remote.origin.url
2025-01-09 01:28:19,367 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2025-01-09 01:28:19,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2025-01-09 01:28:20,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-09 01:28:20,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-09 01:28:21,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-09 01:28:21,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-09 01:28:21,597 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 01:28:21,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:28:21,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2025-01-09 01:28:21,639 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-09 01:28:21,643 [ scc.git] DEBUG Check current status
2025-01-09 01:28:21,644 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-09 01:28:21,656 [ scc.git] DEBUG 96d113830 Merge pull request #601 from jburel/cleanup
2025-01-09 01:28:21,657 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-09 01:28:21,704 [ scc.config] DEBUG Found remote.origin.url
2025-01-09 01:28:22,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2025-01-09 01:28:22,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-09 01:28:23,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-09 01:28:23,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-09 01:28:23,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-09 01:28:23,857 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 01:28:23,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:28:23,897 [ scc.git] DEBUG Resetting...
2025-01-09 01:28:23,897 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2025-01-09 01:28:23,903 [ scc.git] DEBUG HEAD is now at c65adaf merge master -Dorg -Snone
2025-01-09 01:28:23,904 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2025-01-09 01:28:23,954 [ scc.git] DEBUG Check current status
2025-01-09 01:28:23,954 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-09 01:28:23,958 [ scc.git] DEBUG c65adaf merge master -Dorg -Snone
2025-01-09 01:28:23,958 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-09 01:28:24,000 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2025-01-09 01:28:24,003 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2025-01-09 01:28:24,008 [ scc.git] DEBUG ad6cef966de46c908b5bb5fa8924867ebb2a3a77 omero-py (v5.19.5-15-gad6cef96)
2025-01-09 01:28:24,012 [ scc.git] DEBUG 4b4c755af4ccf8a5e709548d1f8415fab48a4867 omero-scripts (v5.9.0-1-g4b4c755)
2025-01-09 01:28:24,016 [ scc.git] DEBUG 96d113830f31142cb272c5a486b048cd185c51bd omero-web (v5.28.0-5-g96d113830)
2025-01-09 01:28:24,017 [ scc.merge] INFO Merging Pull Request(s) based on master
2025-01-09 01:28:24,017 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2025-01-09 01:28:24,017 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2025-01-09 01:28:24,017 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2025-01-09 01:28:24,017 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2025-01-09 01:28:24,017 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2025-01-09 01:28:24,017 [ scc.repo] DEBUG ## PRs found:
2025-01-09 01:28:24,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2025-01-09 01:28:24,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/306 HTTP/1.1" 200 None
2025-01-09 01:28:24,846 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-09 01:28:25,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/af666998ee465844cf1828090e152364beb24226 HTTP/1.1" 200 None
2025-01-09 01:28:25,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/af666998ee465844cf1828090e152364beb24226/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 01:28:26,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/af666998ee465844cf1828090e152364beb24226 HTTP/1.1" 200 None
2025-01-09 01:28:26,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/af666998ee465844cf1828090e152364beb24226?per_page=1 HTTP/1.1" 200 2
2025-01-09 01:28:26,734 [ scc.repo] DEBUG - PR 306 dependabot[bot] 'Bump omero-py from `7da917a` to `ad6cef9`'
2025-01-09 01:28:27,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/305 HTTP/1.1" 200 None
2025-01-09 01:28:27,206 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-09 01:28:27,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/0173bb48e358fcfca04dff1b8baf725905ca4021 HTTP/1.1" 200 None
2025-01-09 01:28:28,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/0173bb48e358fcfca04dff1b8baf725905ca4021/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 01:28:28,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/0173bb48e358fcfca04dff1b8baf725905ca4021 HTTP/1.1" 200 None
2025-01-09 01:28:29,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/0173bb48e358fcfca04dff1b8baf725905ca4021?per_page=1 HTTP/1.1" 200 2
2025-01-09 01:28:29,313 [ scc.repo] DEBUG - PR 305 dependabot[bot] 'Bump omero-scripts from `312afbe` to `4b4c755`'
2025-01-09 01:28:29,313 [ scc.repo] DEBUG ## Branches found:
2025-01-09 01:28:29,313 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:28:29,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:29,318 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 01:28:29,322 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 01:28:29,322 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 01:28:29,326 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 01:28:29,330 [ scc.git] DEBUG Already up to date.
2025-01-09 01:28:29,330 [ scc.git] DEBUG Calling 'git fetch origin pull/305/head'
2025-01-09 01:28:29,652 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2025-01-09 01:28:29,652 [ scc.git] DEBUG * branch refs/pull/305/head -> FETCH_HEAD
2025-01-09 01:28:29,658 [ scc.git] DEBUG Calling 'git fetch origin pull/306/head'
2025-01-09 01:28:29,972 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2025-01-09 01:28:29,972 [ scc.git] DEBUG * branch refs/pull/306/head -> FETCH_HEAD
2025-01-09 01:28:29,977 [ scc.git] DEBUG ## Unique users: []
2025-01-09 01:28:29,977 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:28:29,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:29,981 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0173bb48e358fcfca04dff1b8baf725905ca4021'
2025-01-09 01:28:29,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:29,989 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 305 (Bump omero-scripts from `312afbe` to `4b4c755`) 0173bb48e358fcfca04dff1b8baf725905ca4021'
2025-01-09 01:28:29,994 [ scc.git] DEBUG Already up to date.
2025-01-09 01:28:30,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:28:30,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...af666998ee465844cf1828090e152364beb24226'
2025-01-09 01:28:30,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:30,215 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 306 (Bump omero-py from `7da917a` to `ad6cef9`) af666998ee465844cf1828090e152364beb24226'
2025-01-09 01:28:30,220 [ scc.git] DEBUG Already up to date.
2025-01-09 01:28:30,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:28:30,611 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 01:28:30,650 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:28:30,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:30,655 [ scc.repo] DEBUG ## PRs found:
2025-01-09 01:28:31,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2025-01-09 01:28:31,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2025-01-09 01:28:32,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2025-01-09 01:28:32,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2025-01-09 01:28:33,161 [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
2025-01-09 01:28:33,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2025-01-09 01:28:34,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2025-01-09 01:28:34,092 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2025-01-09 01:28:34,092 [ scc.repo] DEBUG ## Branches found:
2025-01-09 01:28:34,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2025-01-09 01:28:34,092 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:28:34,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:34,098 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 01:28:34,102 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 01:28:34,103 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 01:28:34,107 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 01:28:34,112 [ scc.git] DEBUG Already up to date.
2025-01-09 01:28:34,112 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2025-01-09 01:28:34,433 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2025-01-09 01:28:34,434 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2025-01-09 01:28:34,439 [ scc.git] DEBUG ## Unique users: []
2025-01-09 01:28:34,439 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:28:34,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:34,444 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2025-01-09 01:28:34,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:34,452 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2025-01-09 01:28:34,819 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2025-01-09 01:28:34,819 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2025-01-09 01:28:34,819 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2025-01-09 01:28:34,819 [ scc.git] DEBUG Auto-merging src/fsLists.py
2025-01-09 01:28:34,819 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2025-01-09 01:28:34,819 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2025-01-09 01:28:34,819 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2025-01-09 01:28:34,819 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2025-01-09 01:28:34,819 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2025-01-09 01:28:34,819 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:28:34,823 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2025-01-09 01:28:34,823 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2025-01-09 01:28:34,824 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2025-01-09 01:28:34,824 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2025-01-09 01:28:34,824 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2025-01-09 01:28:34,824 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2025-01-09 01:28:34,824 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2025-01-09 01:28:34,824 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2025-01-09 01:28:34,826 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2025-01-09 01:28:34,826 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2025-01-09 01:28:34,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:28:34,969 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 01:28:35,013 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:28:35,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:35,018 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 01:28:35,061 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 01:28:35,067 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1029256b50> has no local changes
2025-01-09 01:28:35,068 [ 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#286 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/286/)'
2025-01-09 01:28:35,076 [ scc.git] DEBUG [detached HEAD 12518f5] merge master -Dorg -Ssuccess-only
2025-01-09 01:28:35,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:28:35,077 [ scc.repo] DEBUG ## PRs found:
2025-01-09 01:28:35,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2025-01-09 01:28:36,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/84 HTTP/1.1" 200 None
2025-01-09 01:28:36,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2025-01-09 01:28:36,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2025-01-09 01:28:37,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2025-01-09 01:28:38,040 [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
2025-01-09 01:28:38,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2025-01-09 01:28:39,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2025-01-09 01:28:39,029 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2025-01-09 01:28:39,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2025-01-09 01:28:40,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2025-01-09 01:28:40,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2025-01-09 01:28:40,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2025-01-09 01:28:40,896 [ scc.repo] DEBUG ## Branches found:
2025-01-09 01:28:40,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2025-01-09 01:28:40,896 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:28:40,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:40,900 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 01:28:40,904 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 01:28:40,904 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 01:28:40,909 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 01:28:40,913 [ scc.git] DEBUG Already up to date.
2025-01-09 01:28:40,913 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2025-01-09 01:28:41,419 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2025-01-09 01:28:41,420 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2025-01-09 01:28:41,424 [ scc.git] DEBUG ## Unique users: []
2025-01-09 01:28:41,425 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:28:41,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:41,429 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2025-01-09 01:28:41,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:41,439 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2025-01-09 01:28:41,453 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2025-01-09 01:28:41,454 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:28:41,457 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2025-01-09 01:28:41,457 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2025-01-09 01:28:41,457 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2025-01-09 01:28:41,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:28:41,600 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 01:28:41,647 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:28:41,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:28:41,653 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 01:28:41,697 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 01:28:41,703 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1029256490> has no local changes
2025-01-09 01:28:41,703 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-marshal
Excluded PRs:
- PR 84 joshmoore 'New JSON-LD context-based version' (stage: draft)
- 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#286 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/286/)'
2025-01-09 01:28:41,711 [ scc.git] DEBUG [detached HEAD f1aa091] merge master -Dorg -Ssuccess-only
2025-01-09 01:28:41,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:28:41,712 [ scc.repo] DEBUG ## PRs found:
2025-01-09 01:28:42,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2025-01-09 01:28:42,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/442 HTTP/1.1" 200 None
2025-01-09 01:28:43,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/442/comments HTTP/1.1" 200 None
2025-01-09 01:28:43,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/15fc4703138511839767813d9420df68f6f62901 HTTP/1.1" 200 None
2025-01-09 01:28:44,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/15fc4703138511839767813d9420df68f6f62901/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 01:28:44,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/15fc4703138511839767813d9420df68f6f62901/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 01:28:45,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/15fc4703138511839767813d9420df68f6f62901 HTTP/1.1" 200 None
2025-01-09 01:28:45,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/15fc4703138511839767813d9420df68f6f62901?per_page=1 HTTP/1.1" 200 None
2025-01-09 01:28:46,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/15fc4703138511839767813d9420df68f6f62901 HTTP/1.1" 200 None
2025-01-09 01:28:46,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/15fc4703138511839767813d9420df68f6f62901/status HTTP/1.1" 200 None
2025-01-09 01:28:46,780 [ scc.repo] DEBUG - PR 442 sbesson 'Add changelog for 5.19.6 release'
2025-01-09 01:28:47,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2025-01-09 01:28:47,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427/comments HTTP/1.1" 200 None
2025-01-09 01:28:47,780 [ scc.repo] DEBUG # ... Include label: include
2025-01-09 01:28:48,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2025-01-09 01:28:48,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 01:28:49,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 01:28:49,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2025-01-09 01:28:50,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1?per_page=1 HTTP/1.1" 200 None
2025-01-09 01:28:50,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2025-01-09 01:28:51,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/status HTTP/1.1" 200 None
2025-01-09 01:28:51,190 [ scc.repo] DEBUG - PR 427 Rdornier 'Add fileset folder creation'
2025-01-09 01:28:51,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2025-01-09 01:28:52,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2025-01-09 01:28:52,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2025-01-09 01:28:53,177 [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
2025-01-09 01:28:53,603 [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
2025-01-09 01:28:54,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2025-01-09 01:28:54,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2025-01-09 01:28:55,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2025-01-09 01:28:55,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2025-01-09 01:28:55,542 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2025-01-09 01:28:56,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2025-01-09 01:28:56,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2025-01-09 01:28:56,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2025-01-09 01:28:57,502 [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
2025-01-09 01:28:57,944 [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
2025-01-09 01:28:58,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2025-01-09 01:28:58,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2025-01-09 01:28:59,421 [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
2025-01-09 01:28:59,885 [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
2025-01-09 01:29:00,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2025-01-09 01:29:00,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2025-01-09 01:29:01,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2025-01-09 01:29:01,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2025-01-09 01:29:01,713 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2025-01-09 01:29:02,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2025-01-09 01:29:02,206 [ scc.repo] DEBUG # ... Exclude label: exclude
2025-01-09 01:29:02,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2025-01-09 01:29:03,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2025-01-09 01:29:03,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2025-01-09 01:29:04,066 [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
2025-01-09 01:29:04,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2025-01-09 01:29:05,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2025-01-09 01:29:05,065 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2025-01-09 01:29:05,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2025-01-09 01:29:06,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2025-01-09 01:29:06,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2025-01-09 01:29:07,095 [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
2025-01-09 01:29:07,613 [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
2025-01-09 01:29:08,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2025-01-09 01:29:08,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2025-01-09 01:29:09,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2025-01-09 01:29:09,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2025-01-09 01:29:09,458 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2025-01-09 01:29:09,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2025-01-09 01:29:10,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2025-01-09 01:29:10,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2025-01-09 01:29:11,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2025-01-09 01:29:11,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2025-01-09 01:29:12,264 [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
2025-01-09 01:29:12,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2025-01-09 01:29:13,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2025-01-09 01:29:13,195 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2025-01-09 01:29:13,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2025-01-09 01:29:14,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2025-01-09 01:29:14,693 [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
2025-01-09 01:29:15,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2025-01-09 01:29:15,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2025-01-09 01:29:15,586 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2025-01-09 01:29:16,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2025-01-09 01:29:16,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2025-01-09 01:29:17,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2025-01-09 01:29:17,583 [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
2025-01-09 01:29:18,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2025-01-09 01:29:18,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2025-01-09 01:29:18,542 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2025-01-09 01:29:19,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2025-01-09 01:29:19,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2025-01-09 01:29:19,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2025-01-09 01:29:20,494 [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
2025-01-09 01:29:20,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2025-01-09 01:29:21,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2025-01-09 01:29:21,407 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2025-01-09 01:29:21,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2025-01-09 01:29:22,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2025-01-09 01:29:22,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2025-01-09 01:29:23,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2025-01-09 01:29:23,285 [ scc.repo] DEBUG ## Branches found:
2025-01-09 01:29:23,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2025-01-09 01:29:23,286 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:29:23,286 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:23,291 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 01:29:23,296 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 01:29:23,296 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 01:29:23,301 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 01:29:23,306 [ scc.git] DEBUG Already up to date.
2025-01-09 01:29:23,306 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2025-01-09 01:29:24,050 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-01-09 01:29:24,050 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2025-01-09 01:29:24,056 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2025-01-09 01:29:24,428 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-01-09 01:29:24,428 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2025-01-09 01:29:24,433 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2025-01-09 01:29:24,765 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-01-09 01:29:24,766 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2025-01-09 01:29:24,771 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2025-01-09 01:29:25,148 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-01-09 01:29:25,148 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2025-01-09 01:29:25,154 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2025-01-09 01:29:25,547 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-01-09 01:29:25,547 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2025-01-09 01:29:25,552 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2025-01-09 01:29:25,855 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-01-09 01:29:25,855 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2025-01-09 01:29:25,860 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2025-01-09 01:29:26,146 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-01-09 01:29:26,147 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2025-01-09 01:29:26,152 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2025-01-09 01:29:26,587 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-01-09 01:29:26,588 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2025-01-09 01:29:26,593 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2025-01-09 01:29:27,886 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-01-09 01:29:27,886 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2025-01-09 01:29:27,891 [ scc.git] DEBUG Calling 'git fetch origin pull/442/head'
2025-01-09 01:29:28,308 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-01-09 01:29:28,309 [ scc.git] DEBUG * branch refs/pull/442/head -> FETCH_HEAD
2025-01-09 01:29:28,314 [ scc.git] DEBUG ## Unique users: []
2025-01-09 01:29:28,315 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:29:28,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:28,319 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2025-01-09 01:29:28,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:28,336 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2025-01-09 01:29:28,521 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2025-01-09 01:29:28,521 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2025-01-09 01:29:28,522 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:29:28,526 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2025-01-09 01:29:28,526 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2025-01-09 01:29:28,527 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2025-01-09 01:29:28,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:29:28,691 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2025-01-09 01:29:28,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:28,708 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2025-01-09 01:29:29,030 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2025-01-09 01:29:29,030 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2025-01-09 01:29:29,031 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:29:29,039 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2025-01-09 01:29:29,039 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2025-01-09 01:29:29,040 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2025-01-09 01:29:29,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:29:29,181 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2025-01-09 01:29:29,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:29,199 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2025-01-09 01:29:29,349 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2025-01-09 01:29:29,350 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:29:29,353 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2025-01-09 01:29:29,353 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2025-01-09 01:29:29,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:29:29,573 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2025-01-09 01:29:29,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:29,596 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2025-01-09 01:29:29,788 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2025-01-09 01:29:29,788 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2025-01-09 01:29:29,790 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:29:29,794 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2025-01-09 01:29:29,794 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2025-01-09 01:29:29,794 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2025-01-09 01:29:29,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:29:29,969 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2025-01-09 01:29:29,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:29,987 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2025-01-09 01:29:30,019 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:29:30,022 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2025-01-09 01:29:30,022 [ scc.git] DEBUG connect.py | 11 +++++++++++
2025-01-09 01:29:30,022 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2025-01-09 01:29:30,022 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2025-01-09 01:29:30,022 [ scc.git] DEBUG create mode 100644 connect.py
2025-01-09 01:29:30,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:29:30,359 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2025-01-09 01:29:30,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:30,378 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2025-01-09 01:29:30,502 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2025-01-09 01:29:30,504 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:29:30,507 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2025-01-09 01:29:30,507 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-09 01:29:30,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:29:30,762 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2025-01-09 01:29:30,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:30,781 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2025-01-09 01:29:30,975 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2025-01-09 01:29:30,977 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:29:30,981 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2025-01-09 01:29:30,981 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2025-01-09 01:29:31,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:29:31,153 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2025-01-09 01:29:31,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:31,170 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2025-01-09 01:29:31,251 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2025-01-09 01:29:31,252 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:29:31,259 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2025-01-09 01:29:31,260 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2025-01-09 01:29:31,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:29:31,555 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2025-01-09 01:29:31,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:31,574 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Add fileset folder creation) ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2025-01-09 01:29:31,654 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:29:31,657 [ scc.git] DEBUG .gitignore | 1 +
2025-01-09 01:29:31,657 [ scc.git] DEBUG src/omero/plugins/download.py | 17 ++++++++++++-----
2025-01-09 01:29:31,657 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 5 deletions(-)
2025-01-09 01:29:31,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:29:31,943 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15fc4703138511839767813d9420df68f6f62901'
2025-01-09 01:29:31,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:31,961 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 442 (Add changelog for 5.19.6 release) 15fc4703138511839767813d9420df68f6f62901'
2025-01-09 01:29:31,988 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:29:31,991 [ scc.git] DEBUG CHANGELOG.md | 9 +++++++++
2025-01-09 01:29:31,991 [ scc.git] DEBUG 1 file changed, 9 insertions(+)
2025-01-09 01:29:32,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:29:32,357 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 01:29:32,396 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:29:32,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:32,401 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 01:29:32,444 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 01:29:32,454 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1028194c40> has no local changes
2025-01-09 01:29:32,454 [ 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'
- PR 427 Rdornier 'Add fileset folder creation'
- PR 442 sbesson 'Add changelog for 5.19.6 release'
Generated by OMERO-python-superbuild-push#286 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/286/)'
2025-01-09 01:29:32,465 [ scc.git] DEBUG [detached HEAD 6f54f5b8] merge master -Dorg -Ssuccess-only
2025-01-09 01:29:32,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:29:32,466 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-09 01:29:32,466 [ scc.repo] DEBUG ## PRs found:
2025-01-09 01:29:32,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-09 01:29:33,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-09 01:29:33,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-09 01:29:34,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-09 01:29:34,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 01:29:35,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 01:29:36,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-09 01:29:36,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-01-09 01:29:36,535 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-09 01:29:36,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-09 01:29:37,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-09 01:29:37,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-09 01:29:39,925 [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
2025-01-09 01:29:40,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-09 01:29:41,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-01-09 01:29:41,161 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-09 01:29:41,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-09 01:29:42,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-09 01:29:42,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-09 01:29:43,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-09 01:29:43,195 [ scc.repo] DEBUG ## Branches found:
2025-01-09 01:29:43,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2025-01-09 01:29:43,196 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:29:43,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:43,201 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-09 01:29:43,206 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 01:29:43,206 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-09 01:29:43,211 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-09 01:29:43,217 [ scc.git] DEBUG Already up to date.
2025-01-09 01:29:43,217 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-09 01:29:44,137 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2025-01-09 01:29:44,138 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-09 01:29:44,143 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-09 01:29:44,494 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2025-01-09 01:29:44,494 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-09 01:29:44,498 [ scc.git] DEBUG ## Unique users: []
2025-01-09 01:29:44,499 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:29:44,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:44,504 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-09 01:29:44,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:44,518 [ 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'
2025-01-09 01:29:44,573 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-01-09 01:29:44,573 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-09 01:29:44,574 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-09 01:29:44,579 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-09 01:29:44,585 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-09 01:29:44,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:29:44,734 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-09 01:29:44,742 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-09 01:29:44,747 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#286](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/286/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/286/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-09 01:29:44,751 [ scc.config] DEBUG Found github.token
2025-01-09 01:29:44,752 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-09 01:29:44,752 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-09 01:29:44,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:44,762 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-09 01:29:44,820 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:29:44,823 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-09 01:29:44,823 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-09 01:29:45,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:29:45,131 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 01:29:45,174 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:29:45,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:29:45,179 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 01:29:45,220 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 01:29:45,226 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10281749d0> has no local changes
2025-01-09 01:29:45,227 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-scripts
Excluded PRs:
- 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.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-python-superbuild-push#286 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/286/)'
2025-01-09 01:29:45,235 [ scc.git] DEBUG [detached HEAD b62076f] merge master -Dorg -Ssuccess-only
2025-01-09 01:29:45,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:29:45,235 [ scc.repo] DEBUG ## PRs found:
2025-01-09 01:29:45,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2025-01-09 01:29:46,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/602 HTTP/1.1" 200 None
2025-01-09 01:29:46,346 [ scc.repo] DEBUG # ... Include label: include
2025-01-09 01:29:46,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539 HTTP/1.1" 200 None
2025-01-09 01:29:47,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 01:29:47,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 01:29:48,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539 HTTP/1.1" 200 None
2025-01-09 01:29:48,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/9119372e9fef8cab0e212f02685c8715a3307539?per_page=1 HTTP/1.1" 200 None
2025-01-09 01:29:49,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539 HTTP/1.1" 200 None
2025-01-09 01:29:49,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539/status HTTP/1.1" 200 None
2025-01-09 01:29:49,559 [ scc.repo] DEBUG - PR 602 Tom-TBT 'Inherit all ann'
2025-01-09 01:29:50,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/600 HTTP/1.1" 200 None
2025-01-09 01:29:50,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4 HTTP/1.1" 200 None
2025-01-09 01:29:50,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 01:29:51,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 01:29:51,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4 HTTP/1.1" 200 None
2025-01-09 01:29:52,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/f8a449a16e16db1d32aa2e3f703b35e26852c6e4?per_page=1 HTTP/1.1" 200 None
2025-01-09 01:29:52,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4 HTTP/1.1" 200 None
2025-01-09 01:29:53,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4/status HTTP/1.1" 200 None
2025-01-09 01:29:53,406 [ scc.repo] DEBUG - PR 600 sbesson 'Remove Python 3.8 from the testing matrix'
2025-01-09 01:29:53,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/598 HTTP/1.1" 200 None
2025-01-09 01:29:54,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/598/comments HTTP/1.1" 200 None
2025-01-09 01:29:54,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6 HTTP/1.1" 200 None
2025-01-09 01:29:55,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 01:29:55,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 01:29:56,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6 HTTP/1.1" 200 None
2025-01-09 01:29:56,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/6f07268f880d6159be0bb56eacb20557305152b6?per_page=1 HTTP/1.1" 200 None
2025-01-09 01:29:57,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6 HTTP/1.1" 200 None
2025-01-09 01:29:57,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6/status HTTP/1.1" 200 None
2025-01-09 01:29:57,573 [ scc.repo] DEBUG - PR 598 will-moore 'Fix display of ContrastMethod'
2025-01-09 01:29:58,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596 HTTP/1.1" 200 None
2025-01-09 01:29:58,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596/comments HTTP/1.1" 200 None
2025-01-09 01:29:58,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2025-01-09 01:29:59,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 01:30:00,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 01:30:00,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2025-01-09 01:30:00,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/3aae48f586d7b412538a45b34ddc471a26a286e8?per_page=1 HTTP/1.1" 200 None
2025-01-09 01:30:01,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2025-01-09 01:30:02,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/status HTTP/1.1" 200 None
2025-01-09 01:30:02,341 [ scc.repo] DEBUG - PR 596 sukunis 'Linkify can parse anchor tag'
2025-01-09 01:30:02,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595 HTTP/1.1" 200 None
2025-01-09 01:30:03,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595/comments HTTP/1.1" 200 None
2025-01-09 01:30:03,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2025-01-09 01:30:04,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 01:30:04,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 01:30:05,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2025-01-09 01:30:05,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/30278b64bb39134a3f1101b600d4a82256e6eaeb?per_page=1 HTTP/1.1" 200 None
2025-01-09 01:30:06,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2025-01-09 01:30:06,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/status HTTP/1.1" 200 None
2025-01-09 01:30:06,786 [ scc.repo] DEBUG - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2025-01-09 01:30:07,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/585 HTTP/1.1" 200 None
2025-01-09 01:30:07,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2025-01-09 01:30:08,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2025-01-09 01:30:08,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2025-01-09 01:30:09,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2025-01-09 01:30:09,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2025-01-09 01:30:10,149 [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
2025-01-09 01:30:10,640 [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
2025-01-09 01:30:11,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2025-01-09 01:30:11,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2025-01-09 01:30:12,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2025-01-09 01:30:12,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2025-01-09 01:30:12,494 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2025-01-09 01:30:12,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2025-01-09 01:30:13,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2025-01-09 01:30:13,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2025-01-09 01:30:14,483 [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
2025-01-09 01:30:14,954 [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
2025-01-09 01:30:15,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2025-01-09 01:30:15,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2025-01-09 01:30:16,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2025-01-09 01:30:16,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2025-01-09 01:30:16,938 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2025-01-09 01:30:17,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2025-01-09 01:30:18,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2025-01-09 01:30:18,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2025-01-09 01:30:19,037 [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
2025-01-09 01:30:19,523 [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
2025-01-09 01:30:19,525 [ scc.repo] DEBUG ## Branches found:
2025-01-09 01:30:19,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2025-01-09 01:30:19,526 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:30:19,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:30:19,531 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 01:30:19,536 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 01:30:19,536 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 01:30:19,541 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 01:30:19,546 [ scc.git] DEBUG Already up to date.
2025-01-09 01:30:19,547 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2025-01-09 01:30:19,925 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-01-09 01:30:19,926 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2025-01-09 01:30:19,930 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2025-01-09 01:30:20,305 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-01-09 01:30:20,305 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2025-01-09 01:30:20,310 [ scc.git] DEBUG Calling 'git fetch origin pull/595/head'
2025-01-09 01:30:20,650 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-01-09 01:30:20,650 [ scc.git] DEBUG * branch refs/pull/595/head -> FETCH_HEAD
2025-01-09 01:30:20,656 [ scc.git] DEBUG Calling 'git fetch origin pull/596/head'
2025-01-09 01:30:20,963 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-01-09 01:30:20,963 [ scc.git] DEBUG * branch refs/pull/596/head -> FETCH_HEAD
2025-01-09 01:30:20,968 [ scc.git] DEBUG Calling 'git fetch origin pull/598/head'
2025-01-09 01:30:21,425 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-01-09 01:30:21,426 [ scc.git] DEBUG * branch refs/pull/598/head -> FETCH_HEAD
2025-01-09 01:30:21,431 [ scc.git] DEBUG Calling 'git fetch origin pull/600/head'
2025-01-09 01:30:21,722 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-01-09 01:30:21,722 [ scc.git] DEBUG * branch refs/pull/600/head -> FETCH_HEAD
2025-01-09 01:30:21,727 [ scc.git] DEBUG Calling 'git fetch origin pull/602/head'
2025-01-09 01:30:22,011 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-01-09 01:30:22,011 [ scc.git] DEBUG * branch refs/pull/602/head -> FETCH_HEAD
2025-01-09 01:30:22,016 [ scc.git] DEBUG ## Unique users: []
2025-01-09 01:30:22,017 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:30:22,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:30:22,022 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2025-01-09 01:30:22,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:30:22,034 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2025-01-09 01:30:22,223 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2025-01-09 01:30:22,223 [ scc.git] DEBUG Auto-merging setup.py
2025-01-09 01:30:22,225 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:30:22,228 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2025-01-09 01:30:22,228 [ scc.git] DEBUG setup.py | 1 +
2025-01-09 01:30:22,228 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2025-01-09 01:30:22,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:30:22,410 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2025-01-09 01:30:22,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:30:22,425 [ 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'
2025-01-09 01:30:22,511 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2025-01-09 01:30:22,512 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2025-01-09 01:30:22,513 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:30:22,517 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2025-01-09 01:30:22,517 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2025-01-09 01:30:22,517 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2025-01-09 01:30:22,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:30:22,800 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...30278b64bb39134a3f1101b600d4a82256e6eaeb'
2025-01-09 01:30:22,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:30:22,815 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 595 (linkify supports urls that include {}[] characters) 30278b64bb39134a3f1101b600d4a82256e6eaeb'
2025-01-09 01:30:23,031 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:30:23,035 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.webclient.actions.js | 2 +-
2025-01-09 01:30:23,035 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-01-09 01:30:23,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:30:23,255 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3aae48f586d7b412538a45b34ddc471a26a286e8'
2025-01-09 01:30:23,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:30:23,270 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 596 (Linkify can parse anchor tag) 3aae48f586d7b412538a45b34ddc471a26a286e8'
2025-01-09 01:30:23,311 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:30:23,315 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 26 ++++++++++++++++++++--
2025-01-09 01:30:23,315 [ scc.git] DEBUG 1 file changed, 24 insertions(+), 2 deletions(-)
2025-01-09 01:30:23,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:30:23,641 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6f07268f880d6159be0bb56eacb20557305152b6'
2025-01-09 01:30:23,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:30:23,657 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 598 (Fix display of ContrastMethod) 6f07268f880d6159be0bb56eacb20557305152b6'
2025-01-09 01:30:23,726 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:30:23,731 [ scc.git] DEBUG omeroweb/webclient/forms.py | 2 +-
2025-01-09 01:30:23,731 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-01-09 01:30:24,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:30:24,033 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f8a449a16e16db1d32aa2e3f703b35e26852c6e4'
2025-01-09 01:30:24,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:30:24,048 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 600 (Remove Python 3.8 from the testing matrix) f8a449a16e16db1d32aa2e3f703b35e26852c6e4'
2025-01-09 01:30:24,142 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:30:24,145 [ scc.git] DEBUG .github/workflows/tox.yml | 1 -
2025-01-09 01:30:24,146 [ scc.git] DEBUG tox.ini | 3 +--
2025-01-09 01:30:24,146 [ scc.git] DEBUG 2 files changed, 1 insertion(+), 3 deletions(-)
2025-01-09 01:30:24,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:30:24,428 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9119372e9fef8cab0e212f02685c8715a3307539'
2025-01-09 01:30:24,438 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:30:24,443 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 602 (Inherit all ann) 9119372e9fef8cab0e212f02685c8715a3307539'
2025-01-09 01:30:24,467 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 01:30:24,472 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/dusty.css | 1 -
2025-01-09 01:30:24,472 [ scc.git] DEBUG .../javascript/ome.right_panel_comments_pane.js | 134 +++++++++++++++++++--
2025-01-09 01:30:24,472 [ scc.git] DEBUG .../javascript/ome.right_panel_fileanns_pane.js | 80 +++++++++++-
2025-01-09 01:30:24,472 [ scc.git] DEBUG .../javascript/ome.right_panel_mapanns_pane.js | 6 +-
2025-01-09 01:30:24,472 [ scc.git] DEBUG .../javascript/ome.right_panel_ratings_pane.js | 33 ++++-
2025-01-09 01:30:24,472 [ scc.git] DEBUG .../javascript/ome.right_panel_tags_pane.js | 92 ++++++++++++--
2025-01-09 01:30:24,472 [ scc.git] DEBUG .../webclient/annotations/comments_underscore.html | 58 +++++++--
2025-01-09 01:30:24,473 [ scc.git] DEBUG .../webclient/annotations/fileanns_underscore.html | 81 ++++++++-----
2025-01-09 01:30:24,473 [ scc.git] DEBUG .../webclient/annotations/mapanns_underscore.html | 4 +
2025-01-09 01:30:24,473 [ scc.git] DEBUG .../webclient/annotations/ratings_underscore.html | 4 +-
2025-01-09 01:30:24,473 [ scc.git] DEBUG .../webclient/annotations/tags_underscore.html | 30 +++--
2025-01-09 01:30:24,473 [ scc.git] DEBUG 11 files changed, 447 insertions(+), 76 deletions(-)
2025-01-09 01:30:24,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:30:24,818 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 01:30:24,861 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 01:30:24,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 01:30:24,866 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 01:30:24,907 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 01:30:24,917 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1028163640> has no local changes
2025-01-09 01:30:24,918 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 585 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 595 sukunis 'linkify supports urls that include {}[] characters'
- PR 596 sukunis 'Linkify can parse anchor tag'
- PR 598 will-moore 'Fix display of ContrastMethod'
- PR 600 sbesson 'Remove Python 3.8 from the testing matrix'
- PR 602 Tom-TBT 'Inherit all ann'
Generated by OMERO-python-superbuild-push#286 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/286/)'
2025-01-09 01:30:24,930 [ scc.git] DEBUG [detached HEAD 36b5c2ac8] merge master -Dorg -Ssuccess-only
2025-01-09 01:30:24,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:30:24,931 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 01:30:24,982 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2025-01-09 01:30:25,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:30:25,230 [ scc.config] DEBUG Found submodule.omero-marshal.url
2025-01-09 01:30:25,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:30:25,623 [ scc.config] DEBUG Found submodule.omero-py.url
2025-01-09 01:30:26,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:30:26,022 [ scc.config] DEBUG Found submodule.omero-scripts.url
2025-01-09 01:30:26,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:30:26,415 [ scc.config] DEBUG Found submodule.omero-web.url
2025-01-09 01:30:26,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 01:30:26,806 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 01:30:26,833 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1029249370> has local changes
2025-01-09 01:30:26,834 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 305 dependabot[bot] 'Bump omero-scripts from `312afbe` to `4b4c755`'
- PR 306 dependabot[bot] 'Bump omero-py from `7da917a` to `ad6cef9`'
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 84 joshmoore 'New JSON-LD context-based version' (stage: draft)
- 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'
- PR 427 Rdornier 'Add fileset folder creation'
- PR 442 sbesson 'Add changelog for 5.19.6 release'
Repository: ome/omero-scripts
Excluded PRs:
- 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.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 585 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 595 sukunis 'linkify supports urls that include {}[] characters'
- PR 596 sukunis 'Linkify can parse anchor tag'
- PR 598 will-moore 'Fix display of ContrastMethod'
- PR 600 sbesson 'Remove Python 3.8 from the testing matrix'
- PR 602 Tom-TBT 'Inherit all ann'
Generated by OMERO-python-superbuild-push#286 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/286/)'
2025-01-09 01:30:26,843 [ scc.git] DEBUG [detached HEAD 3d9cf68] merge master -Dorg -Ssuccess-only
2025-01-09 01:30:26,843 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2025-01-09 01:30:26,844 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2025-01-09 01:30:26,844 [ scc.merge] INFO Already up to date.
2025-01-09 01:30:26,844 [ scc.merge] INFO
2025-01-09 01:30:26,844 [ scc.merge] INFO Merged PRs:
2025-01-09 01:30:26,844 [ scc.merge] INFO - PR 305 dependabot[bot] 'Bump omero-scripts from `312afbe` to `4b4c755`'
2025-01-09 01:30:26,844 [ scc.merge] INFO - PR 306 dependabot[bot] 'Bump omero-py from `7da917a` to `ad6cef9`'
2025-01-09 01:30:26,844 [ scc.merge] INFO
2025-01-09 01:30:26,844 [ scc.merge] INFO Repository: ome/omero-dropbox
2025-01-09 01:30:26,844 [ scc.merge] INFO Already up to date.
2025-01-09 01:30:26,844 [ scc.merge] INFO
2025-01-09 01:30:26,844 [ scc.merge] INFO Merged PRs:
2025-01-09 01:30:26,844 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2025-01-09 01:30:26,844 [ scc.merge] INFO
2025-01-09 01:30:26,844 [ scc.merge] INFO Repository: ome/omero-marshal
2025-01-09 01:30:26,844 [ scc.merge] INFO Excluded PRs:
2025-01-09 01:30:26,844 [ scc.merge] INFO - PR 84 joshmoore 'New JSON-LD context-based version' (stage: draft)
2025-01-09 01:30:26,844 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2025-01-09 01:30:26,844 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2025-01-09 01:30:26,844 [ scc.merge] INFO Already up to date.
2025-01-09 01:30:26,844 [ scc.merge] INFO
2025-01-09 01:30:26,844 [ scc.merge] INFO Merged PRs:
2025-01-09 01:30:26,844 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2025-01-09 01:30:26,844 [ scc.merge] INFO
2025-01-09 01:30:26,844 [ scc.merge] INFO Repository: ome/omero-py
2025-01-09 01:30:26,844 [ scc.merge] INFO Excluded PRs:
2025-01-09 01:30:26,844 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2025-01-09 01:30:26,844 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2025-01-09 01:30:26,844 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2025-01-09 01:30:26,844 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2025-01-09 01:30:26,844 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2025-01-09 01:30:26,845 [ scc.merge] INFO Already up to date.
2025-01-09 01:30:26,845 [ scc.merge] INFO
2025-01-09 01:30:26,845 [ scc.merge] INFO Merged PRs:
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation'
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 442 sbesson 'Add changelog for 5.19.6 release'
2025-01-09 01:30:26,845 [ scc.merge] INFO
2025-01-09 01:30:26,845 [ scc.merge] INFO Repository: ome/omero-scripts
2025-01-09 01:30:26,845 [ scc.merge] INFO Excluded PRs:
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-09 01:30:26,845 [ scc.merge] INFO Already up to date.
2025-01-09 01:30:26,845 [ scc.merge] INFO
2025-01-09 01:30:26,845 [ scc.merge] INFO Merged PRs:
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-09 01:30:26,845 [ scc.merge] INFO
2025-01-09 01:30:26,845 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-09 01:30:26,845 [ scc.merge] INFO
2025-01-09 01:30:26,845 [ scc.merge] INFO Repository: ome/omero-web
2025-01-09 01:30:26,845 [ scc.merge] INFO Excluded PRs:
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2025-01-09 01:30:26,845 [ scc.merge] INFO Already up to date.
2025-01-09 01:30:26,845 [ scc.merge] INFO
2025-01-09 01:30:26,845 [ scc.merge] INFO Merged PRs:
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2025-01-09 01:30:26,845 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2025-01-09 01:30:26,846 [ scc.merge] INFO - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2025-01-09 01:30:26,846 [ scc.merge] INFO - PR 596 sukunis 'Linkify can parse anchor tag'
2025-01-09 01:30:26,846 [ scc.merge] INFO - PR 598 will-moore 'Fix display of ContrastMethod'
2025-01-09 01:30:26,846 [ scc.merge] INFO - PR 600 sbesson 'Remove Python 3.8 from the testing matrix'
2025-01-09 01:30:26,846 [ scc.merge] INFO - PR 602 Tom-TBT 'Inherit all ann'
2025-01-09 01:30:26,846 [ scc.merge] INFO
2025-01-09 01:30:26,846 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-09 01:30:26,846 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 01:30:26,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2025-01-09 01:30:26,851 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 01:30:26,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:30:26,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2025-01-09 01:30:26,855 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 01:30:26,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:30:26,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2025-01-09 01:30:26,859 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 01:30:26,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:30:26,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2025-01-09 01:30:26,863 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 01:30:26,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-01-09 01:30:26,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2025-01-09 01:30:26,867 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 01:30:26,870 [ 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 01fa0c5
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from 6d44f66
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from ad6cef96
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from 96d113830
nothing to commit, working tree clean
HEAD detached from 7d1c1d8
nothing to commit, working tree clean
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/requests/adapters.py", line 667, in send
resp = conn.urlopen(
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/urllib3/connectionpool.py", line 897, in urlopen
return self.urlopen(
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/urllib3/connectionpool.py", line 897, in urlopen
return self.urlopen(
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/urllib3/connectionpool.py", line 897, in urlopen
return self.urlopen(
[Previous line repeated 7 more times]
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/urllib3/connectionpool.py", line 887, in urlopen
retries = retries.increment(method, url, response=response, _pool=self)
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/github/GithubRetry.py", line 205, in increment
return super().increment(method, url, response, error, _pool, _stacktrace)
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/urllib3/util/retry.py", line 594, in increment
raise MaxRetryError(_pool, url, error or ResponseError(cause))
urllib3.exceptions.MaxRetryError: HTTPSConnectionPool(host='api.github.com', port=443): Max retries exceeded with url: /repos/ome/omero-dropbox/forks (Caused by ResponseError('too many 500 error responses'))
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/scc/main.py", line 64, in entry_point
main("scc", items=[
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/yaclifw/framework.py", line 188, in main
ns.func(ns)
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/scc/git.py", line 3533, in __call__
self.push(args, self.main_repo)
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/scc/git.py", line 2210, in push
main_repo.rpush(branch_name, remote, force=True)
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/scc/git.py", line 2041, in rpush
submodule_repo.rpush(branch_name, remote, force=force)
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/scc/git.py", line 2046, in rpush
self.gh.get_user().create_fork(self.origin.repo)
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/github/AuthenticatedUser.py", line 464, in create_fork
return repo.create_fork(
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/github/Repository.py", line 2767, in create_fork
headers, data = self._requester.requestJsonAndCheck(
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/github/Requester.py", line 586, in requestJsonAndCheck
return self.__check(*self.requestJson(verb, url, parameters, headers, input, self.__customConnection(url)))
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/github/Requester.py", line 856, in requestJson
return self.__requestEncode(cnx, verb, url, parameters, headers, input, encode)
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/github/Requester.py", line 977, in __requestEncode
status, responseHeaders, output = self.__requestRaw(cnx, verb, url, requestHeaders, encoded_input)
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/github/Requester.py", line 1011, in __requestRaw
response = cnx.getresponse()
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/github/Requester.py", line 202, in getresponse
r = verb(
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/requests/sessions.py", line 637, in post
return self.request("POST", url, data=data, json=json, **kwargs)
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/requests/sessions.py", line 589, in request
resp = self.send(prep, **send_kwargs)
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/requests/sessions.py", line 703, in send
r = adapter.send(request, **kwargs)
File "/home/omero/workspace/OMERO-python-superbuild-push/build/venv/lib64/python3.9/site-packages/requests/adapters.py", line 691, in send
raise RetryError(e, request=request)
requests.exceptions.RetryError: HTTPSConnectionPool(host='api.github.com', port=443): Max retries exceeded with url: /repos/ome/omero-dropbox/forks (Caused by ResponseError('too many 500 error responses'))
![[Jenkins]](/jenkins/static/695419c3/images/svgs/logo.svg){kind=logo}
