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-22 03:03:36,410 [ scc.config] DEBUG Found github.token
2024-05-22 03:03:36,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-22 03:03:36,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:03:37,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:03:37,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-22 03:03:37,461 [ scc.gh] DEBUG 4635 remaining from 5000 (Reset at 03:05
2024-05-22 03:03:37,461 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-22 03:03:37,465 [ scc.git] DEBUG Check current status
2024-05-22 03:03:37,465 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-22 03:03:37,469 [ scc.git] DEBUG 43f3613 Merge pull request #280 from ome/dependabot/submodules/omero-web-c6314d8
2024-05-22 03:03:37,469 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-22 03:03:37,512 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-05-22 03:03:37,515 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-22 03:03:37,554 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-22 03:03:37,558 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-22 03:03:37,625 [ scc.git] DEBUG c6314d8a9917ba4112696d683516d89be8fafcb0 omero-web (v5.25.0-43-gc6314d8a9)
2024-05-22 03:03:37,629 [ scc.config] DEBUG Found remote.origin.url
2024-05-22 03:03:37,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-22 03:03:38,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-22 03:03:38,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-22 03:03:39,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-22 03:03:39,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-22 03:03:39,682 [ scc.git] DEBUG Resetting...
2024-05-22 03:03:39,683 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-22 03:03:39,689 [ scc.git] DEBUG HEAD is now at 43f3613 Merge pull request #280 from ome/dependabot/submodules/omero-web-c6314d8
2024-05-22 03:03:39,689 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-22 03:03:39,740 [ scc.git] DEBUG Check current status
2024-05-22 03:03:39,740 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-22 03:03:39,745 [ scc.git] DEBUG 43f3613 Merge pull request #280 from ome/dependabot/submodules/omero-web-c6314d8
2024-05-22 03:03:39,746 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-22 03:03:39,785 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-05-22 03:03:39,788 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-22 03:03:39,791 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-22 03:03:39,795 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-22 03:03:39,799 [ scc.git] DEBUG c6314d8a9917ba4112696d683516d89be8fafcb0 omero-web (v5.25.0-43-gc6314d8a9)
2024-05-22 03:03:39,800 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-22 03:03:39,800 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-22 03:03:39,800 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-22 03:03:39,800 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-22 03:03:39,800 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-22 03:03:39,800 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:03:40,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-05-22 03:03:40,119 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:03:40,119 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:03:40,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:03:40,124 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:03:40,128 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:03:40,128 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:03:40,133 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:03:40,139 [ scc.git] DEBUG Already up to date.
2024-05-22 03:03:40,139 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:03:40,139 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:03:40,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:03:40,143 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:03:40,187 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:03:40,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:03:40,192 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:03:40,360 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558404de80> has no local changes
2024-05-22 03:03:40,361 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Generated by OMERO-python-superbuild-push#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/69/)'
2024-05-22 03:03:40,385 [ scc.git] DEBUG [detached HEAD 1d23005] merge master -Dorg -Snone
2024-05-22 03:03:40,386 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-22 03:03:40,386 [ scc.merge] INFO Already up to date.
2024-05-22 03:03:40,386 [ scc.merge] INFO
2024-05-22 03:03:40,386 [ scc.merge] INFO
2024-05-22 03:03:40,386 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-22 03:03:40,386 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
From https://github.com/ome/omero-web
c6314d8a9..9c94fd493 master -> origin/master
* [new tag] v5.26.0 -> v5.26.0
Submodule path 'omero-web': checked out '9c94fd493eb94588de8432247e084be57d7ea928'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-05-22 03:03:42,996 [ scc.config] DEBUG Found github.token
2024-05-22 03:03:42,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-22 03:03:43,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:03:43,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:03:44,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-22 03:03:44,004 [ scc.gh] DEBUG 4627 remaining from 5000 (Reset at 03:05
2024-05-22 03:03:44,004 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-22 03:03:44,008 [ scc.git] DEBUG Check current status
2024-05-22 03:03:44,009 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-22 03:03:44,012 [ scc.git] DEBUG 1d23005 merge master -Dorg -Snone
2024-05-22 03:03:44,012 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-22 03:03:44,051 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-05-22 03:03:44,053 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-22 03:03:44,057 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-22 03:03:44,060 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-22 03:03:44,063 [ scc.git] DEBUG +9c94fd493eb94588de8432247e084be57d7ea928 omero-web (v5.26.0-1-g9c94fd493)
2024-05-22 03:03:44,067 [ scc.config] DEBUG Found remote.origin.url
2024-05-22 03:03:44,067 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-05-22 03:03:44,069 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-05-22 03:03:44,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-22 03:03:44,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-22 03:03:45,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-22 03:03:45,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-22 03:03:46,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-22 03:03:46,240 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:03:46,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-22 03:03:46,286 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-22 03:03:46,289 [ scc.git] DEBUG Check current status
2024-05-22 03:03:46,290 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-22 03:03:46,293 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-05-22 03:03:46,293 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-22 03:03:46,336 [ scc.config] DEBUG Found remote.origin.url
2024-05-22 03:03:46,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-05-22 03:03:47,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-22 03:03:47,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-22 03:03:48,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-22 03:03:48,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-22 03:03:48,479 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:03:48,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:03:48,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-22 03:03:48,522 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-22 03:03:48,525 [ scc.git] DEBUG Check current status
2024-05-22 03:03:48,525 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-22 03:03:48,529 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-05-22 03:03:48,529 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-22 03:03:48,582 [ scc.config] DEBUG Found remote.origin.url
2024-05-22 03:03:48,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-05-22 03:03:49,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-22 03:03:49,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-22 03:03:50,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-22 03:03:50,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-22 03:03:50,732 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:03:50,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:03:50,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-22 03:03:50,775 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-22 03:03:50,779 [ scc.git] DEBUG Check current status
2024-05-22 03:03:50,779 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-22 03:03:50,783 [ scc.git] DEBUG 53a327b8 Merge pull request #407 from jburel/install_conda_forge
2024-05-22 03:03:50,784 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-22 03:03:50,830 [ scc.config] DEBUG Found remote.origin.url
2024-05-22 03:03:51,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-05-22 03:03:51,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-22 03:03:52,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-22 03:03:52,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-22 03:03:52,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-22 03:03:52,966 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:03:53,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:03:53,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-22 03:03:53,009 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-22 03:03:53,013 [ scc.git] DEBUG Check current status
2024-05-22 03:03:53,013 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-22 03:03:53,017 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-22 03:03:53,017 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-22 03:03:53,060 [ scc.config] DEBUG Found remote.origin.url
2024-05-22 03:03:53,061 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-05-22 03:03:53,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-05-22 03:03:53,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-22 03:03:54,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-22 03:03:54,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-22 03:03:55,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-22 03:03:55,222 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:03:55,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:03:55,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-22 03:03:55,263 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-22 03:03:55,266 [ scc.git] DEBUG Check current status
2024-05-22 03:03:55,267 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-22 03:03:55,270 [ scc.git] DEBUG 9c94fd493 Bump version: 5.26.0 → 5.26.1.dev0
2024-05-22 03:03:55,271 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-22 03:03:55,312 [ scc.config] DEBUG Found remote.origin.url
2024-05-22 03:03:55,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-05-22 03:03:56,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-22 03:03:56,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-22 03:03:57,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-22 03:03:57,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-22 03:03:57,449 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:03:57,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:03:57,487 [ scc.git] DEBUG Resetting...
2024-05-22 03:03:57,487 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-22 03:03:57,493 [ scc.git] DEBUG HEAD is now at 1d23005 merge master -Dorg -Snone
2024-05-22 03:03:57,493 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-22 03:03:57,562 [ scc.git] DEBUG Submodule path 'omero-web': checked out 'c6314d8a9917ba4112696d683516d89be8fafcb0'
2024-05-22 03:03:57,565 [ scc.git] DEBUG Check current status
2024-05-22 03:03:57,565 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-22 03:03:57,570 [ scc.git] DEBUG 1d23005 merge master -Dorg -Snone
2024-05-22 03:03:57,570 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-22 03:03:57,610 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-05-22 03:03:57,612 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-22 03:03:57,616 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-22 03:03:57,620 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-22 03:03:57,624 [ scc.git] DEBUG c6314d8a9917ba4112696d683516d89be8fafcb0 omero-web (v5.25.0-43-gc6314d8a9)
2024-05-22 03:03:57,625 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-22 03:03:57,625 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-22 03:03:57,625 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-22 03:03:57,625 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-22 03:03:57,625 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-22 03:03:57,625 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-05-22 03:03:57,625 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:03:57,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-05-22 03:03:57,874 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:03:57,874 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:03:57,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:03:57,880 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:03:57,884 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:03:57,884 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:03:57,888 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:03:57,893 [ scc.git] DEBUG Already up to date.
2024-05-22 03:03:57,893 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:03:57,893 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:03:57,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:03:57,897 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:03:57,937 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:03:57,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:03:57,941 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:03:58,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-05-22 03:03:58,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-05-22 03:03:59,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-05-22 03:03:59,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-22 03:04:00,296 [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-22 03:04:00,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-22 03:04:01,144 [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-22 03:04:01,145 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-22 03:04:01,145 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:04:01,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-22 03:04:01,145 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:04:01,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:01,151 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:04:01,157 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:04:01,157 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:04:01,165 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:04:01,172 [ scc.git] DEBUG Already up to date.
2024-05-22 03:04:01,172 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-05-22 03:04:01,564 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-22 03:04:01,564 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-05-22 03:04:01,576 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:04:01,577 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:04:01,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:01,589 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-05-22 03:04:01,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:01,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-22 03:04:01,642 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-05-22 03:04:01,642 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-05-22 03:04:01,642 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-05-22 03:04:01,642 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-05-22 03:04:01,642 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-05-22 03:04:01,642 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-05-22 03:04:01,642 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-05-22 03:04:01,642 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-05-22 03:04:01,642 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-05-22 03:04:01,643 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:04:01,647 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-05-22 03:04:01,647 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-05-22 03:04:01,651 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-05-22 03:04:01,651 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-05-22 03:04:01,651 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-05-22 03:04:01,651 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-05-22 03:04:01,651 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-05-22 03:04:01,651 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-05-22 03:04:01,651 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-05-22 03:04:01,651 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-05-22 03:04:01,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:04:01,803 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:04:01,848 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:04:01,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:01,853 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:04:01,903 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:04:01,910 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d7cc1460> has no local changes
2024-05-22 03:04:01,910 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Generated by OMERO-python-superbuild-push#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/69/)'
2024-05-22 03:04:01,920 [ scc.git] DEBUG [detached HEAD 1e78d5f] merge master -Dorg -Ssuccess-only
2024-05-22 03:04:01,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:04:01,920 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:04:02,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-05-22 03:04:02,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-05-22 03:04:03,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-05-22 03:04:03,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-22 03:04:04,360 [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-22 03:04:04,881 [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-22 03:04:05,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-22 03:04:05,843 [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-22 03:04:05,844 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-22 03:04:06,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-05-22 03:04:06,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-05-22 03:04:07,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-05-22 03:04:07,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-05-22 03:04:07,700 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:04:07,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-22 03:04:07,701 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:04:07,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:07,705 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:04:07,709 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:04:07,709 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:04:07,713 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:04:07,718 [ scc.git] DEBUG Already up to date.
2024-05-22 03:04:07,718 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-05-22 03:04:08,170 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-05-22 03:04:08,170 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-05-22 03:04:08,174 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:04:08,174 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:04:08,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:08,179 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-22 03:04:08,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:08,187 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-22 03:04:08,196 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-05-22 03:04:08,197 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:04:08,199 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-05-22 03:04:08,199 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-05-22 03:04:08,199 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-05-22 03:04:08,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:04:08,359 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:04:08,400 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:04:08,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:08,404 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:04:08,446 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:04:08,452 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d7c51d00> has no local changes
2024-05-22 03:04:08,452 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/69/)'
2024-05-22 03:04:08,461 [ scc.git] DEBUG [detached HEAD a2d58d6] merge master -Dorg -Ssuccess-only
2024-05-22 03:04:08,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:04:08,462 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:04:09,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-05-22 03:04:09,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-05-22 03:04:10,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-05-22 03:04:10,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-22 03:04:11,018 [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-22 03:04:11,491 [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-22 03:04:12,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-22 03:04:12,435 [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-22 03:04:12,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-22 03:04:13,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-05-22 03:04:13,311 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-05-22 03:04:13,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-05-22 03:04:14,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-05-22 03:04:14,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-05-22 03:04:15,274 [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-22 03:04:15,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-22 03:04:16,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-05-22 03:04:16,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-22 03:04:17,270 [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-22 03:04:17,714 [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-22 03:04:18,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-22 03:04:18,575 [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-22 03:04:19,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-22 03:04:19,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-05-22 03:04:19,452 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-05-22 03:04:19,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-05-22 03:04:19,913 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-05-22 03:04:20,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-05-22 03:04:20,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-05-22 03:04:21,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-05-22 03:04:21,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-05-22 03:04:22,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-22 03:04:22,741 [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-22 03:04:23,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-22 03:04:23,646 [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-22 03:04:23,647 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-22 03:04:24,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-05-22 03:04:24,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-05-22 03:04:25,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-22 03:04:25,611 [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-22 03:04:26,089 [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-22 03:04:26,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-22 03:04:26,955 [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-22 03:04:27,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-22 03:04:27,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-05-22 03:04:27,817 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-05-22 03:04:28,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-05-22 03:04:28,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-05-22 03:04:29,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-05-22 03:04:29,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-05-22 03:04:30,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-22 03:04:30,665 [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-22 03:04:31,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-22 03:04:31,562 [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-22 03:04:31,563 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-22 03:04:32,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-05-22 03:04:32,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-22 03:04:33,006 [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-22 03:04:33,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-22 03:04:33,872 [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-22 03:04:33,873 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-22 03:04:34,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-05-22 03:04:34,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-05-22 03:04:35,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-22 03:04:36,013 [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-22 03:04:36,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-22 03:04:36,959 [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-22 03:04:36,960 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-22 03:04:37,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-05-22 03:04:37,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-05-22 03:04:38,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-22 03:04:38,872 [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-22 03:04:39,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-22 03:04:39,738 [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-22 03:04:39,739 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-05-22 03:04:40,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-05-22 03:04:40,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-05-22 03:04:41,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-05-22 03:04:41,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-05-22 03:04:41,637 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:04:41,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-22 03:04:41,637 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:04:41,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:41,642 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:04:41,646 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:04:41,647 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:04:41,651 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:04:41,657 [ scc.git] DEBUG Already up to date.
2024-05-22 03:04:41,657 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-05-22 03:04:42,136 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-22 03:04:42,136 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-05-22 03:04:42,141 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-05-22 03:04:42,544 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-22 03:04:42,544 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-05-22 03:04:42,550 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-05-22 03:04:42,929 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-22 03:04:42,929 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-05-22 03:04:42,935 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-05-22 03:04:43,359 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-22 03:04:43,360 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-05-22 03:04:43,364 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-05-22 03:04:43,877 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-22 03:04:43,878 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-05-22 03:04:43,883 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-05-22 03:04:44,261 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-22 03:04:44,261 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-05-22 03:04:44,266 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-05-22 03:04:44,642 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-22 03:04:44,642 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-05-22 03:04:44,648 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-05-22 03:04:45,086 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-22 03:04:45,089 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-05-22 03:04:45,103 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:04:45,104 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:04:45,104 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:45,109 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-22 03:04:45,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:45,125 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-22 03:04:45,168 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-05-22 03:04:45,169 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-05-22 03:04:45,169 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:04:45,174 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-05-22 03:04:45,174 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-05-22 03:04:45,174 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-05-22 03:04:45,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:04:45,336 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-22 03:04:45,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:45,352 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-22 03:04:45,465 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-22 03:04:45,465 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-05-22 03:04:45,466 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:04:45,473 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-05-22 03:04:45,473 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-05-22 03:04:45,473 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-05-22 03:04:45,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:04:45,755 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-05-22 03:04:45,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:45,773 [ 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-22 03:04:45,844 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-05-22 03:04:45,845 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:04:45,848 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-05-22 03:04:45,848 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-05-22 03:04:46,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:04:46,159 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-05-22 03:04:46,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:46,178 [ 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-22 03:04:46,261 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-05-22 03:04:46,261 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-05-22 03:04:46,262 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:04:46,265 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-05-22 03:04:46,265 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-05-22 03:04:46,265 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-05-22 03:04:46,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:04:46,576 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-22 03:04:46,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:46,593 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-22 03:04:46,626 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:04:46,629 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-05-22 03:04:46,629 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-05-22 03:04:46,629 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-05-22 03:04:46,629 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-05-22 03:04:46,629 [ scc.git] DEBUG create mode 100644 connect.py
2024-05-22 03:04:46,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:04:46,984 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-05-22 03:04:46,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:47,000 [ 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-22 03:04:47,060 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-05-22 03:04:47,061 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:04:47,065 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-05-22 03:04:47,065 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-22 03:04:47,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:04:47,409 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-05-22 03:04:47,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:47,426 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-05-22 03:04:47,524 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-05-22 03:04:47,525 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:04:47,529 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-05-22 03:04:47,529 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-05-22 03:04:47,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:04:47,805 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-22 03:04:47,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:47,820 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-22 03:04:47,867 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-22 03:04:47,867 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:04:47,874 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-05-22 03:04:47,875 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-05-22 03:04:48,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:04:48,221 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:04:48,265 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:04:48,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:48,270 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:04:48,312 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:04:48,321 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d6bf9790> has no local changes
2024-05-22 03:04:48,321 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/69/)'
2024-05-22 03:04:48,331 [ scc.git] DEBUG [detached HEAD cbfa8fe9] merge master -Dorg -Ssuccess-only
2024-05-22 03:04:48,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:04:48,331 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-22 03:04:48,331 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:04:48,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-22 03:04:49,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-22 03:04:49,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-22 03:04:50,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-22 03:04:50,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-22 03:04:51,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-22 03:04:51,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-22 03:04:52,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-22 03:04:52,629 [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-22 03:04:53,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-22 03:04:53,560 [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-22 03:04:53,561 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-22 03:04:54,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-22 03:04:54,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-22 03:04:55,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-22 03:04:55,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-22 03:04:55,545 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:04:55,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-22 03:04:55,545 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:04:55,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:55,550 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-22 03:04:55,554 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:04:55,554 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-22 03:04:55,558 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-22 03:04:55,563 [ scc.git] DEBUG Already up to date.
2024-05-22 03:04:55,563 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-22 03:04:56,026 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-05-22 03:04:56,026 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-22 03:04:56,031 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:04:56,031 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:04:56,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:56,037 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-22 03:04:56,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:56,048 [ 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-22 03:04:56,099 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-22 03:04:56,100 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-22 03:04:56,100 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-22 03:04:56,100 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-22 03:04:56,106 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-22 03:04:56,112 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-22 03:04:56,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:04:56,269 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-22 03:04:56,275 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-22 03:04:56,280 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#69](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/69/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/69/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-22 03:04:56,284 [ scc.config] DEBUG Found github.token
2024-05-22 03:04:56,284 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-22 03:04:56,285 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:04:56,324 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:04:56,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:04:56,329 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:04:56,369 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:04:56,375 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d7c5cf10> has no local changes
2024-05-22 03:04:56,375 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/69/)'
2024-05-22 03:04:56,383 [ scc.git] DEBUG [detached HEAD 6fb5eca] merge master -Dorg -Ssuccess-only
2024-05-22 03:04:56,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:04:56,383 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:04:56,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-05-22 03:04:57,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/554 HTTP/1.1" 200 None
2024-05-22 03:04:57,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-05-22 03:04:58,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-05-22 03:04:58,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-05-22 03:04:59,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-22 03:04:59,708 [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-22 03:05:00,212 [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-22 03:05:00,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-22 03:05:01,142 [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-22 03:05:01,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-22 03:05:02,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-05-22 03:05:02,091 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-22 03:05:02,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-05-22 03:05:03,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-05-22 03:05:03,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-22 03:05:04,076 [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-22 03:05:04,545 [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-22 03:05:05,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-22 03:05:05,460 [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-22 03:05:05,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-22 03:05:06,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-05-22 03:05:06,333 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-22 03:05:06,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-05-22 03:05:07,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-05-22 03:05:07,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-05-22 03:05:08,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-22 03:05:08,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-22 03:05:08,773 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:05:08,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-22 03:05:08,774 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:05:08,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:05:08,778 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:05:08,785 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:05:08,786 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:05:08,792 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:05:08,809 [ scc.git] DEBUG Updating c6314d8a9..9c94fd493
2024-05-22 03:05:09,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/557 HTTP/1.1" 200 None
2024-05-22 03:05:09,427 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-05-22 03:05:09,984 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-22 03:05:09,984 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-05-22 03:05:09,991 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-05-22 03:05:10,405 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-22 03:05:10,406 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-05-22 03:05:10,411 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:05:10,411 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:05:10,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:05:10,415 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-05-22 03:05:10,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:05:10,426 [ 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-22 03:05:10,458 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-05-22 03:05:10,459 [ scc.git] DEBUG Auto-merging setup.py
2024-05-22 03:05:10,460 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:05:10,463 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-05-22 03:05:10,463 [ scc.git] DEBUG setup.py | 1 +
2024-05-22 03:05:10,463 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-05-22 03:05:10,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:05:10,640 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-05-22 03:05:10,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:05:10,651 [ 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-22 03:05:10,671 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-05-22 03:05:10,672 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-05-22 03:05:10,672 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:05:10,677 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-05-22 03:05:10,677 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-05-22 03:05:10,677 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-05-22 03:05:11,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:05:11,047 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:05:11,086 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:05:11,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:05:11,090 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:05:11,125 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:05:11,135 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d6bb54f0> has no local changes
2024-05-22 03:05:11,135 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 555 chris-allan 'Archive status' (exclude comment)
- PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Updating c6314d8a9..9c94fd493
Previously merged:
- PR 557 knabar 'Update changelog'
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
Generated by OMERO-python-superbuild-push#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/69/)'
2024-05-22 03:05:11,145 [ scc.git] DEBUG [detached HEAD 87f273cfe] merge master -Dorg -Ssuccess-only
2024-05-22 03:05:11,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:05:11,145 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:05:11,189 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-05-22 03:05:11,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:05:11,472 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-05-22 03:05:11,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:05:11,890 [ scc.config] DEBUG Found submodule.omero-py.url
2024-05-22 03:05:12,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:05:12,299 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-05-22 03:05:12,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:05:12,703 [ scc.config] DEBUG Found submodule.omero-web.url
2024-05-22 03:05:13,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:05:13,118 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:05:13,144 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d7cdce80> has local changes
2024-05-22 03:05:13,145 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 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 555 chris-allan 'Archive status' (exclude comment)
- PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Updating c6314d8a9..9c94fd493
Previously merged:
- PR 557 knabar 'Update changelog'
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
Generated by OMERO-python-superbuild-push#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/69/)'
2024-05-22 03:05:13,154 [ scc.git] DEBUG [detached HEAD fa75521] merge master -Dorg -Ssuccess-only
2024-05-22 03:05:13,155 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-22 03:05:13,155 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-05-22 03:05:13,155 [ scc.merge] INFO Already up to date.
2024-05-22 03:05:13,155 [ scc.merge] INFO
2024-05-22 03:05:13,155 [ scc.merge] INFO
2024-05-22 03:05:13,155 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-05-22 03:05:13,155 [ scc.merge] INFO Already up to date.
2024-05-22 03:05:13,155 [ scc.merge] INFO
2024-05-22 03:05:13,155 [ scc.merge] INFO Merged PRs:
2024-05-22 03:05:13,155 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-22 03:05:13,155 [ scc.merge] INFO
2024-05-22 03:05:13,155 [ scc.merge] INFO Repository: ome/omero-marshal
2024-05-22 03:05:13,155 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:05:13,155 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-05-22 03:05:13,155 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-05-22 03:05:13,155 [ scc.merge] INFO Already up to date.
2024-05-22 03:05:13,155 [ scc.merge] INFO
2024-05-22 03:05:13,155 [ scc.merge] INFO Merged PRs:
2024-05-22 03:05:13,155 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-22 03:05:13,155 [ scc.merge] INFO
2024-05-22 03:05:13,155 [ scc.merge] INFO Repository: ome/omero-py
2024-05-22 03:05:13,155 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-05-22 03:05:13,156 [ scc.merge] INFO Already up to date.
2024-05-22 03:05:13,156 [ scc.merge] INFO
2024-05-22 03:05:13,156 [ scc.merge] INFO Merged PRs:
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-05-22 03:05:13,156 [ scc.merge] INFO
2024-05-22 03:05:13,156 [ scc.merge] INFO Repository: ome/omero-scripts
2024-05-22 03:05:13,156 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-22 03:05:13,156 [ scc.merge] INFO Already up to date.
2024-05-22 03:05:13,156 [ scc.merge] INFO
2024-05-22 03:05:13,156 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-22 03:05:13,156 [ scc.merge] INFO
2024-05-22 03:05:13,156 [ scc.merge] INFO Repository: ome/omero-web
2024-05-22 03:05:13,156 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 555 chris-allan 'Archive status' (exclude comment)
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft)
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-05-22 03:05:13,156 [ scc.merge] INFO Updating c6314d8a9..9c94fd493
2024-05-22 03:05:13,156 [ scc.merge] INFO Previously merged:
2024-05-22 03:05:13,156 [ scc.merge] INFO - PR 557 knabar 'Update changelog'
2024-05-22 03:05:13,156 [ scc.merge] INFO
2024-05-22 03:05:13,157 [ scc.merge] INFO Merged PRs:
2024-05-22 03:05:13,157 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-22 03:05:13,157 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-22 03:05:13,157 [ scc.merge] INFO
2024-05-22 03:05:13,157 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-22 03:05:13,157 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:05:13,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-22 03:05:13,161 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:05:13,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:05:13,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-22 03:05:13,166 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:05:13,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:05:13,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-22 03:05:13,171 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:05:13,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:05:13,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-22 03:05:13,176 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:05:13,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-22 03:05:13,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-22 03:05:13,180 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:05:13,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
Update component versions
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'omero-dropbox'
Entering 'omero-marshal'
Entering 'omero-py'
Entering 'omero-scripts'
Entering 'omero-web'
Entering 'omero-dropbox'
HEAD detached from a4307f4
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from cca4c2f
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 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 c6314d8a9
nothing to commit, working tree clean
HEAD detached from 43f3613
nothing to commit, working tree clean
2024-05-22 03:05:43,009 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci