diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 2a768a6f..7c1eb0a2 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -1,59 +1,31 @@ name: Codecov -on: pull_request +on: + push: + branches: [main, master] jobs: run: runs-on: ${{ matrix.os }} strategy: - fail-fast: false + max-parallel: 3 matrix: os: [ubuntu-latest] - python-version: ['3.9'] + env: + OS: ${{ matrix.os }} + PYTHON: '3.9' steps: - - name: checkout nsrdb - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Setup Python + uses: actions/setup-python@v4 with: - ref: ${{ github.event.pull_request.head.ref }} - path: nsrdb - - name: checkout mlclouds - uses: actions/checkout@v2 - with: - repository: nrel/mlclouds - ssh-key: ${{ secrets.SSH_KEY }} - path: mlclouds - - 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 nsrdb dependencies - working-directory: ./nsrdb - shell: bash -l {0} + python-version: 3.9 + - name: install dependencies run: | + eval "$( ssh-agent -s )" + ssh-add - <<< '${{ secrets.PRIVATE_KEY }}' conda install hdf4 conda install -c conda-forge pyhdf - pip install -e . - - name: Install mlclouds dependencies - working-directory: ./mlclouds - shell: bash -l {0} - run: | - pip install -e . - - name: Install codecov dependencies - working-directory: ./nsrdb - run: | python -m pip install --upgrade pip python -m pip install pytest python -m pip install pytest-cov diff --git a/.github/workflows/gh_pages.yml b/.github/workflows/gh_pages.yml index 4ead7f23..86b154a3 100644 --- a/.github/workflows/gh_pages.yml +++ b/.github/workflows/gh_pages.yml @@ -1,39 +1,22 @@ name: Documentation -on: pull_request +on: + push: + branches: [main, master] jobs: make-pages: runs-on: ubuntu-latest - strategy: - 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: | + eval "$( ssh-agent -s )" + ssh-add - <<< '${{ secrets.PRIVATE_KEY }}' python -m pip install --upgrade pip python -m pip install . python -m pip install sphinx diff --git a/.github/workflows/pull_request_tests.yml b/.github/workflows/pull_request_tests.yml index b411fb74..1e4c7926 100755 --- a/.github/workflows/pull_request_tests.yml +++ b/.github/workflows/pull_request_tests.yml @@ -16,48 +16,39 @@ jobs: steps: - name: checkout nsrdb - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.ref }} path: nsrdb - name: checkout mlclouds - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: nrel/mlclouds ssh-key: ${{ secrets.SSH_KEY }} path: mlclouds - - 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 + uses: actions/setup-python@v4 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 nsrdb dependencies working-directory: ./nsrdb shell: bash -l {0} run: | + eval "$( ssh-agent -s )" + ssh-add - <<< '${{ secrets.PRIVATE_KEY }}' conda install hdf4 conda install -c conda-forge pyhdf - pip install -e . + python -m pip install --upgrade pip + python -m pip install pytest + python -m pip install pytest-cov + python -m pip install . - name: Install mlclouds dependencies working-directory: ./mlclouds shell: bash -l {0} run: | - pip install -e . + python -m pip install -e . - name: Run nsrdb pytest working-directory: ./nsrdb shell: bash -l {0} run: | - conda install pytest pytest -v --disable-warnings diff --git a/nsrdb/version.py b/nsrdb/version.py index 319a40a6..a630f6f5 100755 --- a/nsrdb/version.py +++ b/nsrdb/version.py @@ -2,4 +2,4 @@ nsrdb version number """ -__version__ = "4.0.0" +__version__ = "4.0.1" diff --git a/requirements.txt b/requirements.txt index e36fa5bf..7216a825 100755 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +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 +NREL-rest2 @ git+ssh://git@github.com/NREL/rest2.git \ No newline at end of file