Console Output
+ export BASE_REPO=omero-python-superbuild.git
+ BASE_REPO=omero-python-superbuild.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-07-19 00:34:28,932 [ scc.config] DEBUG Found github.token
2024-07-19 00:34:28,935 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-19 00:34:29,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:34:29,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:34:30,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-19 00:34:30,010 [ scc.gh] DEBUG 4379 remaining from 5000 (Reset at 01:07
2024-07-19 00:34:30,011 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-19 00:34:30,016 [ scc.git] DEBUG Check current status
2024-07-19 00:34:30,016 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-19 00:34:30,020 [ scc.git] DEBUG 2f19665 Merge pull request #286 from ome/dependabot/submodules/omero-py-2891df1
2024-07-19 00:34:30,020 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-19 00:34:30,065 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-19 00:34:30,068 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-19 00:34:30,196 [ scc.git] DEBUG 2891df1bfebe0e9878a0c9f7ff84509d5b7d7093 omero-py (v5.19.3-11-g2891df1b)
2024-07-19 00:34:30,200 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-19 00:34:30,204 [ scc.git] DEBUG 5a2cd79d7cb7847d560e98f1d11240794e7be47f omero-web (v5.26.0-3-g5a2cd79d7)
2024-07-19 00:34:30,209 [ scc.config] DEBUG Found remote.origin.url
2024-07-19 00:34:30,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-19 00:34:31,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-19 00:34:31,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-19 00:34:32,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-19 00:34:32,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-19 00:34:32,497 [ scc.git] DEBUG Resetting...
2024-07-19 00:34:32,497 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-19 00:34:32,503 [ scc.git] DEBUG HEAD is now at 2f19665 Merge pull request #286 from ome/dependabot/submodules/omero-py-2891df1
2024-07-19 00:34:32,503 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-19 00:34:32,560 [ scc.git] DEBUG Check current status
2024-07-19 00:34:32,561 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-19 00:34:32,565 [ scc.git] DEBUG 2f19665 Merge pull request #286 from ome/dependabot/submodules/omero-py-2891df1
2024-07-19 00:34:32,566 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-19 00:34:32,612 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-19 00:34:32,615 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-19 00:34:32,618 [ scc.git] DEBUG 2891df1bfebe0e9878a0c9f7ff84509d5b7d7093 omero-py (v5.19.3-11-g2891df1b)
2024-07-19 00:34:32,622 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-19 00:34:32,625 [ scc.git] DEBUG 5a2cd79d7cb7847d560e98f1d11240794e7be47f omero-web (v5.26.0-3-g5a2cd79d7)
2024-07-19 00:34:32,626 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-19 00:34:32,626 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-19 00:34:32,626 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-19 00:34:32,626 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-19 00:34:32,626 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-19 00:34:32,626 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:34:32,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-19 00:34:32,950 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:34:32,950 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:34:32,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:34:32,955 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:34:32,959 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:34:32,959 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:34:32,963 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:34:32,967 [ scc.git] DEBUG Already up to date.
2024-07-19 00:34:32,967 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:34:32,967 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:34:32,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:34:32,970 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:34:33,009 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:34:33,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:34:33,017 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:34:33,060 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effade39d60> has no local changes
2024-07-19 00:34:33,061 [ 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#120 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/120/)'
2024-07-19 00:34:33,086 [ scc.git] DEBUG [detached HEAD 0049607] merge master -Dorg -Snone
2024-07-19 00:34:33,087 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-19 00:34:33,087 [ scc.merge] INFO Already up to date.
2024-07-19 00:34:33,087 [ scc.merge] INFO
2024-07-19 00:34:33,087 [ scc.merge] INFO
2024-07-19 00:34:33,087 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-19 00:34:33,087 [ 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
2891df1b..749a68ac master -> origin/master
* [new tag] v5.19.4 -> v5.19.4
Submodule path 'omero-py': checked out '749a68acfc7b1851c165ae75f2c118743d8b1e0d'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-19 00:34:35,778 [ scc.config] DEBUG Found github.token
2024-07-19 00:34:35,780 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-19 00:34:35,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:34:36,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:34:36,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-19 00:34:36,853 [ scc.gh] DEBUG 4371 remaining from 5000 (Reset at 01:07
2024-07-19 00:34:36,853 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-19 00:34:36,857 [ scc.git] DEBUG Check current status
2024-07-19 00:34:36,857 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-19 00:34:36,861 [ scc.git] DEBUG 0049607 merge master -Dorg -Snone
2024-07-19 00:34:36,861 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-19 00:34:36,903 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-19 00:34:36,906 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-19 00:34:36,910 [ scc.git] DEBUG +749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-19 00:34:36,914 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-19 00:34:36,917 [ scc.git] DEBUG 5a2cd79d7cb7847d560e98f1d11240794e7be47f omero-web (v5.26.0-3-g5a2cd79d7)
2024-07-19 00:34:36,921 [ scc.config] DEBUG Found remote.origin.url
2024-07-19 00:34:36,921 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-07-19 00:34:36,923 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-19 00:34:37,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-19 00:34:37,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-19 00:34:38,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-19 00:34:38,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-19 00:34:39,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-19 00:34:39,156 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:34:39,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-19 00:34:39,201 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-19 00:34:39,205 [ scc.git] DEBUG Check current status
2024-07-19 00:34:39,205 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-19 00:34:39,208 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-07-19 00:34:39,208 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-19 00:34:39,261 [ scc.config] DEBUG Found remote.origin.url
2024-07-19 00:34:39,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-07-19 00:34:40,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-19 00:34:40,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-19 00:34:41,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-19 00:34:41,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-19 00:34:41,487 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:34:41,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:34:41,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-19 00:34:41,528 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-19 00:34:41,531 [ scc.git] DEBUG Check current status
2024-07-19 00:34:41,532 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-19 00:34:41,536 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-07-19 00:34:41,536 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-19 00:34:41,578 [ scc.config] DEBUG Found remote.origin.url
2024-07-19 00:34:42,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-07-19 00:34:42,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-19 00:34:42,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-19 00:34:43,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-19 00:34:43,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-19 00:34:43,817 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:34:43,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:34:43,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-19 00:34:43,860 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-19 00:34:43,864 [ scc.git] DEBUG Check current status
2024-07-19 00:34:43,865 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-19 00:34:43,869 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-07-19 00:34:43,869 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-19 00:34:43,916 [ scc.config] DEBUG Found remote.origin.url
2024-07-19 00:34:44,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-07-19 00:34:44,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-19 00:34:45,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-19 00:34:45,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-19 00:34:46,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-19 00:34:46,192 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:34:46,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:34:46,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-19 00:34:46,235 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-19 00:34:46,240 [ scc.git] DEBUG Check current status
2024-07-19 00:34:46,240 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-19 00:34:46,244 [ scc.git] DEBUG c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-19 00:34:46,244 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-19 00:34:46,289 [ scc.config] DEBUG Found remote.origin.url
2024-07-19 00:34:46,290 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-07-19 00:34:46,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-07-19 00:34:47,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-19 00:34:47,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-19 00:34:48,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-19 00:34:48,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-19 00:34:48,488 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:34:48,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:34:48,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-19 00:34:48,535 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-19 00:34:48,540 [ scc.git] DEBUG Check current status
2024-07-19 00:34:48,540 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-19 00:34:48,555 [ scc.git] DEBUG 5a2cd79d7 Merge pull request #561 from jburel/numpy_less_than_2
2024-07-19 00:34:48,556 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-19 00:34:48,602 [ scc.config] DEBUG Found remote.origin.url
2024-07-19 00:34:49,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-07-19 00:34:49,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-19 00:34:49,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-19 00:34:50,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-19 00:34:50,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-19 00:34:50,770 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:34:50,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:34:50,815 [ scc.git] DEBUG Resetting...
2024-07-19 00:34:50,815 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-19 00:34:50,821 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-19 00:34:50,821 [ scc.git] DEBUG HEAD is now at 0049607 merge master -Dorg -Snone
2024-07-19 00:34:50,896 [ scc.git] DEBUG Submodule path 'omero-py': checked out '2891df1bfebe0e9878a0c9f7ff84509d5b7d7093'
2024-07-19 00:34:50,906 [ scc.git] DEBUG Check current status
2024-07-19 00:34:50,906 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-19 00:34:50,911 [ scc.git] DEBUG 0049607 merge master -Dorg -Snone
2024-07-19 00:34:50,911 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-19 00:34:50,961 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-19 00:34:50,963 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-19 00:34:50,967 [ scc.git] DEBUG 2891df1bfebe0e9878a0c9f7ff84509d5b7d7093 omero-py (v5.19.3-11-g2891df1b)
2024-07-19 00:34:50,971 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-19 00:34:50,974 [ scc.git] DEBUG 5a2cd79d7cb7847d560e98f1d11240794e7be47f omero-web (v5.26.0-3-g5a2cd79d7)
2024-07-19 00:34:50,975 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-19 00:34:50,975 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-19 00:34:50,975 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-19 00:34:50,975 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-19 00:34:50,975 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-19 00:34:50,975 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-07-19 00:34:50,975 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:34:51,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-19 00:34:51,225 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:34:51,225 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:34:51,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:34:51,231 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:34:51,235 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:34:51,236 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:34:51,241 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:34:51,246 [ scc.git] DEBUG Already up to date.
2024-07-19 00:34:51,246 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:34:51,246 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:34:51,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:34:51,250 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:34:51,293 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:34:51,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:34:51,297 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:34:51,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-07-19 00:34:52,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-07-19 00:34:52,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-07-19 00:34:53,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-19 00:34:53,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:34:54,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-19 00:34:54,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-07-19 00:34:54,639 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-19 00:34:54,640 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:34:54,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-19 00:34:54,640 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:34:54,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:34:54,645 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:34:54,650 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:34:54,650 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:34:54,655 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:34:54,661 [ scc.git] DEBUG Already up to date.
2024-07-19 00:34:54,661 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-07-19 00:34:55,048 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-07-19 00:34:55,048 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-07-19 00:34:55,053 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:34:55,053 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:34:55,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:34:55,058 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-19 00:34:55,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:34:55,066 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-19 00:34:55,192 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-07-19 00:34:55,192 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-07-19 00:34:55,192 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-07-19 00:34:55,192 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-07-19 00:34:55,192 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-07-19 00:34:55,192 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-07-19 00:34:55,192 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-07-19 00:34:55,192 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-07-19 00:34:55,192 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-07-19 00:34:55,193 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:34:55,197 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-07-19 00:34:55,197 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-07-19 00:34:55,197 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-07-19 00:34:55,197 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-07-19 00:34:55,197 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-07-19 00:34:55,197 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-07-19 00:34:55,197 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-07-19 00:34:55,197 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-07-19 00:34:55,197 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-07-19 00:34:55,197 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-07-19 00:34:55,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:34:55,369 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:34:55,411 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:34:55,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:34:55,415 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:34:55,457 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:34:55,464 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6732739f70> has no local changes
2024-07-19 00:34:55,464 [ 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#120 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/120/)'
2024-07-19 00:34:55,473 [ scc.git] DEBUG [detached HEAD e3e45b7] merge master -Dorg -Ssuccess-only
2024-07-19 00:34:55,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:34:55,474 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:34:55,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-07-19 00:34:56,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-07-19 00:34:57,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-07-19 00:34:57,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-19 00:34:58,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:34:58,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-19 00:34:59,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-07-19 00:34:59,083 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-19 00:34:59,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-07-19 00:35:00,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-07-19 00:35:00,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-07-19 00:35:00,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-07-19 00:35:00,997 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:35:00,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-19 00:35:00,997 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:35:00,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:01,002 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:35:01,006 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:35:01,007 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:35:01,012 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:35:01,017 [ scc.git] DEBUG Already up to date.
2024-07-19 00:35:01,017 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-07-19 00:35:01,432 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-07-19 00:35:01,432 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-07-19 00:35:01,437 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:35:01,437 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:35:01,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:01,442 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-19 00:35:01,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:01,452 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-19 00:35:01,462 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-07-19 00:35:01,463 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:35:01,466 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-07-19 00:35:01,466 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-07-19 00:35:01,466 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-07-19 00:35:01,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:35:01,660 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:35:01,703 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:35:01,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:01,708 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:35:01,747 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:35:01,753 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6732739700> has no local changes
2024-07-19 00:35:01,753 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Generated by OMERO-python-superbuild-push#120 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/120/)'
2024-07-19 00:35:01,761 [ scc.git] DEBUG [detached HEAD 17df651] merge master -Dorg -Ssuccess-only
2024-07-19 00:35:01,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:35:01,761 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:35:02,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-07-19 00:35:02,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-07-19 00:35:03,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-07-19 00:35:03,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-19 00:35:04,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:05,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:35:05,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-19 00:35:06,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:06,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-19 00:35:07,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-07-19 00:35:07,096 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-07-19 00:35:07,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-07-19 00:35:08,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-07-19 00:35:08,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-07-19 00:35:09,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:09,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:35:10,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-07-19 00:35:10,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-19 00:35:11,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:11,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:35:12,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-19 00:35:12,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:13,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-19 00:35:13,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-07-19 00:35:13,739 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-07-19 00:35:14,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-07-19 00:35:14,230 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-07-19 00:35:14,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-07-19 00:35:15,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-07-19 00:35:15,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-19 00:35:16,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:16,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-19 00:35:17,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-07-19 00:35:17,206 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-19 00:35:17,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-07-19 00:35:18,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-07-19 00:35:18,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-19 00:35:19,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:19,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:35:20,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-19 00:35:20,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:21,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-19 00:35:21,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-07-19 00:35:21,609 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-07-19 00:35:22,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-07-19 00:35:22,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-07-19 00:35:23,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-07-19 00:35:23,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-07-19 00:35:24,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-19 00:35:24,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:25,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-19 00:35:25,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-07-19 00:35:25,501 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-19 00:35:25,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-07-19 00:35:26,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-19 00:35:26,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:27,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-19 00:35:27,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-07-19 00:35:27,909 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-19 00:35:28,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-07-19 00:35:28,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-07-19 00:35:29,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-19 00:35:30,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:30,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-19 00:35:31,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-07-19 00:35:31,045 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-19 00:35:31,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-07-19 00:35:32,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-07-19 00:35:32,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-19 00:35:33,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:33,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-19 00:35:34,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-07-19 00:35:34,054 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-07-19 00:35:34,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-07-19 00:35:35,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-07-19 00:35:35,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-07-19 00:35:35,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-07-19 00:35:36,001 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:35:36,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-19 00:35:36,001 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:35:36,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:36,007 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:35:36,011 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:35:36,011 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:35:36,017 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:35:36,031 [ scc.git] DEBUG Updating 2891df1b..749a68ac
2024-07-19 00:35:36,031 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-07-19 00:35:36,456 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-19 00:35:36,456 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-07-19 00:35:36,461 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-07-19 00:35:36,832 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-19 00:35:36,832 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-07-19 00:35:36,838 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-07-19 00:35:37,220 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-19 00:35:37,220 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-07-19 00:35:37,226 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-07-19 00:35:37,603 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-19 00:35:37,603 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-07-19 00:35:37,608 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-07-19 00:35:37,983 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-19 00:35:37,983 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-07-19 00:35:37,989 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-07-19 00:35:38,352 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-19 00:35:38,353 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-07-19 00:35:38,357 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-07-19 00:35:38,779 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-19 00:35:38,779 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-07-19 00:35:38,784 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-07-19 00:35:39,174 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-19 00:35:39,174 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-07-19 00:35:39,180 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:35:39,180 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:35:39,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:39,186 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-19 00:35:39,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:39,202 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-19 00:35:39,242 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-07-19 00:35:39,242 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-07-19 00:35:39,243 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:35:39,248 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-07-19 00:35:39,248 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-07-19 00:35:39,248 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-07-19 00:35:39,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:35:39,437 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-19 00:35:39,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:39,454 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-19 00:35:39,562 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-19 00:35:39,563 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-07-19 00:35:39,563 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:35:39,571 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-07-19 00:35:39,571 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-07-19 00:35:39,571 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-07-19 00:35:39,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:35:39,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-07-19 00:35:39,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:39,867 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-07-19 00:35:39,924 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-07-19 00:35:39,925 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:35:39,928 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-07-19 00:35:39,928 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-07-19 00:35:40,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:35:40,261 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-07-19 00:35:40,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:40,279 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2024-07-19 00:35:40,378 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-07-19 00:35:40,379 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-07-19 00:35:40,380 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:35:40,384 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-19 00:35:40,384 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-07-19 00:35:40,384 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-07-19 00:35:40,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:35:40,730 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-19 00:35:40,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:40,747 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-19 00:35:40,767 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:35:40,771 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-07-19 00:35:40,771 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-07-19 00:35:40,771 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-07-19 00:35:40,771 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-07-19 00:35:40,771 [ scc.git] DEBUG create mode 100644 connect.py
2024-07-19 00:35:41,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:35:41,193 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-07-19 00:35:41,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:41,210 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-07-19 00:35:41,246 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-07-19 00:35:41,247 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:35:41,251 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-07-19 00:35:41,251 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-19 00:35:41,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:35:41,631 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-07-19 00:35:41,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:41,654 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-07-19 00:35:41,711 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-07-19 00:35:41,712 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:35:41,716 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-07-19 00:35:41,716 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-07-19 00:35:42,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:35:42,065 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-19 00:35:42,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:42,085 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-19 00:35:42,132 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-19 00:35:42,133 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:35:42,140 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-07-19 00:35:42,140 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-07-19 00:35:42,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:35:42,477 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:35:42,519 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:35:42,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:42,525 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:35:42,568 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:35:42,579 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6731658cd0> has no local changes
2024-07-19 00:35:42,579 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Updating 2891df1b..749a68ac
Previously merged:
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
Generated by OMERO-python-superbuild-push#120 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/120/)'
2024-07-19 00:35:42,593 [ scc.git] DEBUG [detached HEAD 68faf476] merge master -Dorg -Ssuccess-only
2024-07-19 00:35:42,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:35:42,594 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-19 00:35:42,594 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:35:43,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-19 00:35:43,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-19 00:35:44,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-19 00:35:44,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-19 00:35:45,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-19 00:35:45,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-19 00:35:46,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-19 00:35:46,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-19 00:35:47,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:47,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-19 00:35:48,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-19 00:35:48,003 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-19 00:35:48,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-19 00:35:49,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-19 00:35:49,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-19 00:35:50,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-19 00:35:50,089 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:35:50,089 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-19 00:35:50,089 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:35:50,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:50,094 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-19 00:35:50,098 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:35:50,099 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-19 00:35:50,108 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-19 00:35:50,115 [ scc.git] DEBUG Already up to date.
2024-07-19 00:35:50,115 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-19 00:35:50,576 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-07-19 00:35:50,576 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-19 00:35:50,582 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:35:50,582 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:35:50,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:50,587 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-19 00:35:50,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:50,597 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-19 00:35:50,621 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-19 00:35:50,621 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-19 00:35:50,621 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-19 00:35:50,622 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-19 00:35:50,629 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-19 00:35:50,635 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-19 00:35:50,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:35:50,817 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-19 00:35:50,824 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-19 00:35:50,829 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#120](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/120/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/120/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-19 00:35:50,835 [ scc.config] DEBUG Found github.token
2024-07-19 00:35:50,836 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-19 00:35:50,836 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:35:50,879 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:35:50,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:35:50,884 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:35:50,924 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:35:50,931 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6731672bb0> has no local changes
2024-07-19 00:35:50,931 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-python-superbuild-push#120 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/120/)'
2024-07-19 00:35:50,940 [ scc.git] DEBUG [detached HEAD 5e3b625] merge master -Dorg -Ssuccess-only
2024-07-19 00:35:50,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:35:50,941 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:35:51,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-07-19 00:35:51,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564 HTTP/1.1" 200 None
2024-07-19 00:35:52,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564/comments HTTP/1.1" 200 None
2024-07-19 00:35:52,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-19 00:35:53,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:53,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:35:54,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-19 00:35:54,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/091e5fc2d35212271ac71fd66b42c611299d6fde?per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:55,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-19 00:35:55,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/status HTTP/1.1" 200 None
2024-07-19 00:35:55,917 [ scc.repo] DEBUG - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-19 00:35:56,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/563 HTTP/1.1" 200 None
2024-07-19 00:35:56,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/563/comments HTTP/1.1" 200 None
2024-07-19 00:35:57,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/af88a0cd2aa7d15d9b0dca1ce369060284551de7 HTTP/1.1" 200 None
2024-07-19 00:35:57,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/af88a0cd2aa7d15d9b0dca1ce369060284551de7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:58,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/af88a0cd2aa7d15d9b0dca1ce369060284551de7/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:35:58,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/af88a0cd2aa7d15d9b0dca1ce369060284551de7 HTTP/1.1" 200 None
2024-07-19 00:35:59,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/af88a0cd2aa7d15d9b0dca1ce369060284551de7?per_page=1 HTTP/1.1" 200 None
2024-07-19 00:35:59,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/af88a0cd2aa7d15d9b0dca1ce369060284551de7 HTTP/1.1" 200 None
2024-07-19 00:36:00,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/af88a0cd2aa7d15d9b0dca1ce369060284551de7/status HTTP/1.1" 200 None
2024-07-19 00:36:00,307 [ scc.repo] DEBUG - PR 563 chris-allan 'Batch by MAX_TABLE_DOWNLOAD_ROWS'
2024-07-19 00:36:00,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/562 HTTP/1.1" 200 None
2024-07-19 00:36:01,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/560 HTTP/1.1" 200 None
2024-07-19 00:36:01,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/560/comments HTTP/1.1" 200 None
2024-07-19 00:36:02,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f92a4e2764982ace46474a82af4ad25bee9d8823 HTTP/1.1" 200 None
2024-07-19 00:36:02,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f92a4e2764982ace46474a82af4ad25bee9d8823/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:03,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f92a4e2764982ace46474a82af4ad25bee9d8823/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:36:03,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f92a4e2764982ace46474a82af4ad25bee9d8823 HTTP/1.1" 200 None
2024-07-19 00:36:04,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/f92a4e2764982ace46474a82af4ad25bee9d8823?per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:04,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f92a4e2764982ace46474a82af4ad25bee9d8823 HTTP/1.1" 200 None
2024-07-19 00:36:05,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/f92a4e2764982ace46474a82af4ad25bee9d8823/status HTTP/1.1" 200 None
2024-07-19 00:36:05,295 [ scc.repo] DEBUG - PR 560 will-moore 'linkify supports urls that include $ character'
2024-07-19 00:36:05,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/558 HTTP/1.1" 200 None
2024-07-19 00:36:06,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/558/comments HTTP/1.1" 200 None
2024-07-19 00:36:06,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/835cfbc948305ce221d873b2a8beb5be288ca9f8 HTTP/1.1" 200 None
2024-07-19 00:36:07,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/835cfbc948305ce221d873b2a8beb5be288ca9f8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:07,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/835cfbc948305ce221d873b2a8beb5be288ca9f8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:36:08,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/835cfbc948305ce221d873b2a8beb5be288ca9f8 HTTP/1.1" 200 None
2024-07-19 00:36:08,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/835cfbc948305ce221d873b2a8beb5be288ca9f8?per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:09,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/835cfbc948305ce221d873b2a8beb5be288ca9f8 HTTP/1.1" 200 None
2024-07-19 00:36:09,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/835cfbc948305ce221d873b2a8beb5be288ca9f8/status HTTP/1.1" 200 None
2024-07-19 00:36:09,742 [ scc.repo] DEBUG - PR 558 jburel 'Update readme'
2024-07-19 00:36:10,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555 HTTP/1.1" 200 None
2024-07-19 00:36:10,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555/comments HTTP/1.1" 200 None
2024-07-19 00:36:11,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-19 00:36:11,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:12,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:36:12,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-19 00:36:13,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/97e479b717e34179eceea2507d3e69a04b2fec1e?per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:13,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-19 00:36:14,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/status HTTP/1.1" 200 None
2024-07-19 00:36:14,246 [ scc.repo] DEBUG - PR 555 chris-allan 'Archive status'
2024-07-19 00:36:14,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/554 HTTP/1.1" 200 None
2024-07-19 00:36:15,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/554/comments HTTP/1.1" 200 None
2024-07-19 00:36:15,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/79c23056136bc929e4ebd57d24600780c92921c5 HTTP/1.1" 200 None
2024-07-19 00:36:16,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/79c23056136bc929e4ebd57d24600780c92921c5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:16,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/79c23056136bc929e4ebd57d24600780c92921c5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:36:17,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/79c23056136bc929e4ebd57d24600780c92921c5 HTTP/1.1" 200 None
2024-07-19 00:36:17,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/79c23056136bc929e4ebd57d24600780c92921c5?per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:18,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/79c23056136bc929e4ebd57d24600780c92921c5 HTTP/1.1" 200 None
2024-07-19 00:36:18,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/79c23056136bc929e4ebd57d24600780c92921c5/status HTTP/1.1" 200 None
2024-07-19 00:36:18,681 [ scc.repo] DEBUG - PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query'
2024-07-19 00:36:19,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-07-19 00:36:19,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-07-19 00:36:20,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-07-19 00:36:20,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-07-19 00:36:21,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-19 00:36:21,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:22,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:36:22,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-19 00:36:23,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:23,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-19 00:36:24,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-07-19 00:36:24,047 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-19 00:36:24,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-07-19 00:36:25,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-07-19 00:36:25,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-19 00:36:26,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:26,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:36:27,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-19 00:36:27,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:27,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-19 00:36:28,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-07-19 00:36:28,465 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-19 00:36:28,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-07-19 00:36:29,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-07-19 00:36:29,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-07-19 00:36:30,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:36:31,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:36:31,056 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:36:31,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-19 00:36:31,056 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:36:31,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:36:31,062 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:36:31,067 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:36:31,067 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:36:31,074 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:36:31,081 [ scc.git] DEBUG Already up to date.
2024-07-19 00:36:31,081 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-07-19 00:36:31,688 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-19 00:36:31,688 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-07-19 00:36:31,695 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-07-19 00:36:32,345 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-19 00:36:32,345 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-07-19 00:36:32,352 [ scc.git] DEBUG Calling 'git fetch origin pull/554/head'
2024-07-19 00:36:33,027 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-19 00:36:33,027 [ scc.git] DEBUG * branch refs/pull/554/head -> FETCH_HEAD
2024-07-19 00:36:33,032 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-19 00:36:33,390 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-19 00:36:33,390 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-19 00:36:33,395 [ scc.git] DEBUG Calling 'git fetch origin pull/558/head'
2024-07-19 00:36:33,842 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-19 00:36:33,842 [ scc.git] DEBUG * branch refs/pull/558/head -> FETCH_HEAD
2024-07-19 00:36:33,849 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-19 00:36:34,221 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-19 00:36:34,221 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-19 00:36:34,226 [ scc.git] DEBUG Calling 'git fetch origin pull/563/head'
2024-07-19 00:36:34,585 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-19 00:36:34,586 [ scc.git] DEBUG * branch refs/pull/563/head -> FETCH_HEAD
2024-07-19 00:36:34,591 [ scc.git] DEBUG Calling 'git fetch origin pull/564/head'
2024-07-19 00:36:34,936 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-19 00:36:34,936 [ scc.git] DEBUG * branch refs/pull/564/head -> FETCH_HEAD
2024-07-19 00:36:34,943 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:36:34,943 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:36:34,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:36:34,949 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-07-19 00:36:34,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:36:34,962 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-07-19 00:36:35,040 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-19 00:36:35,041 [ scc.git] DEBUG Auto-merging setup.py
2024-07-19 00:36:35,043 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:36:35,046 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-07-19 00:36:35,046 [ scc.git] DEBUG setup.py | 1 +
2024-07-19 00:36:35,046 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-07-19 00:36:35,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:35,215 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-07-19 00:36:35,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:36:35,227 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-07-19 00:36:35,306 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-07-19 00:36:35,306 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-19 00:36:35,307 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:36:35,311 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-07-19 00:36:35,311 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-07-19 00:36:35,311 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-07-19 00:36:35,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:35,640 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...79c23056136bc929e4ebd57d24600780c92921c5'
2024-07-19 00:36:35,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:36:35,652 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Optimize obj_id_bitmask by using its own query) 79c23056136bc929e4ebd57d24600780c92921c5'
2024-07-19 00:36:35,705 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:36:35,711 [ scc.git] DEBUG omeroweb/webgateway/views.py | 77 ++++++++++++++++++++++++++------------------
2024-07-19 00:36:35,711 [ scc.git] DEBUG test/unit/test_webgateway.py | 9 ++++--
2024-07-19 00:36:35,711 [ scc.git] DEBUG 2 files changed, 51 insertions(+), 35 deletions(-)
2024-07-19 00:36:36,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:36,052 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-19 00:36:36,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:36:36,067 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Archive status) 97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-19 00:36:36,255 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-19 00:36:36,256 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:36:36,262 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.tree.js | 3 +++
2024-07-19 00:36:36,262 [ scc.git] DEBUG .../webclient/annotations/includes/core_metadata.html | 6 ++++++
2024-07-19 00:36:36,262 [ scc.git] DEBUG omeroweb/webclient/tree.py | 10 ++++++++--
2024-07-19 00:36:36,262 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 1 +
2024-07-19 00:36:36,262 [ scc.git] DEBUG 4 files changed, 18 insertions(+), 2 deletions(-)
2024-07-19 00:36:36,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:36,516 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...835cfbc948305ce221d873b2a8beb5be288ca9f8'
2024-07-19 00:36:36,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:36:36,530 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 558 (Update readme) 835cfbc948305ce221d873b2a8beb5be288ca9f8'
2024-07-19 00:36:36,575 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:36:36,578 [ scc.git] DEBUG README.rst | 42 +++++++++++++++++++++---------------------
2024-07-19 00:36:36,578 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 21 deletions(-)
2024-07-19 00:36:36,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:36,941 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f92a4e2764982ace46474a82af4ad25bee9d8823'
2024-07-19 00:36:36,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:36:36,954 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (linkify supports urls that include $ character) f92a4e2764982ace46474a82af4ad25bee9d8823'
2024-07-19 00:36:37,006 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:36:37,011 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.webclient.actions.js | 2 +-
2024-07-19 00:36:37,011 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-19 00:36:37,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:37,376 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...af88a0cd2aa7d15d9b0dca1ce369060284551de7'
2024-07-19 00:36:37,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:36:37,395 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 563 (Batch by MAX_TABLE_DOWNLOAD_ROWS) af88a0cd2aa7d15d9b0dca1ce369060284551de7'
2024-07-19 00:36:37,428 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py
2024-07-19 00:36:37,429 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:36:37,434 [ scc.git] DEBUG omeroweb/webgateway/views.py | 2 +-
2024-07-19 00:36:37,434 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-19 00:36:37,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:37,794 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...091e5fc2d35212271ac71fd66b42c611299d6fde'
2024-07-19 00:36:37,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:36:37,810 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 564 (New table API endpoints for lower level table access) 091e5fc2d35212271ac71fd66b42c611299d6fde'
2024-07-19 00:36:37,861 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-19 00:36:37,862 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py
2024-07-19 00:36:37,863 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:36:37,869 [ scc.git] DEBUG omeroweb/settings.py | 7 ++
2024-07-19 00:36:37,869 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 29 +++++++
2024-07-19 00:36:37,869 [ scc.git] DEBUG omeroweb/webgateway/views.py | 175 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-19 00:36:37,869 [ scc.git] DEBUG 3 files changed, 210 insertions(+), 1 deletion(-)
2024-07-19 00:36:38,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:38,214 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:36:38,264 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:36:38,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:36:38,272 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:36:38,320 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:36:38,337 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67305c14f0> has no local changes
2024-07-19 00:36:38,338 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 562 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query'
- PR 555 chris-allan 'Archive status'
- PR 558 jburel 'Update readme'
- PR 560 will-moore 'linkify supports urls that include $ character'
- PR 563 chris-allan 'Batch by MAX_TABLE_DOWNLOAD_ROWS'
- PR 564 knabar 'New table API endpoints for lower level table access'
Generated by OMERO-python-superbuild-push#120 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/120/)'
2024-07-19 00:36:38,358 [ scc.git] DEBUG [detached HEAD c4ed33a4a] merge master -Dorg -Ssuccess-only
2024-07-19 00:36:38,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:36:38,359 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:36:38,432 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-07-19 00:36:38,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:38,660 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-07-19 00:36:39,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:39,088 [ scc.config] DEBUG Found submodule.omero-py.url
2024-07-19 00:36:39,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:39,536 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-07-19 00:36:39,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:39,966 [ scc.config] DEBUG Found submodule.omero-web.url
2024-07-19 00:36:40,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:36:40,393 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:36:40,426 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f673272dd60> has local changes
2024-07-19 00:36:40,427 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Updating 2891df1b..749a68ac
Previously merged:
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 562 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query'
- PR 555 chris-allan 'Archive status'
- PR 558 jburel 'Update readme'
- PR 560 will-moore 'linkify supports urls that include $ character'
- PR 563 chris-allan 'Batch by MAX_TABLE_DOWNLOAD_ROWS'
- PR 564 knabar 'New table API endpoints for lower level table access'
Generated by OMERO-python-superbuild-push#120 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/120/)'
2024-07-19 00:36:40,437 [ scc.git] DEBUG [detached HEAD 754bc75] merge master -Dorg -Ssuccess-only
2024-07-19 00:36:40,437 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-07-19 00:36:40,438 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-19 00:36:40,438 [ scc.merge] INFO Already up to date.
2024-07-19 00:36:40,438 [ scc.merge] INFO
2024-07-19 00:36:40,438 [ scc.merge] INFO
2024-07-19 00:36:40,438 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-07-19 00:36:40,438 [ scc.merge] INFO Already up to date.
2024-07-19 00:36:40,438 [ scc.merge] INFO
2024-07-19 00:36:40,438 [ scc.merge] INFO Merged PRs:
2024-07-19 00:36:40,438 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-19 00:36:40,438 [ scc.merge] INFO
2024-07-19 00:36:40,438 [ scc.merge] INFO Repository: ome/omero-marshal
2024-07-19 00:36:40,438 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:36:40,438 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-07-19 00:36:40,438 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-07-19 00:36:40,438 [ scc.merge] INFO Already up to date.
2024-07-19 00:36:40,438 [ scc.merge] INFO
2024-07-19 00:36:40,438 [ scc.merge] INFO Merged PRs:
2024-07-19 00:36:40,438 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-19 00:36:40,438 [ scc.merge] INFO
2024-07-19 00:36:40,438 [ scc.merge] INFO Repository: ome/omero-py
2024-07-19 00:36:40,438 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:36:40,438 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-07-19 00:36:40,439 [ scc.merge] INFO Updating 2891df1b..749a68ac
2024-07-19 00:36:40,439 [ scc.merge] INFO Previously merged:
2024-07-19 00:36:40,439 [ scc.merge] INFO
2024-07-19 00:36:40,439 [ scc.merge] INFO Merged PRs:
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-07-19 00:36:40,439 [ scc.merge] INFO
2024-07-19 00:36:40,439 [ scc.merge] INFO Repository: ome/omero-scripts
2024-07-19 00:36:40,439 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-19 00:36:40,439 [ scc.merge] INFO Already up to date.
2024-07-19 00:36:40,439 [ scc.merge] INFO
2024-07-19 00:36:40,439 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-19 00:36:40,439 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-19 00:36:40,439 [ scc.merge] INFO
2024-07-19 00:36:40,440 [ scc.merge] INFO Repository: ome/omero-web
2024-07-19 00:36:40,440 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:36:40,440 [ scc.merge] INFO - PR 562 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-19 00:36:40,440 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-07-19 00:36:40,440 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-07-19 00:36:40,440 [ scc.merge] INFO Already up to date.
2024-07-19 00:36:40,440 [ scc.merge] INFO
2024-07-19 00:36:40,440 [ scc.merge] INFO Merged PRs:
2024-07-19 00:36:40,440 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-19 00:36:40,440 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-19 00:36:40,440 [ scc.merge] INFO - PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query'
2024-07-19 00:36:40,440 [ scc.merge] INFO - PR 555 chris-allan 'Archive status'
2024-07-19 00:36:40,440 [ scc.merge] INFO - PR 558 jburel 'Update readme'
2024-07-19 00:36:40,440 [ scc.merge] INFO - PR 560 will-moore 'linkify supports urls that include $ character'
2024-07-19 00:36:40,440 [ scc.merge] INFO - PR 563 chris-allan 'Batch by MAX_TABLE_DOWNLOAD_ROWS'
2024-07-19 00:36:40,440 [ scc.merge] INFO - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-19 00:36:40,440 [ scc.merge] INFO
2024-07-19 00:36:40,440 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-19 00:36:40,440 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:36:40,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-19 00:36:40,447 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:36:40,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:36:40,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-19 00:36:40,454 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:36:40,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:36:40,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-19 00:36:40,459 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:36:40,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:36:40,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-19 00:36:40,463 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:36:40,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-19 00:36:40,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-19 00:36:40,467 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:36:40,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
Update component versions
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'omero-dropbox'
Entering 'omero-marshal'
Entering 'omero-py'
Entering 'omero-scripts'
Entering 'omero-web'
Entering 'omero-dropbox'
HEAD detached from a4307f4
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from cca4c2f
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 2891df1b
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from c20d273
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from 5a2cd79d7
nothing to commit, working tree clean
HEAD detached from 2f19665
nothing to commit, working tree clean
2024-07-19 00:37:12,274 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
