Release 4.3.11 (#248)

Signed-off-by: David P. Chassin <david.chassin@me.com> Signed-off-by: David P. Chassin <dchassin@slac.stanford.edu> Signed-off-by: Alyona Teyber <Ivanova.alyona5@gmail.com> Signed-off-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Signed-off-by: David P. Chassin <dpchassin@gmail.com> Co-authored-by: David P. Chassin <dchassin@slac.stanford.edu> Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com>
arras-energy · Jan 9, 2025 · becac96 · becac96
1 parent e83bb2d
commit becac96
Show file tree

Hide file tree

Showing 136 changed files with 98,521 additions and 8,296 deletions.
diff --git a/.github/workflows/develop-image.yml b/.github/workflows/develop-image.yml
@@ -12,7 +12,7 @@ jobs:
     environment: Integration
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
       # this is to fix GIT not liking owner of the checkout dir
     - name: Set ownership
@@ -42,7 +42,7 @@ jobs:
 
   buildUbuntu22FastS3:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     environment: Integration
     container:
       image: ubuntu:jammy
@@ -58,7 +58,7 @@ jobs:
         unzip awscliv2.zip
         sudo ./aws/install
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Configure AWS Credentials
       uses: aws-actions/configure-aws-credentials@v2
@@ -78,12 +78,12 @@ jobs:
         sudo sh ./build.sh --upload --release
 
   buildAWSUbuntuAMI:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     environment: Integration
     needs: [buildUbuntu22FastS3,buildMacos13FastS3]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
       # this is to fix GIT not liking owner of the checkout dir
     - name: Set ownership
@@ -134,7 +134,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Configure AWS Credentials
       uses: aws-actions/configure-aws-credentials@v2
@@ -165,7 +165,7 @@ jobs:
     environment: Integration
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
       # this is to fix GIT not liking owner of the checkout dir
     - name: Set ownership
@@ -200,7 +200,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v2
@@ -230,6 +230,6 @@ jobs:
           version=$(./build-aux/version.sh --version)
           build=$(./build-aux/version.sh --number)
           branch=$(./build-aux/version.sh --branch)
-          curl -f -X POST "https://version.gridlabd.us/update_latest" \
-            -H "Content-Type: application/json" \
-            -d "{\"version\": \"$version\", \"build\": \"$build\", \"branch\": \"$branch\", \"sk\": \"${{ secrets.DEVELOPSK }}\"}"
+          # curl -f -X POST "https://version.gridlabd.us/update_latest" \
+          #   -H "Content-Type: application/json" \
+          #   -d "{\"version\": \"$version\", \"build\": \"$build\", \"branch\": \"$branch\", \"sk\": \"${{ secrets.DEVELOPSK }}\"}"
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -8,28 +8,36 @@ on:
 
 jobs:
   build:
+
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup system
-        run: sudo ./setup.sh --local
-
-      - name: Build gridlabd
-        run: sudo ./build.sh --system --parallel
-
-      - name: Install openfido
-        run: curl -sL https://raw.githubusercontent.com/openfido/cli/main/install.sh | sudo sh
-
-      - name: Validate system
-        run: sudo gridlabd -D keep_progress=TRUE -T 0 --validate -D github_actions=yes || ( sudo utilities/save_validation_errors ; false )
 
-      - name: Upload artifacts on failure
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: validate-result
-          path: |
-            validate.txt
-            validate.tar.gz
+    - uses: actions/checkout@v4
+
+    - name: Setup system
+      run: sudo ./setup.sh --local
+
+    - name: Build gridlabd
+      run: sudo ./build.sh --system --parallel
+
+    - name: Install openfido
+      run: |
+        test -x /usr/local/bin/python3 || sudo ln -sf $(which python3) /usr/local/bin/python3
+        sudo /usr/local/bin/python3 -m venv /usr/local/opt/openfido
+        source /usr/local/opt/openfido/bin/activate
+        sudo /usr/local/bin/python3 -m pip install requests pandas docker
+        export OPENFIDO_PIP_OPTIONS=--user
+        curl -sL https://raw.githubusercontent.com/openfido/cli/main/install.sh | sudo sh
+        
+    - name: Validate system
+      run: sudo gridlabd -D keep_progress=TRUE -T 0 --validate -D github_actions=yes || ( sudo utilities/save_validation_errors ; false )
+
+    - name: Upload artifacts on failure
+      uses: actions/upload-artifact@v4
+      if: failure()
+      with:
+        name: validate-result
+        path: |
+          validate.txt
+          validate.tar.gz
diff --git a/.github/workflows/master-image.yml b/.github/workflows/master-image.yml
@@ -12,7 +12,7 @@ jobs:
     environment: Integration
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
       # this is to fix GIT not liking owner of the checkout dir
     - name: Set ownership
@@ -42,7 +42,7 @@ jobs:
 
   buildUbuntu22FastS3:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     environment: Integration
     container:
       image: ubuntu:jammy
@@ -58,7 +58,7 @@ jobs:
         unzip awscliv2.zip
         sudo ./aws/install
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Configure AWS Credentials
       uses: aws-actions/configure-aws-credentials@v2
@@ -78,12 +78,12 @@ jobs:
         sudo sh ./build.sh --upload --release
 
   buildAWSUbuntuAMI:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     environment: Integration
     needs: [buildUbuntu22FastS3,buildMacos13FastS3]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
       # this is to fix GIT not liking owner of the checkout dir
     - name: Set ownership
@@ -134,7 +134,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Configure AWS Credentials
       uses: aws-actions/configure-aws-credentials@v1
@@ -169,7 +169,7 @@ jobs:
     environment: Integration
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
       # this is to fix GIT not liking owner of the checkout dir
     - name: Set ownership
@@ -204,7 +204,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v2
@@ -234,6 +234,6 @@ jobs:
           version=$(./build-aux/version.sh --version)
           build=$(./build-aux/version.sh --number)
           branch=$(./build-aux/version.sh --branch)
-          curl -f -X POST "https://version.gridlabd.us/update_latest" \
-            -H "Content-Type: application/json" \
-            -d "{\"version\": \"$version\", \"build\": \"$build\", \"branch\": \"$branch\", \"sk\": \"${{ secrets.MASTERSK }}\"}"
+          # curl -f -X POST "https://version.gridlabd.us/update_latest" \
+          #   -H "Content-Type: application/json" \
+          #   -d "{\"version\": \"$version\", \"build\": \"$build\", \"branch\": \"$branch\", \"sk\": \"${{ secrets.MASTERSK }}\"}"
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup system
       run: sudo ./setup.sh --local
@@ -21,13 +21,18 @@ jobs:
       run: sudo ./build.sh --system --parallel
 
     - name: Install openfido
-      run: curl -sL https://raw.githubusercontent.com/openfido/cli/main/install.sh | sudo sh
+      run: |
+        test -x /usr/local/bin/python3 || sudo ln -sf $(which python3) /usr/local/bin/python3
+        sudo /usr/local/bin/python3 -m venv /usr/local/opt/openfido
+        source /usr/local/opt/openfido/bin/activate
+        sudo /usr/local/bin/python3 -m pip install requests pandas docker
+        curl -sL https://raw.githubusercontent.com/openfido/cli/main/install.sh | sudo sh
       
     - name: Validate system
       run: sudo gridlabd -D keep_progress=TRUE -T 0 --validate -D github_actions=yes || ( sudo utilities/save_validation_errors ; false )
 
     - name: Upload artifacts on failure
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: validate-result

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -7,16 +7,3 @@ Copyright (C) 2020-2022, Regents of the Leland Stanford Junior University
 GridLAB-D Version 1.0-4.0
 Copyright (C) 2004-2019, Battelle Memorial Institute
 All Rights Reserved
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,14 @@
 BSD 3-Clause License
 
-Copyright (c) 2018, Regents of the Leland Stanford Junior University
-All rights reserved.
+Arras Energy Version 4.3
+Copyright (C) 2023-, LF Energy
+
+HiPAS GridLAB-D 4.1-4.2
+Copyright (C) 2020-2022, Regents of the Leland Stanford Junior University
+
+GridLAB-D Version 1.0-4.0
+Copyright (C) 2004-2019, Battelle Memorial Institute
+All Rights Reserved
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

diff --git a/Makefile.am b/Makefile.am
@@ -67,7 +67,7 @@ bin_PROGRAMS =
 bin_SCRIPTS =
 dist_doc_DATA =
 
-docs_targets =
+docs_targets = docs/Utilities
 
 check-target:
 	@test $(prefix) = $(shell $(top_srcdir)/build-aux/version.sh --install) || ( echo "ERROR [Makefile]: prefix '$(prefix)' and target '($(shell $(top_srcdir)/build-aux/version.sh --install))' mismatch; ./configure is outdated. Build using '--clean' option to fix this." > /dev/stderr ; false )
@@ -83,6 +83,7 @@ include $(top_srcdir)/utilities/Makefile.mk
 include $(top_srcdir)/python/Makefile.mk
 include $(top_srcdir)/geodata/Makefile.mk
 include $(top_srcdir)/subcommands/Makefile.mk
+include $(top_srcdir)/docs/Makefile.mk
 
 # approved modules
 include $(top_srcdir)/module/Makefile.mk

diff --git a/build-aux/version.sh b/build-aux/version.sh
@@ -5,7 +5,8 @@
 ##
 ##   --version       the version, e.g., 4.3.1
 ##   --number        the build number, e.g., 230701
-##   --branch        the branch, e.g., master
+##   --branch        the branch, e.g., master (with _ fixes)
+##   --truebranch    the true branch name (without _ fixes)
 ##   --gitversion    the version of github, e.g., 2.34.1
 ##   --install       the install folder path name, e.g., /usr/local/opt/gridlabd/4.3.1-230426-master-ubuntu_22-x86_64
 ##   --name          the install folder base name, /usr/local/opt/gridlabd/4.3.1-230426-master-ubuntu_22-x86_64
@@ -33,7 +34,8 @@ PAT=`sed -En 's/#define REV_PATCH ([0-9]+).*/\1/p' $FIL | tr -d '\n'`
 PKG=`sed -En 's/#define PACKAGE "([a-z]+)".*/\1/p' $FIL | tr -d '\n'`
 NAM=`sed -En 's/#define PACKAGE_NAME "([-A-Za-z ]+)".*/\1/p' $FIL | tr -d '\n'`
 NUM=`git log --max-count=1 --pretty=format:"%ai" | cut -c 3,4,6,7,9,10`
-BRA=`git rev-parse --abbrev-ref HEAD | git rev-parse --abbrev-ref HEAD | tr -c A-Za-z0-9 _ | sed 's/_+/_/g;s/_$//;s/^_//'`
+BRA=`git rev-parse --abbrev-ref HEAD | tr -c A-Za-z0-9 _ | sed 's/_+/_/g;s/_$//;s/^_//'`
+TRU=`git rev-parse --abbrev-ref HEAD`
 GIT=`git --version | cut -f3 -d' '`
 ORG=`git remote get-url origin | cut -f4- -d/`
 if [ "$(uname -s)" == "Darwin" ]; then
@@ -50,6 +52,8 @@ case $1 in
         echo "$MAJ.$MIN.$PAT" ;;
     --branch | -b)
         echo "$BRA" ;;
+    --truebranch)
+        echo "$TRU" ;;
     --gitversion | -g)
         echo "$GIT" ;;
     --number | -n)

diff --git a/configure.ac b/configure.ac
@@ -251,10 +251,6 @@ AC_C_CONST
 AC_C_INLINE
 AC_C_RESTRICT
 AC_HEADER_STDBOOL
-m4_warn([obsolete],
-[The preprocessor macro `STDC_HEADERS' is obsolete.
-  Except in unusual embedded environments, you can safely include all
-  ISO C90 headers unconditionally.])dnl
 # Autoupdate added the next two lines to ensure that your configure
 # script's behavior did not change.  They are probably safe to remove.
 AC_CHECK_INCLUDES_DEFAULT
@@ -457,8 +453,6 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_PREREQ([2.2])
 
 _LT_SET_OPTION([LT_INIT],[dlopen])
-m4_warn([obsolete],[AC_LIBTOOL_DLOPEN: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'dlopen' option into LT_INIT's first parameter.])
 
 LT_INIT
 AC_PROG_RANLIB # (DPC 2019-09-15) don't remove this, doing so will cause a warning in autoscan instead of autoreconf