Skip to content

Commit

Permalink
testing workflow edits
Browse files Browse the repository at this point in the history
  • Loading branch information
bnb32 committed Jan 5, 2024
1 parent ae57411 commit 7c9c566
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 38 deletions.
69 changes: 45 additions & 24 deletions .github/workflows/gh_pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,48 @@ on: pull_request

jobs:
make-pages:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
python-version: ['3.9']
- name: install sphinx dependencies
run: |
python -m pip install --upgrade pip
python -m pip install .
python -m pip install sphinx
python -m pip install sphinx_rtd_theme
python -m pip install sphinx-click
- name: build documentation
run: |
cd docs
make html
- name: deploy
uses: peaceiris/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/_build/html
force_orphan: true
full_commit_message: ${{ github.event.head_commit.message }}
runs-on: ubuntu-latest
matrix:
os: [ubuntu-latest]
python-version: ['3.9']
steps:
- uses: actions/checkout@v3
- name: select python version
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: checkout rest2
uses: actions/checkout@v2
with:
repository: nrel/rest2
ssh-key: ${{ secrets.SSH_KEY }}
path: rest2
- name: Set up Python ${{ matrix.python-version }}
uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
- name: Install rest2 dependencies
working-directory: ./rest2
shell: bash -l {0}
run: |
conda install pip
pip install -e .
- name: install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install .
python -m pip install sphinx
python -m pip install sphinx_rtd_theme
python -m pip install sphinx-click
- name: build documentation
run: |
cd docs
make html
- name: deploy
uses: peaceiris/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/_build/html
force_orphan: true
full_commit_message: ${{ github.event.head_commit.message }}
36 changes: 22 additions & 14 deletions nsrdb/all_sky/all_sky.py
Original file line number Diff line number Diff line change
@@ -1,30 +1,38 @@
# -*- coding: utf-8 -*-
"""NSRDB all-sky module.
"""
from concurrent.futures import as_completed
import logging
import numpy as np
import os
import pandas as pd
import psutil
from concurrent.futures import as_completed
from warnings import warn

from rex import MultiFileResource, Resource
from rex.utilities import SpawnProcessPool

import numpy as np
import pandas as pd
import psutil
from farms import SZA_LIM
from farms.disc import disc
from farms.farms import farms
from farms.utilities import (ti_to_radius, calc_beta, merge_rest_farms,
calc_dhi, screen_sza, screen_cld,
dark_night, cloud_variability)
from farms.utilities import (
calc_beta,
calc_dhi,
cloud_variability,
dark_night,
merge_rest_farms,
screen_cld,
screen_sza,
ti_to_radius,
)
from rest2.rest2 import rest2, rest2_tuuclr
from rex import MultiFileResource, Resource
from rex.utilities import SpawnProcessPool

from nsrdb.all_sky.utilities import scale_all_sky_outputs
from nsrdb.gap_fill.irradiance_fill import (make_fill_flag, gap_fill_irrad,
missing_cld_props,
enforce_clearsky)

from nsrdb.gap_fill.irradiance_fill import (
enforce_clearsky,
gap_fill_irrad,
make_fill_flag,
missing_cld_props,
)

logger = logging.getLogger(__name__)

Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ matplotlib
NREL-cloud_fs>=0.0.8
NREL-farms>=1.0.5
NREL-reV<0.8.0
NREL-rest2>=1.0.1
scikit-learn>=1.0

0 comments on commit 7c9c566

Please sign in to comment.