Skip to content

Commit

Permalink
update workflows and packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
pluflou committed Nov 1, 2024
1 parent 8636856 commit d47476e
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 134 deletions.
19 changes: 0 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,3 @@ jobs:
shell: bash -l {0}
run: |
pip install -e .
# echo yes before login to prevent anaconda bug breaking automation
# git tags MUST be fetched otherwise output will be blank
# 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
shell: bash -l {0}
id: condabuild
run: |
conda install conda-build
VERSION_FROM_GIT_TAG=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-) conda build . --numpy 2.0 --no-anaconda-upload
echo "gitversion=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)" >> $GITHUB_OUTPUT
- name: Upload the Anaconda Package
shell: bash -l {0}
id: condaload
run: |
conda install anaconda-client
anaconda upload -u slacgismo /home/runner/miniconda3/envs/true/conda-bld/noarch/solar-data-tools-${{ steps.condabuild.outputs.gitversion }}-*.tar.bz2
41 changes: 0 additions & 41 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,44 +21,3 @@ jobs:
run: |
git fetch --prune --unshallow --tags
sudo python3 -m build
build-conda:
runs-on: ubuntu-latest
# sets default shell to remove need for source to run the conda shell
defaults:
run:
shell: bash -l {0}
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: "3.12"

- name: Install Miniconda
uses: conda-incubator/setup-miniconda@v3
with:
auto-activate-base: true
activate-environment: true
python-version: 3.12
miniconda-version: "latest"
channels: conda-forge,mosek,slacgismo
channel-priority: true

- name: Install the Conda Dependencies
shell: bash -l {0}
run: |
pip install -e .
# echo yes before login to prevent anaconda bug breaking automation
# git tags MUST be fetched otherwise output will be blank
# 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
shell: bash -l {0}
id: condabuild
run: |
conda install conda-build
VERSION_FROM_GIT_TAG=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)test conda build . --numpy 2.0 --no-anaconda-upload
echo "gitversion=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)" >> $GITHUB_OUTPUT
7 changes: 1 addition & 6 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
include solardatatools/fixtures/*
prune statistical-clear-sky/fixtures
prune notebooks
prune docs
prune tests
prune data
prune dataviewer
prune conda_recipe
prune docs
67 changes: 0 additions & 67 deletions conda_recipe/meta.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ maintainers = [
{ name = "Sara Miskovich", email = "[email protected]" },
]
keywords = ["solar", "pv", "photovoltaic"]
requires-python = ">=3.6"
requires-python = ">=3.9"

dependencies = [
"scipy",
Expand Down

0 comments on commit d47476e

Please sign in to comment.