Skip to content
This repository was archived by the owner on Sep 27, 2023. It is now read-only.

Develop fix version check #1071

Merged
merged 5 commits into from
Jan 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion gldcore/scripts/gridlabd-version
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function version-check()
exit 0
fi
[ "$1" == "-v" ] && echo "REMOTE/$branch $remote"
${BIN} --version="-ge $remote" 2>/dev/null || ( ( [ "$1" != "-q" ] && error 1 "$version ($branch) is outdated" ) ; exit 1 )
${BIN} --version="-ge $remote" 2>/dev/null || ( ( [ "$1" != "-q" -a "$1" != "-w" ] && warning "$version ($branch) is outdated" ) ; exit 0 )
[ "$1" != "-q" -a "$1" != "-w" ] && echo "$version ($branch) is ok"
[ "$1" == "-w" ] && ( curl -sL "http://version.gridlabd.us/index.html?v=${version}&b=${branch}" >/dev/null & )
exit 0
Expand Down Expand Up @@ -193,3 +193,11 @@ if [ "$(type -t version-$1)" == "function" ]; then
else
error 9 "'$1' is not a valid command"
fi

if [ -z "$(which gridlabd)" ]; then
warning "gridlabd is not in the current PATH environment"
fi
if [ ! -x "/usr/local/bin/python3" ]; then
warning "python3 is not linked where gridlabd wants it in /usr/local/bin"
fi

1 change: 0 additions & 1 deletion module/resilience/docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Pillow==8.3.2
ipython==7.22.0
pandas==1.1.4
ipyplot==1.1.0
Expand Down