merge green_steel_cleanup into offshore-h2

.github/workflows/ci.yml

@@ -1,26 +1,29 @@
 name: Testing
 
-on: [ push, pull_request ]
+on: [ push ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ 3.6, 3.7, 3.8 ]
+        python-version: [ "3.10" ]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
+        env:
+          SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL: True
         run: |
-          sudo apt-get update && sudo apt-get install -y libglpk-dev glpk-utils
+          pip install scikit-learn
+          sudo apt-get update && sudo apt-get install -y libglpk-dev glpk-utils coinor-cbc
           python -m pip install --upgrade pip
-          pip install shapely==1.7.1
+          pip install scikit-learn
           pip install -r requirements.txt
       - name: Install package
         run: |
@@ -38,4 +41,4 @@ jobs:
         run: |
           # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
           pip install flake8
-          flake8 . --count --exit-zero --statistics --ignore=E501
+          flake8 . --count --exit-zero --statistics --ignore=E501

.gitignore

@@ -6,16 +6,35 @@ __pycache__/
 *$py.class
 
 log/
+examples/HOPP_examples/
 HOPP_examples/
 HOPP-demos/
-tests/analysis/results/
+# needed for h2 test inputs: tests/analysis/results/
 examples/H2 Analysis/results/reopt_precomputes/
 
+tests/hybrid/REoptResultsNoExportAboveLoad.json
+
+# Results
+examples/analysis/results/*.csv
+resource_files/wind
+resource_files/solar
+
+# clean up after merge
+examples/Powerflow Analysis
+examples/analysis/Engie
+examples/As_Built_Analysis_Blue Creek.csv
+examples/Blue_Creek_Analysis.py
+examples/dudgeon_wind_extraction_validation.py
+examples/powerflow_details.csv
+examples/reopt_load.py
+examples/data
+
+
 .idea/*
 .idea/workspace.xml
 .vscode/
 
-.vscode/
+.vscode/*
 
 # Distribution / packaging
 .Python
@@ -109,22 +128,11 @@ ENV/
 *.png
 *.xlsx
 
-# Results
-examples/analysis/results/*.csv
-resource_files/wind
-resource_files/solar
 *.pkl
-
 .DS_Store
+*.val
+*.db
+*.db-shm
+*.gz
+*.db-wal
 
-examples/HOPP_examples/
-
-examples/Powerflow Analysis
-examples/analysis/Engie
-examples/As_Built_Analysis_Blue Creek.csv
-examples/Blue_Creek_Analysis.py
-examples/dudgeon_wind_extraction_validation.py
-examples/powerflow_details.csv
-examples/reopt_load.py
-examples/data
-tests/hybrid/REoptResultsNoExportAboveLoad.json