Merge pull request #839 from prrathi/master

Merging
PSLmodels · Apr 22, 2023 · 5a770b5 · 5a770b5
2 parents fdff510 + fc2e081
commit 5a770b5
Show file tree

Hide file tree

Showing 8 changed files with 519 additions and 137 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,4 +53,5 @@ ogcore/tests/OUTPUT_BASELINE/*
 ogcore/tests/OUTPUT_REFORM/*
 regression/OUTPUT_BASELINE/*
 regression/OUTPUT_REFORM*
+.vscode/
 *default.profraw
diff --git a/environment.yml b/environment.yml
@@ -20,3 +20,7 @@ dependencies:
 - requests
 - openpyxl
 - black
+- pip
+- pip:
+  - pygam
+
diff --git a/ogcore/__init__.py b/ogcore/__init__.py
@@ -19,4 +19,4 @@
 from ogcore.txfunc import *
 from ogcore.utils import *
 
-__version__ = "0.10.7"
+__version__ = "0.10.8"
diff --git a/ogcore/default_parameters.json b/ogcore/default_parameters.json
@@ -3149,7 +3149,8 @@
                     "DEP_totalinc",
                     "GS",
                     "linear",
-                    "mono"
+                    "mono",
+                    "mono2D"
                 ]
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,3 +20,7 @@ dependencies: @@
     - requests
     - openpyxl
     - black
+    - pip
+    - pip:
+      - pygam