Merge pull request #618 from Breakthrough-Energy/develop

develop -> master for v0.5.1
Breakthrough-Energy · Apr 19, 2022 · 400cad3 · 400cad3
2 parents f08ba77 + 2098a40
commit 400cad3
Show file tree

Hide file tree

Showing 60 changed files with 3,088 additions and 1,424 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/data-intake.md b/.github/ISSUE_TEMPLATE/data-intake.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -19,7 +19,7 @@ jobs:
  python-version: 3.9
 
  - run: python -m pip install --upgrade pip tox
- - run: tox -e pytest-local -- --cov-report=xml
+ - run: tox -e pytest-local -- --cov=powersimdata --cov-report=xml
 
  - name: Upload coverage to Codecov
  uses: codecov/codecov-action@v1

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,4 +25,4 @@ jobs:
  python-version: ${{ matrix.python-version }}
 
  - run: python -m pip install --upgrade pip tox
- - run: tox -e pytest-local
+ - run: tox -e pytest-local -- --cov=powersimdata
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,6 @@
 FROM python:3.8.3
 
 RUN apt-get update
-RUN apt-get install gawk
 RUN ln -s /mnt/bes/pcm $HOME/ScenarioData
 
 COPY powersimdata/utility/templates /mnt/bes/pcm/

diff --git a/Pipfile b/Pipfile
@@ -8,12 +8,13 @@ black = "*"
 pytest = "*"
 coverage = "*"
 pytest-cov = "*"
+pypsa = "*"
 
 [packages]
 networkx = "~=2.5"
 numpy = "~=1.20"
 pandas = "~=1.2"
-paramiko = "==2.7.2"
+paramiko = "==2.10.1"
 scipy = "~=1.5"
 tqdm = "==4.29.1"
 requests = "~=2.25"