From b8a768ad92e301ae0594882c06e3b117d1c49abd Mon Sep 17 00:00:00 2001 From: Bennet Meyers Date: Wed, 11 Oct 2023 15:52:47 -0700 Subject: [PATCH 1/7] Update meta.yaml add clarabel to conda recipe --- conda_recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda_recipe/meta.yaml b/conda_recipe/meta.yaml index 9d83ad46..fcb7ae2a 100644 --- a/conda_recipe/meta.yaml +++ b/conda_recipe/meta.yaml @@ -33,6 +33,7 @@ requirements: - haversine - boto3 - Mosek + - clarabel run: - scipy @@ -44,6 +45,7 @@ requirements: - pvlib - cvxpy - python + - clarabel about: home: https://github.com/bmeyers/solar-data-tools From 762fc27f9b8ff9a31521982e25def15db81555d0 Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 12 Oct 2023 15:05:32 -0700 Subject: [PATCH 2/7] Update test-build.yml --- .github/workflows/test-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 32808640..0f6e6beb 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -53,7 +53,7 @@ jobs: conda update conda conda install mamba -n base -c conda-forge conda install -n base conda-libmamba-solver - mamba install python=3.10 "conda-build=3.21.9" colorama pip ruamel ruamel.yaml rich mamba jsonschema -c conda-forge + mamba install python=3.10 "conda-build" colorama pip ruamel ruamel.yaml rich mamba jsonschema -c conda-forge pip install -e . # echo yes before login to prevent anaconda bug breaking automation From ecd1d8c6212728eee7b72cde7fc4df2e14197cd4 Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 12 Oct 2023 15:14:23 -0700 Subject: [PATCH 3/7] Update test-build.yml --- .github/workflows/test-build.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 0f6e6beb..5eaa568d 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -10,10 +10,9 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - - name: Install Python - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.10' - name: Install Twine run: sudo pip install twine @@ -34,10 +33,9 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - - name: Install Python - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: '3.10' # Much better than manual installation, original version Miniconda2-4.7.10-Linux-x86_64.sh is broken - name: Install Miniconda @@ -53,7 +51,7 @@ jobs: conda update conda conda install mamba -n base -c conda-forge conda install -n base conda-libmamba-solver - mamba install python=3.10 "conda-build" colorama pip ruamel ruamel.yaml rich mamba jsonschema -c conda-forge + mamba install python=3.10 conda-build colorama pip ruamel ruamel.yaml rich mamba jsonschema -c conda-forge pip install -e . # echo yes before login to prevent anaconda bug breaking automation From 0db2ee0dc57af845db25baa505488e4a6143504d Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 12 Oct 2023 15:20:11 -0700 Subject: [PATCH 4/7] revert to conda from mamba --- .github/workflows/test-build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 5eaa568d..3cb87b85 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -49,9 +49,8 @@ jobs: run: | conda config --set always_yes yes --set auto_update_conda false conda update conda - conda install mamba -n base -c conda-forge conda install -n base conda-libmamba-solver - mamba install python=3.10 conda-build colorama pip ruamel ruamel.yaml rich mamba jsonschema -c conda-forge + conda install python=3.10 conda-build colorama pip ruamel ruamel.yaml rich jsonschema -c conda-forge pip install -e . # echo yes before login to prevent anaconda bug breaking automation @@ -61,7 +60,7 @@ jobs: - name: Build the Anaconda Package id: mambabuild run: | - mamba install anaconda-client + conda install anaconda-client conda config --set anaconda_upload no --set solver libmamba git fetch --prune --unshallow --tags VERSION_FROM_GIT_TAG=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)test conda build . -c mosek -c anaconda -c pvlib -c slacgismo -c conda-forge --numpy 1.22.0 From 3c2cb7909f9acb3b2fe642bffcc30ea417155860 Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 12 Oct 2023 15:37:24 -0700 Subject: [PATCH 5/7] adjusted names for conda now --- .github/workflows/test-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 3cb87b85..8e06c8be 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -45,7 +45,7 @@ jobs: activate-environment: "" miniconda-version: "latest" - - name: Install the Mamba Dependencies + - name: Install the Conda Dependencies run: | conda config --set always_yes yes --set auto_update_conda false conda update conda @@ -58,7 +58,7 @@ jobs: # bash variables cannot be used in github actions, must use actions specific syntax and methods # channels need to be specified on build and are saved in the package for installs - name: Build the Anaconda Package - id: mambabuild + id: condabuild run: | conda install anaconda-client conda config --set anaconda_upload no --set solver libmamba From ef0be3a4ab95da1eb122e431ab549689a77354eb Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 26 Oct 2023 09:26:44 -0700 Subject: [PATCH 6/7] Update build.yml Updated build step to use updated methods from test-build --- .github/workflows/build.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c6c7f406..aca7162e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,10 +40,9 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - - name: Install Python - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: '3.10' # Much better than manual installation, original version Miniconda2-4.7.10-Linux-x86_64.sh is broken - name: Install Miniconda @@ -53,13 +52,12 @@ jobs: activate-environment: "" miniconda-version: "latest" - - name: Install the Mamba Dependencies + - name: Install the Conda Dependencies run: | conda config --set always_yes yes --set auto_update_conda false conda update conda - conda install mamba -n base -c conda-forge conda install -n base conda-libmamba-solver - mamba install python=3.10 "conda-build=3.21.9" colorama pip ruamel ruamel.yaml rich mamba jsonschema -c conda-forge + conda install python=3.10 conda-build colorama pip ruamel ruamel.yaml rich jsonschema -c conda-forge pip install -e . # echo yes before login to prevent anaconda bug breaking automation @@ -67,13 +65,12 @@ jobs: # bash variables cannot be used in github actions, must use actions specific syntax and methods # channels need to be specified on build and are saved in the package for installs - name: Build the Anaconda Package - id: mambabuild + id: condabuild run: | - mamba install anaconda-client + 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 }} git fetch --prune --unshallow --tags - 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 pvlib -c slacgismo -c conda-forge --numpy 1.22.0 + VERSION_FROM_GIT_TAG=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)test conda build . -c mosek -c anaconda -c pvlib -c slacgismo -c conda-forge --numpy 1.22.0 echo '::set-output name=gitversion::$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)' - name: Upload the Anaconda Package From 96d4d4efea1d35e83e8846f5e5e832f6f93c405d Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 26 Oct 2023 09:54:37 -0700 Subject: [PATCH 7/7] Update build.yml missed a typo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aca7162e..9480311e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,7 +70,7 @@ jobs: conda install anaconda-client conda config --set anaconda_upload no --set solver libmamba git fetch --prune --unshallow --tags - VERSION_FROM_GIT_TAG=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)test conda build . -c mosek -c anaconda -c pvlib -c slacgismo -c conda-forge --numpy 1.22.0 + 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 pvlib -c slacgismo -c conda-forge --numpy 1.22.0 echo '::set-output name=gitversion::$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)' - name: Upload the Anaconda Package