Merge pull request #348 from Breakthrough-Energy/develop

Merge develop into master for v0.5.2 release
Breakthrough-Energy · Aug 18, 2022 · 3568f49 · 3568f49
2 parents 4359c65 + 0409f1f
commit 3568f49
Show file tree

Hide file tree

Showing 50 changed files with 1,931 additions and 954 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/release.yml b/.github/workflows/release.yml
@@ -26,3 +26,11 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
+
+      - name: Build and publish docker image
+        uses: Breakthrough-Energy/actions/workflow-trigger@main
+        with:
+          repo: plug
+          workflow_id: 12413223
+          token: ${{ secrets.CI_TOKEN_CLONE_REPO }}
+          inputs: '{"imageTags": "stable"}'
diff --git a/Pipfile b/Pipfile
@@ -4,11 +4,11 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [packages]
-bokeh = "==2.0.2"
+bokeh = "~=2.0"
 matplotlib = "~=3.3"
 numpy = "~=1.20"
 pandas = "~=1.4.0"
-powersimdata = "~=0.5.0"
+powersimdata = "~=0.5.4"
 pyproj = "~=3.0"
 
 [dev-packages]