Merge pull request #7 from cvxgrp/dev

Dev
cvxgrp · Jul 19, 2024 · 772fe93 · 772fe93
2 parents 23d7d6b + 5ed2e71
commit 772fe93
Show file tree

Hide file tree

Showing 32 changed files with 924 additions and 931 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -79,5 +79,5 @@ jobs:
             run: |
               conda install anaconda-client
               conda config --set anaconda_upload no --set solver libmamba
-              VERSION_FROM_GIT_TAG=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-) conda build . -c conda-forge
+              VERSION_FROM_GIT_TAG=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-) conda build . -c conda-forge -c stanfordcvxgrp
               echo "gitversion=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)" >> $GITHUB_OUTPUT
diff --git a/conda_recipe/meta.yaml b/conda_recipe/meta.yaml
@@ -23,10 +23,14 @@ requirements:
   run:
     - python >=3.9
     - numpy
-    - cvxpy
+    - cvxpy ==1.4.3
     - scikit-learn
     - tqdm
     - pybind11 # conda build test fails with "cvxpy 1.4.2 requires pybind11, which is not installed."
+    - sig-decomp
+    - pandas
+    - qss
+
 
 test:
   imports:

diff --git a/notebooks/Aramis/basis_test.ipynb b/notebooks/Aramis/basis_test.ipynb
diff --git a/notebooks/Aramis/fitting_pv_data.ipynb b/notebooks/Aramis/fitting_pv_data.ipynb
diff --git a/notebooks/Aramis/regularisation_test.ipynb b/notebooks/Aramis/regularisation_test.ipynb
diff --git a/notebooks/Aramis/utils/dilatation.py b/notebooks/Aramis/utils/dilatation.py
diff --git a/notebooks/Aramis/utils/interpolation.py b/notebooks/Aramis/utils/interpolation.py