Console Output
+ export BASE_REPO=omero-python-superbuild.git
+ BASE_REPO=omero-python-superbuild.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-05-04 00:35:01,427 [ scc.config] DEBUG Found github.token
2024-05-04 00:35:01,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-04 00:35:01,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:35:02,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:35:02,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-04 00:35:02,487 [ scc.gh] DEBUG 3768 remaining from 5000 (Reset at 01:05
2024-05-04 00:35:02,488 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-04 00:35:02,493 [ scc.git] DEBUG Check current status
2024-05-04 00:35:02,494 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-04 00:35:02,498 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-04 00:35:02,499 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-04 00:35:02,542 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-04 00:35:02,545 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-04 00:35:02,549 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-05-04 00:35:02,554 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-04 00:35:02,682 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-04 00:35:02,688 [ scc.config] DEBUG Found remote.origin.url
2024-05-04 00:35:02,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-04 00:35:03,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-04 00:35:03,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-04 00:35:04,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-04 00:35:04,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-04 00:35:04,703 [ scc.git] DEBUG Resetting...
2024-05-04 00:35:04,703 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-04 00:35:04,709 [ scc.git] DEBUG HEAD is now at 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-04 00:35:04,710 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-04 00:35:04,770 [ scc.git] DEBUG Check current status
2024-05-04 00:35:04,771 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-04 00:35:04,777 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-04 00:35:04,777 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-04 00:35:04,820 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-04 00:35:04,822 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-04 00:35:04,826 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-05-04 00:35:04,830 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-04 00:35:04,834 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-04 00:35:04,835 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-04 00:35:04,835 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-04 00:35:04,835 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-04 00:35:04,835 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-04 00:35:04,835 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-04 00:35:04,835 [ scc.repo] DEBUG ## PRs found:
2024-05-04 00:35:05,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-05-04 00:35:05,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/278 HTTP/1.1" 200 None
2024-05-04 00:35:05,744 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-04 00:35:05,744 [ scc.repo] DEBUG - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-04 00:35:05,744 [ scc.repo] DEBUG ## Branches found:
2024-05-04 00:35:05,744 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:35:05,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:05,750 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-04 00:35:05,753 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-04 00:35:05,753 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-04 00:35:05,756 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-04 00:35:05,760 [ scc.git] DEBUG Already up to date.
2024-05-04 00:35:05,760 [ scc.git] DEBUG Calling 'git fetch origin pull/278/head'
2024-05-04 00:35:06,145 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-05-04 00:35:06,145 [ scc.git] DEBUG * branch refs/pull/278/head -> FETCH_HEAD
2024-05-04 00:35:06,150 [ scc.git] DEBUG ## Unique users: []
2024-05-04 00:35:06,151 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:35:06,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:06,155 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6c64259c4c9aea3f7c98e9736048d12500aa6fab'
2024-05-04 00:35:06,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:06,173 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 278 (Bump omero-py from `52d9a6f` to `53a327b`) 6c64259c4c9aea3f7c98e9736048d12500aa6fab'
2024-05-04 00:35:06,182 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:35:06,184 [ scc.git] DEBUG omero-py | 2 +-
2024-05-04 00:35:06,184 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-05-04 00:35:06,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:35:06,347 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-04 00:35:06,578 [ scc.git] DEBUG Submodule path 'omero-py': checked out '53a327b85034cf09ae5e7255e6fd70b59392b680'
2024-05-04 00:35:06,579 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:35:06,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:06,583 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-04 00:35:06,783 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b3713460> has no local changes
2024-05-04 00:35:06,783 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
Generated by OMERO-python-superbuild-push#51 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/51/)'
2024-05-04 00:35:06,824 [ scc.git] DEBUG [detached HEAD cd23b89] merge master -Dorg -Snone
2024-05-04 00:35:06,824 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-04 00:35:06,825 [ scc.merge] INFO Already up to date.
2024-05-04 00:35:06,825 [ scc.merge] INFO
2024-05-04 00:35:06,825 [ scc.merge] INFO Merged PRs:
2024-05-04 00:35:06,825 [ scc.merge] INFO - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-04 00:35:06,825 [ scc.merge] INFO
2024-05-04 00:35:06,825 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-04 00:35:06,825 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-05-04 00:35:09,464 [ scc.config] DEBUG Found github.token
2024-05-04 00:35:09,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-04 00:35:09,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:35:10,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:35:10,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-04 00:35:10,504 [ scc.gh] DEBUG 3755 remaining from 5000 (Reset at 01:05
2024-05-04 00:35:10,505 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-04 00:35:10,510 [ scc.git] DEBUG Check current status
2024-05-04 00:35:10,510 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-04 00:35:10,513 [ scc.git] DEBUG cd23b89 merge master -Dorg -Snone
2024-05-04 00:35:10,514 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-04 00:35:10,590 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-04 00:35:10,593 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-04 00:35:10,597 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-04 00:35:10,601 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-04 00:35:10,604 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-04 00:35:10,608 [ scc.config] DEBUG Found remote.origin.url
2024-05-04 00:35:10,609 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-05-04 00:35:10,610 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-05-04 00:35:10,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-04 00:35:11,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-04 00:35:11,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-04 00:35:12,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-04 00:35:12,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-04 00:35:12,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-04 00:35:12,791 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-04 00:35:12,792 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-04 00:35:12,796 [ scc.git] DEBUG Check current status
2024-05-04 00:35:12,796 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-04 00:35:12,800 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311
2024-05-04 00:35:12,800 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-04 00:35:12,848 [ scc.config] DEBUG Found remote.origin.url
2024-05-04 00:35:13,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-05-04 00:35:13,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-04 00:35:14,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-04 00:35:14,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-04 00:35:14,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-04 00:35:14,952 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-04 00:35:14,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:35:14,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-04 00:35:14,994 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-04 00:35:14,998 [ scc.git] DEBUG Check current status
2024-05-04 00:35:14,999 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-04 00:35:15,002 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-05-04 00:35:15,002 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-04 00:35:15,043 [ scc.config] DEBUG Found remote.origin.url
2024-05-04 00:35:15,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-05-04 00:35:15,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-04 00:35:16,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-04 00:35:16,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-04 00:35:17,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-04 00:35:17,197 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-04 00:35:17,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:35:17,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-04 00:35:17,244 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-04 00:35:17,248 [ scc.git] DEBUG Check current status
2024-05-04 00:35:17,249 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-04 00:35:17,271 [ scc.git] DEBUG 53a327b8 Merge pull request #407 from jburel/install_conda_forge
2024-05-04 00:35:17,272 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-04 00:35:17,320 [ scc.config] DEBUG Found remote.origin.url
2024-05-04 00:35:17,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-05-04 00:35:18,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-04 00:35:18,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-04 00:35:19,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-04 00:35:19,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-04 00:35:19,468 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-04 00:35:19,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:35:19,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-04 00:35:19,531 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-04 00:35:19,536 [ scc.git] DEBUG Check current status
2024-05-04 00:35:19,536 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-04 00:35:19,557 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-04 00:35:19,558 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-04 00:35:19,605 [ scc.config] DEBUG Found remote.origin.url
2024-05-04 00:35:19,606 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-05-04 00:35:19,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-05-04 00:35:20,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-04 00:35:20,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-04 00:35:21,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-04 00:35:21,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-04 00:35:21,711 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-04 00:35:21,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:35:21,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-04 00:35:21,754 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-04 00:35:21,759 [ scc.git] DEBUG Check current status
2024-05-04 00:35:21,759 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-04 00:35:21,773 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-05-04 00:35:21,774 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-04 00:35:21,816 [ scc.config] DEBUG Found remote.origin.url
2024-05-04 00:35:22,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-05-04 00:35:22,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-04 00:35:23,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-04 00:35:23,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-04 00:35:23,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-04 00:35:23,985 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-04 00:35:24,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:35:24,029 [ scc.git] DEBUG Resetting...
2024-05-04 00:35:24,030 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-04 00:35:24,036 [ scc.git] DEBUG HEAD is now at cd23b89 merge master -Dorg -Snone
2024-05-04 00:35:24,037 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-04 00:35:24,093 [ scc.git] DEBUG Check current status
2024-05-04 00:35:24,094 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-04 00:35:24,099 [ scc.git] DEBUG cd23b89 merge master -Dorg -Snone
2024-05-04 00:35:24,099 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-04 00:35:24,142 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-04 00:35:24,147 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-04 00:35:24,151 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-04 00:35:24,154 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-04 00:35:24,159 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-04 00:35:24,160 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-04 00:35:24,160 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-04 00:35:24,160 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-04 00:35:24,160 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-04 00:35:24,160 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-04 00:35:24,160 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-05-04 00:35:24,161 [ scc.repo] DEBUG ## PRs found:
2024-05-04 00:35:24,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-05-04 00:35:24,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/278 HTTP/1.1" 200 None
2024-05-04 00:35:24,908 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-04 00:35:25,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6c64259c4c9aea3f7c98e9736048d12500aa6fab HTTP/1.1" 200 None
2024-05-04 00:35:25,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6c64259c4c9aea3f7c98e9736048d12500aa6fab/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:35:26,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6c64259c4c9aea3f7c98e9736048d12500aa6fab HTTP/1.1" 200 None
2024-05-04 00:35:26,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/6c64259c4c9aea3f7c98e9736048d12500aa6fab?per_page=1 HTTP/1.1" 200 2
2024-05-04 00:35:26,669 [ scc.repo] DEBUG - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-04 00:35:26,669 [ scc.repo] DEBUG ## Branches found:
2024-05-04 00:35:26,669 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:35:26,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:26,674 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-04 00:35:26,679 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-04 00:35:26,679 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-04 00:35:26,686 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-04 00:35:26,691 [ scc.git] DEBUG Already up to date.
2024-05-04 00:35:26,691 [ scc.git] DEBUG Calling 'git fetch origin pull/278/head'
2024-05-04 00:35:27,100 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-05-04 00:35:27,100 [ scc.git] DEBUG * branch refs/pull/278/head -> FETCH_HEAD
2024-05-04 00:35:27,105 [ scc.git] DEBUG ## Unique users: []
2024-05-04 00:35:27,106 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:35:27,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:27,111 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6c64259c4c9aea3f7c98e9736048d12500aa6fab'
2024-05-04 00:35:27,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:27,120 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 278 (Bump omero-py from `52d9a6f` to `53a327b`) 6c64259c4c9aea3f7c98e9736048d12500aa6fab'
2024-05-04 00:35:27,124 [ scc.git] DEBUG Already up to date.
2024-05-04 00:35:27,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:35:27,270 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-04 00:35:27,331 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:35:27,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:27,336 [ scc.repo] DEBUG ## PRs found:
2024-05-04 00:35:27,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-05-04 00:35:28,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None
2024-05-04 00:35:28,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None
2024-05-04 00:35:29,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-05-04 00:35:29,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:35:30,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-04 00:35:30,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-05-04 00:35:30,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8?per_page=1 HTTP/1.1" 200 2
2024-05-04 00:35:30,945 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code'
2024-05-04 00:35:31,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-05-04 00:35:31,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-05-04 00:35:32,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-04 00:35:32,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:35:33,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-04 00:35:33,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-05-04 00:35:33,689 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-04 00:35:33,690 [ scc.repo] DEBUG ## Branches found:
2024-05-04 00:35:33,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-04 00:35:33,690 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:35:33,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:33,702 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-04 00:35:33,707 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-04 00:35:33,707 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-04 00:35:33,713 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-04 00:35:33,719 [ scc.git] DEBUG Already up to date.
2024-05-04 00:35:33,719 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-05-04 00:35:34,182 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-04 00:35:34,182 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-05-04 00:35:34,189 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-05-04 00:35:34,576 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-04 00:35:34,576 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-05-04 00:35:34,583 [ scc.git] DEBUG ## Unique users: []
2024-05-04 00:35:34,583 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:35:34,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:34,590 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-05-04 00:35:34,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:34,603 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-05-04 00:35:34,676 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:35:34,681 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-05-04 00:35:34,681 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-05-04 00:35:34,681 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-05-04 00:35:34,681 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-05-04 00:35:34,681 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-05-04 00:35:34,681 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-05-04 00:35:34,681 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-05-04 00:35:34,681 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-05-04 00:35:34,681 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-05-04 00:35:34,683 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-05-04 00:35:34,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:35:34,851 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-05-04 00:35:34,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:34,864 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-05-04 00:35:34,979 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-05-04 00:35:34,980 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-05-04 00:35:34,980 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-05-04 00:35:34,980 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-05-04 00:35:34,980 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-05-04 00:35:34,980 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-05-04 00:35:34,980 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-05-04 00:35:34,980 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-05-04 00:35:34,980 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-05-04 00:35:34,980 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:35:34,987 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-05-04 00:35:34,987 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++--
2024-05-04 00:35:34,987 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++--
2024-05-04 00:35:34,987 [ scc.git] DEBUG Dockerfile | 32 ----------------------
2024-05-04 00:35:34,987 [ scc.git] DEBUG setup.py | 2 +-
2024-05-04 00:35:34,987 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 -
2024-05-04 00:35:34,987 [ scc.git] DEBUG src/fsDirectory.py | 8 +-----
2024-05-04 00:35:34,987 [ scc.git] DEBUG src/fsDropBox.py | 8 +-----
2024-05-04 00:35:34,987 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +-------
2024-05-04 00:35:34,987 [ scc.git] DEBUG src/fsFileServer.py | 12 ++-------
2024-05-04 00:35:34,988 [ scc.git] DEBUG src/fsLists.py | 2 --
2024-05-04 00:35:34,988 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------
2024-05-04 00:35:34,988 [ scc.git] DEBUG src/fsMonitor.py | 2 --
2024-05-04 00:35:34,988 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++---
2024-05-04 00:35:34,988 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 ---
2024-05-04 00:35:34,988 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++----------
2024-05-04 00:35:34,988 [ scc.git] DEBUG src/fsUtil.py | 9 +++----
2024-05-04 00:35:34,988 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +-----
2024-05-04 00:35:34,988 [ scc.git] DEBUG test/conftest.py | 2 --
2024-05-04 00:35:34,988 [ scc.git] DEBUG test/drivers.py | 17 +++---------
2024-05-04 00:35:34,988 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++----------------------
2024-05-04 00:35:34,988 [ scc.git] DEBUG test/unit/test_monitor.py | 2 --
2024-05-04 00:35:34,988 [ scc.git] DEBUG test/unit/test_replay.py | 8 +-----
2024-05-04 00:35:34,988 [ scc.git] DEBUG test/unit/test_state.py | 1 -
2024-05-04 00:35:34,988 [ scc.git] DEBUG tox.ini | 3 ++-
2024-05-04 00:35:34,988 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-)
2024-05-04 00:35:34,988 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-05-04 00:35:35,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:35:35,267 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-04 00:35:35,360 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:35:35,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:35,367 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-04 00:35:35,430 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-04 00:35:35,439 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb0abb55c10> has no local changes
2024-05-04 00:35:35,439 [ 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'
- PR 23 sbesson 'Remove python-future compatibility code'
Generated by OMERO-python-superbuild-push#51 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/51/)'
2024-05-04 00:35:35,466 [ scc.git] DEBUG [detached HEAD af83857] merge master -Dorg -Ssuccess-only
2024-05-04 00:35:35,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:35:35,467 [ scc.repo] DEBUG ## PRs found:
2024-05-04 00:35:35,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-05-04 00:35:36,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-05-04 00:35:36,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-05-04 00:35:37,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-04 00:35:37,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:35:38,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-04 00:35:38,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-04 00:35:38,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-05-04 00:35:38,948 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-04 00:35:39,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-05-04 00:35:39,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-05-04 00:35:40,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-05-04 00:35:40,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-05-04 00:35:40,818 [ scc.repo] DEBUG ## Branches found:
2024-05-04 00:35:40,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-04 00:35:40,818 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:35:40,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:40,823 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-04 00:35:40,828 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-04 00:35:40,828 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-04 00:35:40,834 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-04 00:35:40,840 [ scc.git] DEBUG Already up to date.
2024-05-04 00:35:40,840 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-05-04 00:35:41,317 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-05-04 00:35:41,317 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-05-04 00:35:41,328 [ scc.git] DEBUG ## Unique users: []
2024-05-04 00:35:41,329 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:35:41,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:41,338 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-04 00:35:41,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:41,358 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-04 00:35:41,407 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-05-04 00:35:41,408 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:35:41,411 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-05-04 00:35:41,412 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-05-04 00:35:41,412 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-05-04 00:35:41,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:35:41,568 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-04 00:35:41,615 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:35:41,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:35:41,620 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-04 00:35:41,665 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-04 00:35:41,672 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb0abaf00d0> has no local changes
2024-05-04 00:35:41,672 [ 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#51 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/51/)'
2024-05-04 00:35:41,682 [ scc.git] DEBUG [detached HEAD 48f54b1] merge master -Dorg -Ssuccess-only
2024-05-04 00:35:41,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:35:41,683 [ scc.repo] DEBUG ## PRs found:
2024-05-04 00:35:42,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-05-04 00:35:42,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-05-04 00:35:43,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-05-04 00:35:43,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-04 00:35:44,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:35:44,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-04 00:35:44,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-04 00:35:45,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-05-04 00:35:45,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-04 00:35:46,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-05-04 00:35:46,322 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-05-04 00:35:46,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-05-04 00:35:47,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-05-04 00:35:47,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-05-04 00:35:48,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:35:48,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-04 00:35:49,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-05-04 00:35:49,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-04 00:35:50,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:35:50,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-04 00:35:51,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-04 00:35:51,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-05-04 00:35:51,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-04 00:35:52,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-05-04 00:35:52,299 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-05-04 00:35:52,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-05-04 00:35:52,829 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-05-04 00:35:53,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-05-04 00:35:53,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-05-04 00:35:54,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-05-04 00:35:54,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-05-04 00:35:55,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-04 00:35:55,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:35:56,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-04 00:35:56,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-05-04 00:35:56,443 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-04 00:35:56,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-05-04 00:35:57,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-05-04 00:35:57,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-04 00:35:58,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:35:58,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-04 00:35:59,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-04 00:35:59,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:00,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-04 00:36:00,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-05-04 00:36:00,570 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-05-04 00:36:01,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-05-04 00:36:01,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-05-04 00:36:01,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-05-04 00:36:02,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-05-04 00:36:02,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-04 00:36:03,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:03,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-04 00:36:04,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-05-04 00:36:04,267 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-04 00:36:04,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-05-04 00:36:05,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-04 00:36:05,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:06,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-04 00:36:06,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-05-04 00:36:06,538 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-04 00:36:06,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-05-04 00:36:07,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-05-04 00:36:07,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-04 00:36:08,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:08,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-04 00:36:09,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-05-04 00:36:09,227 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-04 00:36:09,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-05-04 00:36:10,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-05-04 00:36:10,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-04 00:36:11,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:11,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-04 00:36:11,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-05-04 00:36:11,932 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-05-04 00:36:12,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-05-04 00:36:13,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-05-04 00:36:13,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-05-04 00:36:14,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-05-04 00:36:14,043 [ scc.repo] DEBUG ## Branches found:
2024-05-04 00:36:14,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-04 00:36:14,044 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:36:14,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:14,050 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-04 00:36:14,059 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-04 00:36:14,059 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-04 00:36:14,065 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-04 00:36:14,069 [ scc.git] DEBUG Already up to date.
2024-05-04 00:36:14,070 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-05-04 00:36:14,833 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-04 00:36:14,833 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-05-04 00:36:14,838 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-05-04 00:36:15,365 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-04 00:36:15,365 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-05-04 00:36:15,371 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-05-04 00:36:15,867 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-04 00:36:15,867 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-05-04 00:36:15,876 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-05-04 00:36:16,318 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-04 00:36:16,318 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-05-04 00:36:16,326 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-05-04 00:36:16,818 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-04 00:36:16,819 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-05-04 00:36:16,825 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-05-04 00:36:17,215 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-04 00:36:17,215 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-05-04 00:36:17,222 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-05-04 00:36:17,609 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-04 00:36:17,610 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-05-04 00:36:17,617 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-05-04 00:36:18,076 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-04 00:36:18,076 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-05-04 00:36:18,085 [ scc.git] DEBUG ## Unique users: []
2024-05-04 00:36:18,085 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:36:18,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:18,090 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-04 00:36:18,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:18,109 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-04 00:36:18,238 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-05-04 00:36:18,238 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-05-04 00:36:18,239 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:36:18,243 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-05-04 00:36:18,243 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-05-04 00:36:18,243 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-05-04 00:36:18,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:36:18,411 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-04 00:36:18,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:18,428 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-04 00:36:18,610 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-04 00:36:18,610 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-05-04 00:36:18,624 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:36:18,632 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-05-04 00:36:18,632 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-05-04 00:36:18,632 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-05-04 00:36:18,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:36:18,820 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-05-04 00:36:18,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:18,836 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-05-04 00:36:18,984 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-05-04 00:36:18,998 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:36:19,001 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-05-04 00:36:19,001 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-05-04 00:36:19,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:36:19,237 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-05-04 00:36:19,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:19,259 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2024-05-04 00:36:19,324 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-05-04 00:36:19,324 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-05-04 00:36:19,335 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:36:19,339 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-05-04 00:36:19,339 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-05-04 00:36:19,339 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-05-04 00:36:19,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:36:19,658 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-04 00:36:19,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:19,674 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-04 00:36:19,746 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:36:19,749 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-05-04 00:36:19,749 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-05-04 00:36:19,749 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-05-04 00:36:19,749 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-05-04 00:36:19,749 [ scc.git] DEBUG create mode 100644 connect.py
2024-05-04 00:36:20,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:36:20,089 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-05-04 00:36:20,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:20,103 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-05-04 00:36:20,253 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-05-04 00:36:20,254 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:36:20,257 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-05-04 00:36:20,257 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-04 00:36:20,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:36:20,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-05-04 00:36:20,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:20,517 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-05-04 00:36:20,609 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-05-04 00:36:20,610 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:36:20,614 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-05-04 00:36:20,614 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-05-04 00:36:20,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:36:20,906 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-04 00:36:20,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:20,931 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-04 00:36:21,032 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-04 00:36:21,033 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:36:21,043 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-05-04 00:36:21,043 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-05-04 00:36:21,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:36:21,315 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-04 00:36:21,362 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:36:21,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:21,368 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-04 00:36:21,408 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-04 00:36:21,432 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb0aaa94760> has no local changes
2024-05-04 00:36:21,432 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
Generated by OMERO-python-superbuild-push#51 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/51/)'
2024-05-04 00:36:21,443 [ scc.git] DEBUG [detached HEAD ed6b15e5] merge master -Dorg -Ssuccess-only
2024-05-04 00:36:21,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:36:21,444 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-04 00:36:21,444 [ scc.repo] DEBUG ## PRs found:
2024-05-04 00:36:21,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-04 00:36:22,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-04 00:36:22,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-04 00:36:23,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-04 00:36:23,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-04 00:36:24,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-04 00:36:24,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-04 00:36:25,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-04 00:36:25,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:26,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-04 00:36:26,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-05-04 00:36:26,472 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-04 00:36:26,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-04 00:36:27,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-04 00:36:27,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-04 00:36:28,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-04 00:36:28,393 [ scc.repo] DEBUG ## Branches found:
2024-05-04 00:36:28,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-04 00:36:28,393 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:36:28,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:28,398 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-04 00:36:28,404 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-04 00:36:28,404 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-04 00:36:28,410 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-04 00:36:28,415 [ scc.git] DEBUG Already up to date.
2024-05-04 00:36:28,416 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-04 00:36:28,880 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-05-04 00:36:28,880 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-04 00:36:28,887 [ scc.git] DEBUG ## Unique users: []
2024-05-04 00:36:28,887 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:36:28,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:28,892 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-04 00:36:28,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:28,901 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-04 00:36:28,955 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-04 00:36:28,955 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-04 00:36:28,955 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-04 00:36:28,956 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-04 00:36:28,961 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-04 00:36:28,965 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-04 00:36:29,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:36:29,118 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-04 00:36:29,124 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-04 00:36:29,129 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#51](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/51/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/51/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-04 00:36:29,133 [ scc.config] DEBUG Found github.token
2024-05-04 00:36:29,133 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-04 00:36:29,133 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-04 00:36:29,169 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:36:29,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:29,173 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-04 00:36:29,220 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-04 00:36:29,227 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb0aaa79640> has no local changes
2024-05-04 00:36:29,227 [ 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#51 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/51/)'
2024-05-04 00:36:29,234 [ scc.git] DEBUG [detached HEAD 9b66927] merge master -Dorg -Ssuccess-only
2024-05-04 00:36:29,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:36:29,234 [ scc.repo] DEBUG ## PRs found:
2024-05-04 00:36:29,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-05-04 00:36:30,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/553 HTTP/1.1" 200 None
2024-05-04 00:36:30,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None
2024-05-04 00:36:31,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None
2024-05-04 00:36:31,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712 HTTP/1.1" 200 None
2024-05-04 00:36:32,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:32,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-04 00:36:33,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None
2024-05-04 00:36:33,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None
2024-05-04 00:36:33,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-04 00:36:34,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:34,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-04 00:36:35,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-04 00:36:35,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4?per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:36,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-04 00:36:36,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None
2024-05-04 00:36:36,631 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks'
2024-05-04 00:36:37,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None
2024-05-04 00:36:37,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None
2024-05-04 00:36:37,611 [ scc.repo] DEBUG # ... Include label: include
2024-05-04 00:36:38,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-04 00:36:38,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:39,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-04 00:36:39,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-04 00:36:39,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/977f7b65169e6dee479197a9156993bbadd2d2e2?per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:40,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-04 00:36:40,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None
2024-05-04 00:36:40,776 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-04 00:36:41,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-05-04 00:36:41,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-05-04 00:36:42,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-05-04 00:36:42,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-04 00:36:43,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:43,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-04 00:36:44,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-04 00:36:44,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:44,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-04 00:36:45,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-05-04 00:36:45,417 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-04 00:36:45,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None
2024-05-04 00:36:46,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-05-04 00:36:46,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:47,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-04 00:36:47,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-05-04 00:36:48,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/e335980be1e7197826687f6c322a60c61b4aa545?per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:48,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-05-04 00:36:49,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/status HTTP/1.1" 200 None
2024-05-04 00:36:49,040 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel'
2024-05-04 00:36:49,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-05-04 00:36:49,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-05-04 00:36:50,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-04 00:36:50,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:51,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-04 00:36:51,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-04 00:36:52,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:52,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-04 00:36:53,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-05-04 00:36:53,138 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-04 00:36:53,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-05-04 00:36:54,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-05-04 00:36:54,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-05-04 00:36:54,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-04 00:36:55,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-05-04 00:36:55,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/219d9e721304a4c46b4d73ef9ff3777549d69615?per_page=1 HTTP/1.1" 200 2
2024-05-04 00:36:55,938 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler'
2024-05-04 00:36:55,939 [ scc.repo] DEBUG ## Branches found:
2024-05-04 00:36:55,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-04 00:36:55,939 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:36:55,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:55,944 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-04 00:36:55,948 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-04 00:36:55,948 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-04 00:36:55,953 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-04 00:36:55,958 [ scc.git] DEBUG Already up to date.
2024-05-04 00:36:55,958 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head'
2024-05-04 00:36:56,687 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-04 00:36:56,687 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD
2024-05-04 00:36:56,695 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-05-04 00:36:57,176 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-04 00:36:57,177 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-05-04 00:36:57,184 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head'
2024-05-04 00:36:57,571 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-04 00:36:57,571 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD
2024-05-04 00:36:57,578 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-05-04 00:36:58,023 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-04 00:36:58,023 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-05-04 00:36:58,029 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head'
2024-05-04 00:36:58,913 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-04 00:36:58,913 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD
2024-05-04 00:36:58,919 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head'
2024-05-04 00:36:59,867 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-04 00:36:59,867 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD
2024-05-04 00:36:59,872 [ scc.git] DEBUG ## Unique users: []
2024-05-04 00:36:59,873 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:36:59,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:59,880 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-05-04 00:36:59,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:36:59,908 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-05-04 00:36:59,965 [ scc.git] DEBUG Auto-merging test/unit/test_web.py
2024-05-04 00:36:59,965 [ scc.git] DEBUG CONFLICT (content): Merge conflict in test/unit/test_web.py
2024-05-04 00:36:59,966 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-04 00:36:59,967 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-04 00:36:59,975 [ scc.git] DEBUG Calling 'git reset --hard e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-05-04 00:36:59,987 [ scc.git] DEBUG HEAD is now at e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-05-04 00:37:00,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:37:00,148 [ scc.git] DEBUG Calling 'git merge-base e1b1355ebd4f9de8b855dd2c55f59d86c061a81b 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-05-04 00:37:00,164 [ scc.git] DEBUG Calling 'git diff --name-only 632d14a9cab5319c6b1bd9190d441a95e457103b..e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-05-04 00:37:00,287 [ scc.git] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#51](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/51/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/51/consoleText) for more details.
Possible conflicts:
- Upstream changes
- test/unit/test_web.py
--conflicts
2024-05-04 00:37:00,292 [ scc.config] DEBUG Found github.token
2024-05-04 00:37:00,292 [ scc.git] DEBUG Not adding comment to issue #168, already --conflicts.
2024-05-04 00:37:00,292 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-05-04 00:37:00,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:37:00,302 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-05-04 00:37:00,348 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-05-04 00:37:00,348 [ scc.git] DEBUG Auto-merging setup.py
2024-05-04 00:37:00,349 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:37:00,353 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-05-04 00:37:00,353 [ scc.git] DEBUG setup.py | 1 +
2024-05-04 00:37:00,353 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-05-04 00:37:00,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:37:00,558 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e335980be1e7197826687f6c322a60c61b4aa545'
2024-05-04 00:37:00,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:37:00,569 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) e335980be1e7197826687f6c322a60c61b4aa545'
2024-05-04 00:37:00,597 [ scc.git] DEBUG Auto-merging README.rst
2024-05-04 00:37:00,598 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:37:00,601 [ scc.git] DEBUG README.rst | 3 +--
2024-05-04 00:37:00,601 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 2 deletions(-)
2024-05-04 00:37:00,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:37:00,970 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-05-04 00:37:00,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:37:00,982 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-05-04 00:37:01,104 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-05-04 00:37:01,105 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-05-04 00:37:01,106 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:37:01,110 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-05-04 00:37:01,111 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-05-04 00:37:01,111 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-05-04 00:37:01,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:37:01,384 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-05-04 00:37:01,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:37:01,397 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-05-04 00:37:01,535 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-05-04 00:37:01,537 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:37:01,551 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++-------
2024-05-04 00:37:01,551 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++----
2024-05-04 00:37:01,551 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++
2024-05-04 00:37:01,551 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++---
2024-05-04 00:37:01,551 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++-----
2024-05-04 00:37:01,551 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +-
2024-05-04 00:37:01,551 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++--
2024-05-04 00:37:01,551 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-)
2024-05-04 00:37:01,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:37:01,794 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-05-04 00:37:01,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:37:01,809 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 543 (Block UI for some long running tasks) 8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-05-04 00:37:01,944 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html
2024-05-04 00:37:01,946 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-04 00:37:01,952 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++
2024-05-04 00:37:01,952 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++-----
2024-05-04 00:37:01,952 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++---
2024-05-04 00:37:01,952 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 +
2024-05-04 00:37:01,953 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +-
2024-05-04 00:37:01,953 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +-
2024-05-04 00:37:01,953 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 ---------------------
2024-05-04 00:37:01,953 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 -
2024-05-04 00:37:01,953 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++--
2024-05-04 00:37:01,953 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-)
2024-05-04 00:37:01,953 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js
2024-05-04 00:37:02,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:37:02,198 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-04 00:37:02,243 [ scc.git] DEBUG Get sha1 of %s
2024-05-04 00:37:02,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-04 00:37:02,249 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-04 00:37:02,291 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-04 00:37:02,324 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb0aaaa6910> has no local changes
2024-05-04 00:37:02,324 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 549 knabar 'Remove webgateway cache' (status: failure)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 543 knabar 'Block UI for some long running tasks'
Conflicting PRs (not included):
- PR 168 stick 'Changes to nginx @maintenance handler'
Generated by OMERO-python-superbuild-push#51 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/51/)'
2024-05-04 00:37:02,353 [ scc.git] DEBUG [detached HEAD 92367fa07] merge master -Dorg -Ssuccess-only
2024-05-04 00:37:02,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:37:02,354 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-04 00:37:02,410 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-05-04 00:37:02,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:37:02,656 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-05-04 00:37:03,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:37:03,086 [ scc.config] DEBUG Found submodule.omero-py.url
2024-05-04 00:37:03,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:37:03,502 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-05-04 00:37:03,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:37:03,901 [ scc.config] DEBUG Found submodule.omero-web.url
2024-05-04 00:37:04,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-04 00:37:04,300 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-04 00:37:04,328 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb0adeff460> has local changes
2024-05-04 00:37:04,328 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
- PR 23 sbesson 'Remove python-future compatibility code'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 549 knabar 'Remove webgateway cache' (status: failure)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 543 knabar 'Block UI for some long running tasks'
Conflicting PRs (not included):
- PR 168 stick 'Changes to nginx @maintenance handler'
Generated by OMERO-python-superbuild-push#51 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/51/)'
2024-05-04 00:37:04,355 [ scc.git] DEBUG [detached HEAD c758c54] merge master -Dorg -Ssuccess-only
2024-05-04 00:37:04,355 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-05-04 00:37:04,355 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-04 00:37:04,355 [ scc.merge] INFO Already up to date.
2024-05-04 00:37:04,355 [ scc.merge] INFO
2024-05-04 00:37:04,355 [ scc.merge] INFO Merged PRs:
2024-05-04 00:37:04,355 [ scc.merge] INFO - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-04 00:37:04,355 [ scc.merge] INFO
2024-05-04 00:37:04,356 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-05-04 00:37:04,356 [ scc.merge] INFO Already up to date.
2024-05-04 00:37:04,356 [ scc.merge] INFO
2024-05-04 00:37:04,356 [ scc.merge] INFO Merged PRs:
2024-05-04 00:37:04,356 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-04 00:37:04,356 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code'
2024-05-04 00:37:04,356 [ scc.merge] INFO
2024-05-04 00:37:04,356 [ scc.merge] INFO Repository: ome/omero-marshal
2024-05-04 00:37:04,356 [ scc.merge] INFO Excluded PRs:
2024-05-04 00:37:04,356 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-05-04 00:37:04,356 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-05-04 00:37:04,356 [ scc.merge] INFO Already up to date.
2024-05-04 00:37:04,356 [ scc.merge] INFO
2024-05-04 00:37:04,356 [ scc.merge] INFO Merged PRs:
2024-05-04 00:37:04,356 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-04 00:37:04,356 [ scc.merge] INFO
2024-05-04 00:37:04,356 [ scc.merge] INFO Repository: ome/omero-py
2024-05-04 00:37:04,356 [ scc.merge] INFO Excluded PRs:
2024-05-04 00:37:04,356 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-05-04 00:37:04,356 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-05-04 00:37:04,356 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-05-04 00:37:04,356 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-05-04 00:37:04,356 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-05-04 00:37:04,356 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-05-04 00:37:04,357 [ scc.merge] INFO Already up to date.
2024-05-04 00:37:04,357 [ scc.merge] INFO
2024-05-04 00:37:04,357 [ scc.merge] INFO Merged PRs:
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-05-04 00:37:04,357 [ scc.merge] INFO
2024-05-04 00:37:04,357 [ scc.merge] INFO Repository: ome/omero-scripts
2024-05-04 00:37:04,357 [ scc.merge] INFO Excluded PRs:
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-04 00:37:04,357 [ scc.merge] INFO Already up to date.
2024-05-04 00:37:04,357 [ scc.merge] INFO
2024-05-04 00:37:04,357 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-04 00:37:04,357 [ scc.merge] INFO
2024-05-04 00:37:04,357 [ scc.merge] INFO Repository: ome/omero-web
2024-05-04 00:37:04,357 [ scc.merge] INFO Excluded PRs:
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache' (status: failure)
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-05-04 00:37:04,357 [ scc.merge] INFO Already up to date.
2024-05-04 00:37:04,357 [ scc.merge] INFO
2024-05-04 00:37:04,357 [ scc.merge] INFO Merged PRs:
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-05-04 00:37:04,357 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-04 00:37:04,358 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-04 00:37:04,358 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks'
2024-05-04 00:37:04,358 [ scc.merge] INFO
2024-05-04 00:37:04,358 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-04 00:37:04,358 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
2024-05-04 00:37:04,358 [ scc.merge] INFO
2024-05-04 00:37:04,358 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-04 00:37:04,358 [ scc.git] DEBUG Calling 'git remote'
2024-05-04 00:37:04,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-04 00:37:04,364 [ scc.git] DEBUG Calling 'git remote'
2024-05-04 00:37:04,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:37:04,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-04 00:37:04,371 [ scc.git] DEBUG Calling 'git remote'
2024-05-04 00:37:04,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:37:04,376 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-04 00:37:04,376 [ scc.git] DEBUG Calling 'git remote'
2024-05-04 00:37:04,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:37:04,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-04 00:37:04,380 [ scc.git] DEBUG Calling 'git remote'
2024-05-04 00:37:04,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-04 00:37:04,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-04 00:37:04,385 [ scc.git] DEBUG Calling 'git remote'
2024-05-04 00:37:04,391 [ 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 5863350
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from cca4c2f
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 53a327b8
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from e1b1355eb
nothing to commit, working tree clean
HEAD detached from 9308a59
nothing to commit, working tree clean
2024-05-04 00:37:34,950 [ 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}
