Console Output
+ export BASE_REPO=omero-python-superbuild.git
+ BASE_REPO=omero-python-superbuild.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-12-13 00:34:40,857 [ scc.config] DEBUG Found github.token
2024-12-13 00:34:40,860 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-12-13 00:34:41,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:34:41,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:34:41,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-12-13 00:34:41,831 [ scc.gh] DEBUG 4998 remaining from 5000 (Reset at 01:12
2024-12-13 00:34:41,832 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-13 00:34:41,836 [ scc.git] DEBUG Check current status
2024-12-13 00:34:41,837 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-13 00:34:41,841 [ scc.git] DEBUG d78ee19 Merge pull request #302 from ome/dependabot/submodules/omero-py-7e296f2
2024-12-13 00:34:41,841 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-13 00:34:41,893 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2024-12-13 00:34:41,896 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2024-12-13 00:34:41,944 [ scc.git] DEBUG 7e296f2e547155c4d8c914c55caf67261069eebe omero-py (v5.19.5-5-g7e296f2e)
2024-12-13 00:34:41,948 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-12-13 00:34:41,954 [ scc.git] DEBUG a1483bf008b05162b21f92d286133d501083acd7 omero-web (v5.28.0-3-ga1483bf00)
2024-12-13 00:34:41,959 [ scc.config] DEBUG Found remote.origin.url
2024-12-13 00:34:42,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-12-13 00:34:42,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-13 00:34:43,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-13 00:34:43,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-13 00:34:44,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-13 00:34:44,118 [ scc.git] DEBUG Resetting...
2024-12-13 00:34:44,118 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-12-13 00:34:44,124 [ scc.git] DEBUG HEAD is now at d78ee19 Merge pull request #302 from ome/dependabot/submodules/omero-py-7e296f2
2024-12-13 00:34:44,124 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-12-13 00:34:44,181 [ scc.git] DEBUG Check current status
2024-12-13 00:34:44,181 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-13 00:34:44,185 [ scc.git] DEBUG d78ee19 Merge pull request #302 from ome/dependabot/submodules/omero-py-7e296f2
2024-12-13 00:34:44,185 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-13 00:34:44,226 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2024-12-13 00:34:44,229 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2024-12-13 00:34:44,233 [ scc.git] DEBUG 7e296f2e547155c4d8c914c55caf67261069eebe omero-py (v5.19.5-5-g7e296f2e)
2024-12-13 00:34:44,236 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-12-13 00:34:44,240 [ scc.git] DEBUG a1483bf008b05162b21f92d286133d501083acd7 omero-web (v5.28.0-3-ga1483bf00)
2024-12-13 00:34:44,241 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-12-13 00:34:44,241 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-12-13 00:34:44,241 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-12-13 00:34:44,241 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-12-13 00:34:44,241 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-12-13 00:34:44,241 [ scc.repo] DEBUG ## PRs found:
2024-12-13 00:34:44,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-12-13 00:34:44,574 [ scc.repo] DEBUG ## Branches found:
2024-12-13 00:34:44,575 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:34:44,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:34:44,579 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-13 00:34:44,583 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-13 00:34:44,583 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-13 00:34:44,588 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-13 00:34:44,592 [ scc.git] DEBUG Already up to date.
2024-12-13 00:34:44,592 [ scc.git] DEBUG ## Unique users: []
2024-12-13 00:34:44,593 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:34:44,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:34:44,596 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-13 00:34:44,636 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:34:44,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:34:44,640 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-13 00:34:45,072 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f30f28b0100> has no local changes
2024-12-13 00:34:45,073 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Generated by OMERO-python-superbuild-push#262 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/262/)'
2024-12-13 00:34:45,109 [ scc.git] DEBUG [detached HEAD cf2a656] merge master -Dorg -Snone
2024-12-13 00:34:45,109 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-12-13 00:34:45,109 [ scc.merge] INFO Already up to date.
2024-12-13 00:34:45,109 [ scc.merge] INFO
2024-12-13 00:34:45,109 [ scc.merge] INFO
2024-12-13 00:34:45,109 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-13 00:34:45,109 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
From https://github.com/ome/omero-py
7e296f2e..7da917a7 master -> origin/master
Submodule path 'omero-py': checked out '7da917a77ea9c1142dc4b992261e79466e897244'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-12-13 00:34:47,468 [ scc.config] DEBUG Found github.token
2024-12-13 00:34:47,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-12-13 00:34:47,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:34:48,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:34:48,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-12-13 00:34:48,393 [ scc.gh] DEBUG 4990 remaining from 5000 (Reset at 01:12
2024-12-13 00:34:48,393 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-13 00:34:48,398 [ scc.git] DEBUG Check current status
2024-12-13 00:34:48,398 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-13 00:34:48,402 [ scc.git] DEBUG cf2a656 merge master -Dorg -Snone
2024-12-13 00:34:48,402 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-13 00:34:48,440 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2024-12-13 00:34:48,443 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2024-12-13 00:34:48,447 [ scc.git] DEBUG +7da917a77ea9c1142dc4b992261e79466e897244 omero-py (v5.19.5-11-g7da917a7)
2024-12-13 00:34:48,450 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-12-13 00:34:48,455 [ scc.git] DEBUG a1483bf008b05162b21f92d286133d501083acd7 omero-web (v5.28.0-3-ga1483bf00)
2024-12-13 00:34:48,459 [ scc.config] DEBUG Found remote.origin.url
2024-12-13 00:34:48,459 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-12-13 00:34:48,461 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-12-13 00:34:48,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-12-13 00:34:49,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-13 00:34:49,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-13 00:34:50,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-13 00:34:50,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-13 00:34:50,629 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-13 00:34:50,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-12-13 00:34:50,677 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-13 00:34:50,680 [ scc.git] DEBUG Check current status
2024-12-13 00:34:50,681 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-13 00:34:50,684 [ scc.git] DEBUG 01fa0c5 Merge pull request #24 from jburel/build
2024-12-13 00:34:50,684 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-13 00:34:50,722 [ scc.config] DEBUG Found remote.origin.url
2024-12-13 00:34:51,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-12-13 00:34:51,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-13 00:34:51,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-13 00:34:52,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-13 00:34:52,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-13 00:34:52,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-13 00:34:52,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:34:52,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-12-13 00:34:52,885 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-13 00:34:52,890 [ scc.git] DEBUG Check current status
2024-12-13 00:34:52,890 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-13 00:34:52,894 [ scc.git] DEBUG 6d44f66 Merge pull request #82 from jburel/build
2024-12-13 00:34:52,894 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-13 00:34:52,934 [ scc.config] DEBUG Found remote.origin.url
2024-12-13 00:34:53,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-12-13 00:34:53,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-13 00:34:54,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-13 00:34:54,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-13 00:34:54,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-13 00:34:54,981 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-13 00:34:55,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:34:55,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-12-13 00:34:55,022 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-13 00:34:55,026 [ scc.git] DEBUG Check current status
2024-12-13 00:34:55,026 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-13 00:34:55,048 [ scc.git] DEBUG 7da917a7 Merge pull request #439 from tstoeter/patch-1
2024-12-13 00:34:55,049 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-13 00:34:55,096 [ scc.config] DEBUG Found remote.origin.url
2024-12-13 00:34:55,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-12-13 00:34:55,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-13 00:34:56,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-13 00:34:56,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-13 00:34:57,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-13 00:34:57,115 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-13 00:34:57,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:34:57,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-12-13 00:34:57,155 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-13 00:34:57,160 [ scc.git] DEBUG Check current status
2024-12-13 00:34:57,160 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-13 00:34:57,165 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-12-13 00:34:57,166 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-13 00:34:57,209 [ scc.config] DEBUG Found remote.origin.url
2024-12-13 00:34:57,210 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-12-13 00:34:57,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-12-13 00:34:58,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-13 00:34:58,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-13 00:34:58,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-13 00:34:59,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-13 00:34:59,317 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-13 00:34:59,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:34:59,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-12-13 00:34:59,361 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-12-13 00:34:59,365 [ scc.git] DEBUG Check current status
2024-12-13 00:34:59,365 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-13 00:34:59,453 [ scc.git] DEBUG a1483bf00 Merge pull request #599 from knabar/maint-build
2024-12-13 00:34:59,454 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-13 00:34:59,499 [ scc.config] DEBUG Found remote.origin.url
2024-12-13 00:34:59,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-12-13 00:35:00,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-12-13 00:35:00,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-12-13 00:35:01,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-12-13 00:35:01,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-12-13 00:35:01,489 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-13 00:35:01,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:35:01,527 [ scc.git] DEBUG Resetting...
2024-12-13 00:35:01,527 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-12-13 00:35:01,532 [ scc.git] DEBUG HEAD is now at cf2a656 merge master -Dorg -Snone
2024-12-13 00:35:01,533 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-12-13 00:35:01,591 [ scc.git] DEBUG Submodule path 'omero-py': checked out '7e296f2e547155c4d8c914c55caf67261069eebe'
2024-12-13 00:35:01,599 [ scc.git] DEBUG Check current status
2024-12-13 00:35:01,599 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-12-13 00:35:01,603 [ scc.git] DEBUG cf2a656 merge master -Dorg -Snone
2024-12-13 00:35:01,603 [ scc.git] DEBUG Calling 'git submodule status'
2024-12-13 00:35:01,641 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2024-12-13 00:35:01,643 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2024-12-13 00:35:01,647 [ scc.git] DEBUG 7e296f2e547155c4d8c914c55caf67261069eebe omero-py (v5.19.5-5-g7e296f2e)
2024-12-13 00:35:01,650 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-12-13 00:35:01,654 [ scc.git] DEBUG a1483bf008b05162b21f92d286133d501083acd7 omero-web (v5.28.0-3-ga1483bf00)
2024-12-13 00:35:01,655 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-12-13 00:35:01,655 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-12-13 00:35:01,655 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-12-13 00:35:01,655 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-12-13 00:35:01,655 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-12-13 00:35:01,655 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-12-13 00:35:01,655 [ scc.repo] DEBUG ## PRs found:
2024-12-13 00:35:01,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-12-13 00:35:01,904 [ scc.repo] DEBUG ## Branches found:
2024-12-13 00:35:01,904 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:35:01,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:01,909 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-13 00:35:01,912 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-13 00:35:01,912 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-13 00:35:01,917 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-13 00:35:01,922 [ scc.git] DEBUG Already up to date.
2024-12-13 00:35:01,922 [ scc.git] DEBUG ## Unique users: []
2024-12-13 00:35:01,922 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:35:01,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:01,926 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-13 00:35:01,967 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:35:01,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:01,972 [ scc.repo] DEBUG ## PRs found:
2024-12-13 00:35:02,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-12-13 00:35:03,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-12-13 00:35:03,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-12-13 00:35:04,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-12-13 00:35:04,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:05,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-12-13 00:35:05,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-12-13 00:35:05,510 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-12-13 00:35:05,510 [ scc.repo] DEBUG ## Branches found:
2024-12-13 00:35:05,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-12-13 00:35:05,510 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:35:05,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:05,515 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-13 00:35:05,519 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-13 00:35:05,519 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-13 00:35:05,524 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-13 00:35:05,528 [ scc.git] DEBUG Already up to date.
2024-12-13 00:35:05,528 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-12-13 00:35:05,943 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-12-13 00:35:05,943 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-12-13 00:35:05,948 [ scc.git] DEBUG ## Unique users: []
2024-12-13 00:35:05,948 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:35:05,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:05,952 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-12-13 00:35:05,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:05,960 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-12-13 00:35:06,428 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-12-13 00:35:06,428 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-12-13 00:35:06,428 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-12-13 00:35:06,428 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-12-13 00:35:06,428 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-12-13 00:35:06,428 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-12-13 00:35:06,428 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-12-13 00:35:06,428 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-12-13 00:35:06,428 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-12-13 00:35:06,428 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:35:06,432 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-12-13 00:35:06,432 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-12-13 00:35:06,432 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-12-13 00:35:06,432 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-12-13 00:35:06,432 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-12-13 00:35:06,432 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-12-13 00:35:06,432 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-12-13 00:35:06,432 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-12-13 00:35:06,434 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-12-13 00:35:06,434 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-12-13 00:35:06,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:35:06,583 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-13 00:35:06,621 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:35:06,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:06,627 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-13 00:35:06,664 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-13 00:35:06,670 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10d1c07b50> has no local changes
2024-12-13 00:35:06,670 [ 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#262 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/262/)'
2024-12-13 00:35:06,678 [ scc.git] DEBUG [detached HEAD 941492e] merge master -Dorg -Ssuccess-only
2024-12-13 00:35:06,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:35:06,678 [ scc.repo] DEBUG ## PRs found:
2024-12-13 00:35:07,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-12-13 00:35:07,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/84 HTTP/1.1" 200 None
2024-12-13 00:35:08,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-12-13 00:35:08,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-12-13 00:35:09,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-12-13 00:35:09,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:10,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-12-13 00:35:10,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-12-13 00:35:10,463 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-12-13 00:35:10,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-12-13 00:35:11,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-12-13 00:35:11,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-12-13 00:35:12,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-12-13 00:35:12,383 [ scc.repo] DEBUG ## Branches found:
2024-12-13 00:35:12,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-12-13 00:35:12,383 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:35:12,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:12,388 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-13 00:35:12,392 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-13 00:35:12,392 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-13 00:35:12,396 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-13 00:35:12,400 [ scc.git] DEBUG Already up to date.
2024-12-13 00:35:12,401 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-12-13 00:35:12,774 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-12-13 00:35:12,774 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-12-13 00:35:12,779 [ scc.git] DEBUG ## Unique users: []
2024-12-13 00:35:12,779 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:35:12,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:12,783 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-12-13 00:35:12,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:12,791 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-12-13 00:35:12,802 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-12-13 00:35:12,802 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:35:12,805 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-12-13 00:35:12,805 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-12-13 00:35:12,805 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-12-13 00:35:12,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:35:12,944 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-13 00:35:12,983 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:35:12,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:12,987 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-13 00:35:13,024 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-13 00:35:13,030 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10d1bd6d00> has no local changes
2024-12-13 00:35:13,030 [ 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#262 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/262/)'
2024-12-13 00:35:13,037 [ scc.git] DEBUG [detached HEAD c258b82] merge master -Dorg -Ssuccess-only
2024-12-13 00:35:13,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:35:13,037 [ scc.repo] DEBUG ## PRs found:
2024-12-13 00:35:13,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-12-13 00:35:14,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-12-13 00:35:14,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-12-13 00:35:15,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427/comments HTTP/1.1" 200 None
2024-12-13 00:35:15,190 [ scc.repo] DEBUG # ... Include label: include
2024-12-13 00:35:15,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-12-13 00:35:16,306 [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
2024-12-13 00:35:16,794 [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
2024-12-13 00:35:17,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-12-13 00:35:17,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1?per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:18,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1 HTTP/1.1" 200 None
2024-12-13 00:35:18,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1/status HTTP/1.1" 200 None
2024-12-13 00:35:18,636 [ scc.repo] DEBUG - PR 427 Rdornier 'Add fileset folder creation'
2024-12-13 00:35:19,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-12-13 00:35:19,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-12-13 00:35:20,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-12-13 00:35:20,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:21,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-13 00:35:21,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-12-13 00:35:22,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:22,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-12-13 00:35:22,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-12-13 00:35:22,917 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-12-13 00:35:23,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-12-13 00:35:23,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-12-13 00:35:24,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-12-13 00:35:24,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:25,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-13 00:35:25,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-12-13 00:35:26,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-12-13 00:35:26,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:27,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-13 00:35:27,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-12-13 00:35:28,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:28,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-12-13 00:35:28,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-12-13 00:35:28,992 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-12-13 00:35:29,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-12-13 00:35:29,493 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-12-13 00:35:29,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-12-13 00:35:30,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-12-13 00:35:30,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-12-13 00:35:31,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:31,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-12-13 00:35:32,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-12-13 00:35:32,274 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-12-13 00:35:32,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-12-13 00:35:33,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-12-13 00:35:33,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-12-13 00:35:34,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:34,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-13 00:35:35,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-12-13 00:35:35,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:36,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-12-13 00:35:36,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-12-13 00:35:36,484 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-12-13 00:35:36,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-12-13 00:35:37,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-12-13 00:35:37,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-12-13 00:35:38,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-12-13 00:35:38,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-12-13 00:35:39,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:39,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-12-13 00:35:40,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-12-13 00:35:40,224 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-12-13 00:35:40,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-12-13 00:35:41,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-12-13 00:35:41,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:42,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-12-13 00:35:42,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-12-13 00:35:42,759 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-12-13 00:35:43,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-12-13 00:35:43,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-12-13 00:35:44,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-12-13 00:35:44,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:45,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-12-13 00:35:45,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-12-13 00:35:45,636 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-12-13 00:35:46,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-12-13 00:35:46,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-12-13 00:35:47,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-12-13 00:35:47,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:35:48,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-12-13 00:35:48,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-12-13 00:35:48,571 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-12-13 00:35:49,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-12-13 00:35:49,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-12-13 00:35:50,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-12-13 00:35:50,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-12-13 00:35:50,470 [ scc.repo] DEBUG ## Branches found:
2024-12-13 00:35:50,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-12-13 00:35:50,470 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:35:50,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:50,475 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-13 00:35:50,480 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-13 00:35:50,480 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-13 00:35:50,486 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-13 00:35:50,499 [ scc.git] DEBUG Updating 7e296f2e..7da917a7
2024-12-13 00:35:51,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls/439 HTTP/1.1" 200 None
2024-12-13 00:35:51,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls/440 HTTP/1.1" 200 None
2024-12-13 00:35:51,665 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-12-13 00:35:51,999 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-13 00:35:52,000 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-12-13 00:35:52,004 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-12-13 00:35:52,329 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-13 00:35:52,329 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-12-13 00:35:52,334 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-12-13 00:35:52,880 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-13 00:35:52,881 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-12-13 00:35:52,885 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-12-13 00:35:53,177 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-13 00:35:53,177 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-12-13 00:35:53,182 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-12-13 00:35:53,630 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-13 00:35:53,630 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-12-13 00:35:53,635 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-12-13 00:35:53,933 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-13 00:35:53,933 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-12-13 00:35:53,938 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-12-13 00:35:54,228 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-13 00:35:54,228 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-12-13 00:35:54,233 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-12-13 00:35:54,521 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-13 00:35:54,521 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-12-13 00:35:54,526 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-12-13 00:35:55,193 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-12-13 00:35:55,193 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-12-13 00:35:55,197 [ scc.git] DEBUG ## Unique users: []
2024-12-13 00:35:55,197 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:35:55,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:55,202 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-12-13 00:35:55,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:55,216 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-12-13 00:35:55,240 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-12-13 00:35:55,240 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-12-13 00:35:55,241 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:35:55,244 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-12-13 00:35:55,245 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-12-13 00:35:55,245 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-12-13 00:35:55,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:35:55,394 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-12-13 00:35:55,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:55,409 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-12-13 00:35:55,553 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-12-13 00:35:55,553 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-12-13 00:35:55,554 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:35:55,560 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-12-13 00:35:55,560 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-12-13 00:35:55,560 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-12-13 00:35:55,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:35:55,792 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-12-13 00:35:55,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:55,807 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-12-13 00:35:55,829 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-12-13 00:35:55,829 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:35:55,832 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-12-13 00:35:55,832 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-12-13 00:35:56,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:35:56,190 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-12-13 00:35:56,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:56,205 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2024-12-13 00:35:56,226 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-12-13 00:35:56,226 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-12-13 00:35:56,227 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:35:56,230 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-12-13 00:35:56,230 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-12-13 00:35:56,230 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-12-13 00:35:56,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:35:56,616 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-12-13 00:35:56,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:56,630 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-12-13 00:35:56,649 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:35:56,652 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-12-13 00:35:56,652 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-12-13 00:35:56,652 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-12-13 00:35:56,652 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-12-13 00:35:56,652 [ scc.git] DEBUG create mode 100644 connect.py
2024-12-13 00:35:57,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:35:57,025 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-12-13 00:35:57,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:57,041 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-12-13 00:35:57,060 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-12-13 00:35:57,061 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:35:57,064 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-12-13 00:35:57,064 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-12-13 00:35:57,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:35:57,423 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-12-13 00:35:57,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:57,440 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-12-13 00:35:57,460 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-12-13 00:35:57,460 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:35:57,464 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-12-13 00:35:57,464 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-12-13 00:35:57,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:35:57,811 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-12-13 00:35:57,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:57,826 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-12-13 00:35:57,918 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-12-13 00:35:57,919 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:35:57,925 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-12-13 00:35:57,925 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-12-13 00:35:58,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:35:58,196 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-12-13 00:35:58,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:58,211 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Add fileset folder creation) ed3c6840a5a48ed1a8fa7cd2fd286a185f6017c1'
2024-12-13 00:35:58,239 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:35:58,242 [ scc.git] DEBUG .gitignore | 1 +
2024-12-13 00:35:58,242 [ scc.git] DEBUG src/omero/plugins/download.py | 17 ++++++++++++-----
2024-12-13 00:35:58,242 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 5 deletions(-)
2024-12-13 00:35:58,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:35:58,588 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-13 00:35:58,627 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:35:58,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:35:58,632 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-13 00:35:58,669 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-13 00:35:58,675 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10d0ae3880> has no local changes
2024-12-13 00:35:58,675 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
- 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)
Updating 7e296f2e..7da917a7
Previously merged:
- PR 439 tstoeter 'Fixes issue #438'
- PR 440 sbesson 'Upgrade to macOS 14 Actions runner image'
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'
Generated by OMERO-python-superbuild-push#262 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/262/)'
2024-12-13 00:35:58,684 [ scc.git] DEBUG [detached HEAD 47653849] merge master -Dorg -Ssuccess-only
2024-12-13 00:35:58,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:35:58,684 [ scc.git] INFO Overriding base-branch from master to develop
2024-12-13 00:35:58,684 [ scc.repo] DEBUG ## PRs found:
2024-12-13 00:35:59,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-12-13 00:35:59,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-12-13 00:36:00,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-12-13 00:36:00,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-13 00:36:01,160 [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
2024-12-13 00:36:01,600 [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
2024-12-13 00:36:02,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-13 00:36:02,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-12-13 00:36:02,566 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-13 00:36:03,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-12-13 00:36:03,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-12-13 00:36:04,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-12-13 00:36:04,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-12-13 00:36:05,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-12-13 00:36:05,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-13 00:36:06,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:36:06,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-13 00:36:07,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-12-13 00:36:07,063 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-13 00:36:07,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-12-13 00:36:08,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-12-13 00:36:08,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-12-13 00:36:09,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-12-13 00:36:09,056 [ scc.repo] DEBUG ## Branches found:
2024-12-13 00:36:09,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-12-13 00:36:09,056 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:36:09,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:09,061 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-12-13 00:36:09,064 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-13 00:36:09,064 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-12-13 00:36:09,069 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-12-13 00:36:09,073 [ scc.git] DEBUG Already up to date.
2024-12-13 00:36:09,073 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-12-13 00:36:09,413 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-12-13 00:36:09,413 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-12-13 00:36:09,417 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-12-13 00:36:09,989 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-12-13 00:36:09,989 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-12-13 00:36:09,995 [ scc.git] DEBUG ## Unique users: []
2024-12-13 00:36:09,995 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:36:09,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:09,999 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-13 00:36:10,006 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:10,009 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-13 00:36:10,108 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-12-13 00:36:10,108 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-12-13 00:36:10,109 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-13 00:36:10,109 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-13 00:36:10,113 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-13 00:36:10,118 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-12-13 00:36:10,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:10,266 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-13 00:36:10,272 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-13 00:36:10,276 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#262](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/262/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/262/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-12-13 00:36:10,280 [ scc.config] DEBUG Found github.token
2024-12-13 00:36:10,280 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-12-13 00:36:10,280 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-13 00:36:10,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:10,288 [ 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'
2024-12-13 00:36:10,348 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:36:10,350 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-12-13 00:36:10,350 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-12-13 00:36:10,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:10,659 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-13 00:36:10,701 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:36:10,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:10,706 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-13 00:36:10,748 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-13 00:36:10,754 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10d0ae36a0> has no local changes
2024-12-13 00:36:10,755 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 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#262 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/262/)'
2024-12-13 00:36:10,765 [ scc.git] DEBUG [detached HEAD 050fce8] merge master -Dorg -Ssuccess-only
2024-12-13 00:36:10,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:36:10,766 [ scc.repo] DEBUG ## PRs found:
2024-12-13 00:36:11,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-12-13 00:36:11,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/602 HTTP/1.1" 200 None
2024-12-13 00:36:12,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/601 HTTP/1.1" 200 None
2024-12-13 00:36:12,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7ca7b766522f4cbc823490273007a47a79774090 HTTP/1.1" 200 None
2024-12-13 00:36:13,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7ca7b766522f4cbc823490273007a47a79774090/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:36:13,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7ca7b766522f4cbc823490273007a47a79774090/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-13 00:36:14,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7ca7b766522f4cbc823490273007a47a79774090 HTTP/1.1" 200 None
2024-12-13 00:36:14,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/7ca7b766522f4cbc823490273007a47a79774090?per_page=1 HTTP/1.1" 200 None
2024-12-13 00:36:15,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7ca7b766522f4cbc823490273007a47a79774090 HTTP/1.1" 200 None
2024-12-13 00:36:15,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7ca7b766522f4cbc823490273007a47a79774090/status HTTP/1.1" 200 None
2024-12-13 00:36:15,718 [ scc.repo] DEBUG - PR 601 jburel 'Remove remaining usage of sdist'
2024-12-13 00:36:16,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/600 HTTP/1.1" 200 None
2024-12-13 00:36:16,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4 HTTP/1.1" 200 None
2024-12-13 00:36:17,155 [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
2024-12-13 00:36:17,639 [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
2024-12-13 00:36:18,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4 HTTP/1.1" 200 None
2024-12-13 00:36:18,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/f8a449a16e16db1d32aa2e3f703b35e26852c6e4?per_page=1 HTTP/1.1" 200 None
2024-12-13 00:36:19,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4 HTTP/1.1" 200 None
2024-12-13 00:36:19,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f8a449a16e16db1d32aa2e3f703b35e26852c6e4/status HTTP/1.1" 200 None
2024-12-13 00:36:19,458 [ scc.repo] DEBUG - PR 600 sbesson 'Remove Python 3.8 from the testing matrix'
2024-12-13 00:36:19,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/598 HTTP/1.1" 200 None
2024-12-13 00:36:20,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/598/comments HTTP/1.1" 200 None
2024-12-13 00:36:20,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6 HTTP/1.1" 200 None
2024-12-13 00:36:21,383 [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
2024-12-13 00:36:21,841 [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
2024-12-13 00:36:22,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6 HTTP/1.1" 200 None
2024-12-13 00:36:22,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/6f07268f880d6159be0bb56eacb20557305152b6?per_page=1 HTTP/1.1" 200 None
2024-12-13 00:36:23,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6 HTTP/1.1" 200 None
2024-12-13 00:36:23,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6f07268f880d6159be0bb56eacb20557305152b6/status HTTP/1.1" 200 None
2024-12-13 00:36:23,715 [ scc.repo] DEBUG - PR 598 will-moore 'Fix display of ContrastMethod'
2024-12-13 00:36:24,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596 HTTP/1.1" 200 None
2024-12-13 00:36:24,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596/comments HTTP/1.1" 200 None
2024-12-13 00:36:25,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-12-13 00:36:25,656 [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
2024-12-13 00:36:26,097 [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
2024-12-13 00:36:26,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-12-13 00:36:27,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/3aae48f586d7b412538a45b34ddc471a26a286e8?per_page=1 HTTP/1.1" 200 None
2024-12-13 00:36:27,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2024-12-13 00:36:27,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/status HTTP/1.1" 200 None
2024-12-13 00:36:27,963 [ scc.repo] DEBUG - PR 596 sukunis 'Linkify can parse anchor tag'
2024-12-13 00:36:28,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595 HTTP/1.1" 200 None
2024-12-13 00:36:28,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595/comments HTTP/1.1" 200 None
2024-12-13 00:36:29,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-12-13 00:36:30,007 [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
2024-12-13 00:36:30,481 [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
2024-12-13 00:36:30,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-12-13 00:36:31,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/30278b64bb39134a3f1101b600d4a82256e6eaeb?per_page=1 HTTP/1.1" 200 None
2024-12-13 00:36:31,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2024-12-13 00:36:32,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/status HTTP/1.1" 200 None
2024-12-13 00:36:32,221 [ scc.repo] DEBUG - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2024-12-13 00:36:32,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/585 HTTP/1.1" 200 None
2024-12-13 00:36:33,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-12-13 00:36:33,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-12-13 00:36:34,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-12-13 00:36:34,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-12-13 00:36:35,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-12-13 00:36:35,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:36:36,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-13 00:36:36,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-12-13 00:36:37,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-12-13 00:36:37,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-12-13 00:36:38,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-12-13 00:36:38,035 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-12-13 00:36:38,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-12-13 00:36:39,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-12-13 00:36:39,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-12-13 00:36:40,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:36:40,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-13 00:36:41,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-12-13 00:36:41,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-12-13 00:36:41,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-12-13 00:36:42,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-12-13 00:36:42,378 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-12-13 00:36:42,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-12-13 00:36:43,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-12-13 00:36:43,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-12-13 00:36:44,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-13 00:36:44,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-13 00:36:44,774 [ scc.repo] DEBUG ## Branches found:
2024-12-13 00:36:44,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-12-13 00:36:44,774 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:36:44,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:44,779 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-13 00:36:44,783 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-13 00:36:44,783 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-13 00:36:44,788 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-13 00:36:44,793 [ scc.git] DEBUG Already up to date.
2024-12-13 00:36:44,794 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-12-13 00:36:45,207 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-13 00:36:45,208 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-12-13 00:36:45,212 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-12-13 00:36:45,516 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-13 00:36:45,517 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-12-13 00:36:45,521 [ scc.git] DEBUG Calling 'git fetch origin pull/595/head'
2024-12-13 00:36:45,919 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-13 00:36:45,919 [ scc.git] DEBUG * branch refs/pull/595/head -> FETCH_HEAD
2024-12-13 00:36:45,924 [ scc.git] DEBUG Calling 'git fetch origin pull/596/head'
2024-12-13 00:36:46,212 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-13 00:36:46,212 [ scc.git] DEBUG * branch refs/pull/596/head -> FETCH_HEAD
2024-12-13 00:36:46,217 [ scc.git] DEBUG Calling 'git fetch origin pull/598/head'
2024-12-13 00:36:46,779 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-13 00:36:46,779 [ scc.git] DEBUG * branch refs/pull/598/head -> FETCH_HEAD
2024-12-13 00:36:46,784 [ scc.git] DEBUG Calling 'git fetch origin pull/600/head'
2024-12-13 00:36:47,186 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-13 00:36:47,186 [ scc.git] DEBUG * branch refs/pull/600/head -> FETCH_HEAD
2024-12-13 00:36:47,191 [ scc.git] DEBUG Calling 'git fetch origin pull/601/head'
2024-12-13 00:36:47,664 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-12-13 00:36:47,664 [ scc.git] DEBUG * branch refs/pull/601/head -> FETCH_HEAD
2024-12-13 00:36:47,669 [ scc.git] DEBUG ## Unique users: []
2024-12-13 00:36:47,669 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:36:47,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:47,674 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-12-13 00:36:47,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:47,685 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-12-13 00:36:47,781 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-12-13 00:36:47,781 [ scc.git] DEBUG Auto-merging setup.py
2024-12-13 00:36:47,782 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:36:47,786 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-12-13 00:36:47,786 [ scc.git] DEBUG setup.py | 1 +
2024-12-13 00:36:47,786 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-12-13 00:36:47,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:47,923 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-12-13 00:36:47,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:47,936 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-12-13 00:36:48,087 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-12-13 00:36:48,087 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-12-13 00:36:48,088 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:36:48,092 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-12-13 00:36:48,092 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-12-13 00:36:48,092 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-12-13 00:36:48,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:48,308 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...30278b64bb39134a3f1101b600d4a82256e6eaeb'
2024-12-13 00:36:48,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:48,322 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 595 (linkify supports urls that include {}[] characters) 30278b64bb39134a3f1101b600d4a82256e6eaeb'
2024-12-13 00:36:48,374 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:36:48,378 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.webclient.actions.js | 2 +-
2024-12-13 00:36:48,378 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-12-13 00:36:48,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:48,691 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3aae48f586d7b412538a45b34ddc471a26a286e8'
2024-12-13 00:36:48,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:48,707 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 596 (Linkify can parse anchor tag) 3aae48f586d7b412538a45b34ddc471a26a286e8'
2024-12-13 00:36:48,978 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:36:48,982 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 26 ++++++++++++++++++++--
2024-12-13 00:36:48,982 [ scc.git] DEBUG 1 file changed, 24 insertions(+), 2 deletions(-)
2024-12-13 00:36:49,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:49,116 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6f07268f880d6159be0bb56eacb20557305152b6'
2024-12-13 00:36:49,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:49,129 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 598 (Fix display of ContrastMethod) 6f07268f880d6159be0bb56eacb20557305152b6'
2024-12-13 00:36:49,155 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:36:49,159 [ scc.git] DEBUG omeroweb/webclient/forms.py | 2 +-
2024-12-13 00:36:49,159 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-12-13 00:36:49,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:49,500 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f8a449a16e16db1d32aa2e3f703b35e26852c6e4'
2024-12-13 00:36:49,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:49,514 [ 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'
2024-12-13 00:36:49,603 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:36:49,608 [ scc.git] DEBUG .github/workflows/tox.yml | 1 -
2024-12-13 00:36:49,608 [ scc.git] DEBUG tox.ini | 3 +--
2024-12-13 00:36:49,608 [ scc.git] DEBUG 2 files changed, 1 insertion(+), 3 deletions(-)
2024-12-13 00:36:49,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:49,885 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7ca7b766522f4cbc823490273007a47a79774090'
2024-12-13 00:36:49,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:49,899 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 601 (Remove remaining usage of sdist) 7ca7b766522f4cbc823490273007a47a79774090'
2024-12-13 00:36:49,974 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-13 00:36:49,977 [ scc.git] DEBUG .github/workflows/install.yml | 2 +-
2024-12-13 00:36:49,977 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-12-13 00:36:50,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:50,264 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-13 00:36:50,304 [ scc.git] DEBUG Get sha1 of %s
2024-12-13 00:36:50,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-13 00:36:50,309 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-13 00:36:50,345 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-13 00:36:50,355 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10d0b40f40> has no local changes
2024-12-13 00:36:50,355 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 602 Tom-TBT 'Inherit all ann' (user: Tom-TBT)
- 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 601 jburel 'Remove remaining usage of sdist'
Generated by OMERO-python-superbuild-push#262 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/262/)'
2024-12-13 00:36:50,364 [ scc.git] DEBUG [detached HEAD dd0087938] merge master -Dorg -Ssuccess-only
2024-12-13 00:36:50,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:36:50,365 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-13 00:36:50,412 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-12-13 00:36:50,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:50,662 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-12-13 00:36:51,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:51,048 [ scc.config] DEBUG Found submodule.omero-py.url
2024-12-13 00:36:51,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:51,430 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-12-13 00:36:51,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:51,808 [ scc.config] DEBUG Found submodule.omero-web.url
2024-12-13 00:36:52,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-13 00:36:52,215 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-13 00:36:52,239 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10d20ca100> has local changes
2024-12-13 00:36:52,240 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 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 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
- 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)
Updating 7e296f2e..7da917a7
Previously merged:
- PR 439 tstoeter 'Fixes issue #438'
- PR 440 sbesson 'Upgrade to macOS 14 Actions runner image'
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'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- 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 602 Tom-TBT 'Inherit all ann' (user: Tom-TBT)
- 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 601 jburel 'Remove remaining usage of sdist'
Generated by OMERO-python-superbuild-push#262 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/262/)'
2024-12-13 00:36:52,248 [ scc.git] DEBUG [detached HEAD b145dcd] merge master -Dorg -Ssuccess-only
2024-12-13 00:36:52,249 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-12-13 00:36:52,249 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-12-13 00:36:52,249 [ scc.merge] INFO Already up to date.
2024-12-13 00:36:52,249 [ scc.merge] INFO
2024-12-13 00:36:52,249 [ scc.merge] INFO
2024-12-13 00:36:52,249 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-12-13 00:36:52,249 [ scc.merge] INFO Already up to date.
2024-12-13 00:36:52,249 [ scc.merge] INFO
2024-12-13 00:36:52,249 [ scc.merge] INFO Merged PRs:
2024-12-13 00:36:52,249 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-12-13 00:36:52,249 [ scc.merge] INFO
2024-12-13 00:36:52,249 [ scc.merge] INFO Repository: ome/omero-marshal
2024-12-13 00:36:52,249 [ scc.merge] INFO Excluded PRs:
2024-12-13 00:36:52,249 [ scc.merge] INFO - PR 84 joshmoore 'New JSON-LD context-based version' (stage: draft)
2024-12-13 00:36:52,249 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-12-13 00:36:52,249 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-12-13 00:36:52,249 [ scc.merge] INFO Already up to date.
2024-12-13 00:36:52,249 [ scc.merge] INFO
2024-12-13 00:36:52,249 [ scc.merge] INFO Merged PRs:
2024-12-13 00:36:52,249 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-12-13 00:36:52,250 [ scc.merge] INFO
2024-12-13 00:36:52,250 [ scc.merge] INFO Repository: ome/omero-py
2024-12-13 00:36:52,250 [ scc.merge] INFO Excluded PRs:
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-12-13 00:36:52,250 [ scc.merge] INFO Updating 7e296f2e..7da917a7
2024-12-13 00:36:52,250 [ scc.merge] INFO Previously merged:
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 439 tstoeter 'Fixes issue #438'
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 440 sbesson 'Upgrade to macOS 14 Actions runner image'
2024-12-13 00:36:52,250 [ scc.merge] INFO
2024-12-13 00:36:52,250 [ scc.merge] INFO Merged PRs:
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation'
2024-12-13 00:36:52,250 [ scc.merge] INFO
2024-12-13 00:36:52,250 [ scc.merge] INFO Repository: ome/omero-scripts
2024-12-13 00:36:52,250 [ scc.merge] INFO Excluded PRs:
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-12-13 00:36:52,250 [ scc.merge] INFO Already up to date.
2024-12-13 00:36:52,250 [ scc.merge] INFO
2024-12-13 00:36:52,250 [ scc.merge] INFO Merged PRs:
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-13 00:36:52,250 [ scc.merge] INFO
2024-12-13 00:36:52,250 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-13 00:36:52,250 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-13 00:36:52,251 [ scc.merge] INFO
2024-12-13 00:36:52,251 [ scc.merge] INFO Repository: ome/omero-web
2024-12-13 00:36:52,251 [ scc.merge] INFO Excluded PRs:
2024-12-13 00:36:52,251 [ scc.merge] INFO - PR 602 Tom-TBT 'Inherit all ann' (user: Tom-TBT)
2024-12-13 00:36:52,251 [ scc.merge] INFO - PR 585 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-13 00:36:52,251 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-12-13 00:36:52,251 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-12-13 00:36:52,251 [ scc.merge] INFO Already up to date.
2024-12-13 00:36:52,251 [ scc.merge] INFO
2024-12-13 00:36:52,251 [ scc.merge] INFO Merged PRs:
2024-12-13 00:36:52,251 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-12-13 00:36:52,251 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-12-13 00:36:52,251 [ scc.merge] INFO - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2024-12-13 00:36:52,251 [ scc.merge] INFO - PR 596 sukunis 'Linkify can parse anchor tag'
2024-12-13 00:36:52,251 [ scc.merge] INFO - PR 598 will-moore 'Fix display of ContrastMethod'
2024-12-13 00:36:52,251 [ scc.merge] INFO - PR 600 sbesson 'Remove Python 3.8 from the testing matrix'
2024-12-13 00:36:52,251 [ scc.merge] INFO - PR 601 jburel 'Remove remaining usage of sdist'
2024-12-13 00:36:52,251 [ scc.merge] INFO
2024-12-13 00:36:52,251 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-13 00:36:52,251 [ scc.git] DEBUG Calling 'git remote'
2024-12-13 00:36:52,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-12-13 00:36:52,255 [ scc.git] DEBUG Calling 'git remote'
2024-12-13 00:36:52,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:36:52,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-12-13 00:36:52,259 [ scc.git] DEBUG Calling 'git remote'
2024-12-13 00:36:52,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:36:52,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-12-13 00:36:52,262 [ scc.git] DEBUG Calling 'git remote'
2024-12-13 00:36:52,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:36:52,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-12-13 00:36:52,266 [ scc.git] DEBUG Calling 'git remote'
2024-12-13 00:36:52,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-12-13 00:36:52,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-12-13 00:36:52,270 [ scc.git] DEBUG Calling 'git remote'
2024-12-13 00:36:52,273 [ 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 7e296f2e
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from a1483bf00
nothing to commit, working tree clean
HEAD detached from d78ee19
nothing to commit, working tree clean
2024-12-13 00:37:21,363 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/f5fa13f0/images/svgs/logo.svg){kind=logo}
