Merge pull request #162 from slacgismo/develop-dask

Test conda recipe fix
slacgismo · Jul 24, 2024 · 7dbd963 · 7dbd963
2 parents 9b777a8 + d0525d0
commit 7dbd963
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
           conda install anaconda-client
           conda config --set anaconda_upload no --set solver libmamba
           echo yes | anaconda login --username ${{ secrets.ANACONDA_CLOUD_USERNAME }} --password ${{ secrets.ANACONDA_CLOUD_PASSWORD }}
-          VERSION_FROM_GIT_TAG=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-) conda build . -c mosek -c anaconda -c slacgismo -c conda-forge -c stanfordcvxgrp
+          VERSION_FROM_GIT_TAG=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-) conda build . -c mosek -c anaconda -c slacgismo -c conda-forge -c stanfordcvxgrp --numpy 2.0
           echo "gitversion=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)" >> $GITHUB_OUTPUT
 
       - name: Upload the Anaconda Package

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -63,5 +63,5 @@ jobs:
           conda install anaconda-client
           conda clean --all
           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-)test conda build . -c mosek -c slacgismo -c conda-forge -c stanfordcvxgrp
+          VERSION_FROM_GIT_TAG=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)test conda build . -c mosek -c slacgismo -c conda-forge -c stanfordcvxgrp --numpy 2.0
           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
@@ -43,7 +43,6 @@ requirements:
     - dask-cloudprovider
     - graphviz
     - bokeh
-    - boto3
 
 test:
   imports:

diff --git a/pyproject.toml b/pyproject.toml
@@ -34,8 +34,7 @@ dependencies = [
     "clarabel",
     "qss",
     "tqdm",
-    "spcqe",
-    "boto3"
+    "spcqe"
 ]
 
 classifiers = [

diff --git a/requirements.txt b/requirements.txt
@@ -21,5 +21,4 @@ dask
 distributed
 dask-cloudprovider[all]
 graphviz
-bokeh
-boto3
+bokeh
diff --git a/sdt_dask/docker/sdt-v1_full_pip_freeze.txt b/sdt_dask/docker/sdt-v1_full_pip_freeze.txt
@@ -1,4 +1,4 @@
-solar-data-tools>=1.5.0
+solar-data-tools==1.6.0
 aiobotocore==2.13.1
 aiohttp==3.9.5
 aioitertools==0.11.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,6 @@ requirements: @@
         - dask-cloudprovider
         - graphviz
         - bokeh
-        - boto3
     test:
       imports:
@@ Expand Down @@