Skip to content

Commit

Permalink
Merge pull request #252 from Breakthrough-Energy/develop
Browse files Browse the repository at this point in the history
chore: merge develop into master for v0.4.1 release
  • Loading branch information
danielolsen authored Jan 5, 2022
2 parents e88de76 + 98131dd commit fc7c274
Show file tree
Hide file tree
Showing 105 changed files with 89,826 additions and 1,883 deletions.
2 changes: 2 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[run]
branch = True
47 changes: 47 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
---
name: Bug report
about: Create a report to help us improve
title: Bug report
labels: bug
assignees: ahurli, BainanXia, danielolsen, jon-hagg, rouille

---

# :beetle:

- [ ] I have checked that this issue has not already been reported.


### Bug summary
A short 1-2 sentences that succinctly describes the bug.

### Code for reproduction
A minimum code snippet required to reproduce the bug. Please make sure to minimize the
number of dependencies required.
```python
# Paste your code here
#
#
```

### Actual outcome
The output produced by the above code, which may be a screenshot, console output, etc.
```shell
# If applicable, paste the console output here
#
#
```

### Expected outcome
A description of the expected outcome from the code snippet.

### Environment
Please specify your platform and versions of the relevant libraries you are using:
* Operating system:
* PreREISE revision (run `git rev-parse origin/HEAD`):
* Python version:
* Jupyter version (if applicable):
* Other libraries:

### Additional context
Add any other context about the problem here.
36 changes: 36 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
name: Feature request
about: Suggest an idea for this project
title: Feature request
labels: feature request
assignees: ahurli, BainanXia, danielolsen, jon-hagg, rouille

---

# :rocket:

- [ ] Is your feature request essential for your project?


### Describe the workflow you want to enable
A clear and concise description of what can be enhanced, e.g., "I wish I could do [...]"

### Describe your proposed implementation
This should provide a description of the feature request, e.g.:
* "The class `Foo` should have a new method `bar` that allows to [...]"
* "Function `foo` needs a new arguments `bar` to set [...]"
* "Create a new function `foo` to calculate [...]"

If applicable, try to write a docstring for the desired feature. To illustrate, if you would like to add a new function in a module, provide:
* the name of the function
* a description of the task accomplished by the function
* a list of the input and output parameters together with their types (e.g., `int`,
`str`, `pandas.DataFrame`, etc.) and a short description of its/their meaning

### Describe alternatives you've considered, if relevant
This should provide a description of any alternative solutions or features you've
considered.

### Additional context
Add any other context or screenshots in this section, e.g., a plot from an article you
believe would clearly communicate results.
28 changes: 28 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Code coverage

on:
push:
branches:
- 'develop'

jobs:
coverage:
runs-on: ubuntu-latest

name: Generate coverage report
steps:
- uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8

- run: python -m pip install --upgrade pip tox
- run: tox -e pytest-local -- --cov-report=xml

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
name: codecov-prereise
fail_ci_if_error: true
14 changes: 0 additions & 14 deletions .github/workflows/docs-trigger.yml

This file was deleted.

18 changes: 18 additions & 0 deletions .github/workflows/external.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Trigger external workflows

on:
push:
branches:
- develop

jobs:
run-workflows:
runs-on: ubuntu-latest
steps:
- name: Build and publish docs website
uses: Breakthrough-Energy/actions/workflow-trigger@main
with:
repo: docs
branch: master
workflow_id: 2386877
token: ${{ secrets.CI_TOKEN_CLONE_REPO }}
15 changes: 2 additions & 13 deletions .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout PreREISE
uses: actions/checkout@v2
with:
path: PreREISE

- name: Checkout PowerSimData
uses: actions/checkout@v2
with:
repository: Breakthrough-Energy/PowerSimData
path: PowerSimData
- uses: actions/checkout@v2

- name: Pipenv lock
id: pipenv_lock
uses: Breakthrough-Energy/actions/update-packages@main
with:
repo-dir: PreREISE

- name: Parse JSON
id: parse_json
Expand All @@ -46,6 +35,7 @@ jobs:
token: ${{ secrets.CI_TOKEN_CLONE_REPO }}
commit-message: Update dependencies
title: Update dependencies
labels: dependencies
delete-branch: true
body: |
### Summary of changes
Expand All @@ -67,4 +57,3 @@ jobs:
[1]: https://github.com/peter-evans/create-pull-request
branch: update-dependencies
path: PreREISE
15 changes: 2 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,18 @@ jobs:

runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [3.7, 3.8]

name: Python ${{ matrix.python-version }}
steps:
- name: Checkout PreREISE
uses: actions/checkout@v2
with:
path: PreREISE

- name: Checkout PowerSimData
uses: actions/checkout@v2
with:
repository: Breakthrough-Energy/PowerSimData
path: PowerSimData
- uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- run: python -m pip install --upgrade tox
working-directory: PreREISE

- run: tox -e pytest-local
working-directory: PreREISE
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ venv/
ENV/
env.bak/
venv.bak/
bin/
pyvenv.cfg

# Spyder project settings
.spyderproject
Expand Down Expand Up @@ -140,3 +142,6 @@ Thumbs.db

# Data
prereise/gather/winddata/data/StatePowerCurves.csv

# Jupyter Notebook
share/
17 changes: 10 additions & 7 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,23 @@ verify_ssl = true

[dev-packages]
black = "*"
pytest = "*"
coverage = "*"
pytest-cov = "*"

[packages]
bokeh = "==2.0.2"
h5pyd = "==0.3.3"
h5pyd = "~=0.8"
matplotlib = "~=3.3"
numpy = "~=1.19"
numpy = "~=1.21.0"
pandas = "~=1.1.2"
pytest = "==5.4.3"
python-dateutil = "==2.7.5"
requests = "~=2.24.0"
scipy = "==1.4.1"
requests = "~=2.25"
scipy = "~=1.7.0"
tqdm = "==4.29.1"
xlrd = "==1.2.0"
netCDF4 = "==1.5.4"
powersimdata = {editable = true, path = "../PowerSimData"}
nrel-pysam = "~=2.1.4"
powersimdata = "~=0.4.4"
nrel-pysam = "~=2.2"
pyproj = "==2.6.1.post1"
pygrib = "*"
Loading

0 comments on commit fc7c274

Please sign in to comment.