Skip to content

Commit

Permalink
Merge branch 'main' into eia176_wide_table
Browse files Browse the repository at this point in the history
  • Loading branch information
jdangerx committed Nov 28, 2024
2 parents d3c7a8c + 740212a commit 65a4990
Show file tree
Hide file tree
Showing 19 changed files with 1,367 additions and 1,287 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/versioned_release.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ assignees: ""
- [ ] Verify [`catalystcoop.pudl` PyPI (software) release](https://pypi.org/project/catalystcoop.pudl/)
- [ ] Verify that [PUDL repo archive on Zenodo](https://zenodo.org/doi/10.5281/zenodo.3404014) has been updated w/ new version
- [ ] Wait 6-10 hours for a successful build to complete
- [ ] Activate new version on the [RTD admin panel](https://readthedocs.org/projects/catalystcoop-pudl/versions/) and verify that it builds successfully.
- [ ] Activate new version on the [RTD admin panel](https://app.readthedocs.org/projects/catalystcoop-pudl/) and verify that it builds successfully.
- [ ] Verify that `stable` and the version tag point at same git ref
- [ ] Verify that [`stable` docs on RTD](https://catalystcoop-pudl.readthedocs.io/en/stable/) have been updated
- [ ] Verify `gs://pudl.catalyst.coop/vYYYY.M.x` has the new expected data.
Expand Down
26 changes: 8 additions & 18 deletions .github/workflows/build-deploy-pudl.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
name: build-deploy-pudl
on:
workflow_dispatch:
Expand All @@ -11,8 +12,6 @@ on:

env:
GCP_BILLING_PROJECT: ${{ secrets.GCP_BILLING_PROJECT }}
GCE_INSTANCE: pudl-deployment-tag # This is changed to pudl-deployment-dev if running on a schedule
GCE_INSTANCE_ZONE: ${{ secrets.GCE_INSTANCE_ZONE }}
GCS_OUTPUT_BUCKET: gs://builds.catalyst.coop
BATCH_JOB_JSON: batch_job.json

Expand All @@ -24,12 +23,6 @@ jobs:
contents: write
id-token: write
steps:
- name: Use pudl-deployment-dev vm if running on a schedule
if: ${{ (github.event_name == 'schedule') }}
run: |
echo "This action was triggered by a schedule."
echo "GCE_INSTANCE=pudl-deployment-dev" >> $GITHUB_ENV
- name: Checkout Repository
uses: actions/checkout@v4
with:
Expand All @@ -56,7 +49,6 @@ jobs:
- name: Show freshly set envvars
if: ${{ env.SKIP_BUILD != 'true' }}
run: |
echo "GCE_INSTANCE: $GCE_INSTANCE"
echo "NIGHTLY_TAG: $NIGHTLY_TAG"
echo "BUILD_ID: $BUILD_ID"
echo "BATCH_JOB_ID: $BATCH_JOB_ID"
Expand Down Expand Up @@ -140,8 +132,6 @@ jobs:
--container-env BUILD_ID=${{ env.BUILD_ID }} \
--container-env BUILD_REF=${{ github.ref_name }} \
--container-env FLY_ACCESS_TOKEN=${{ secrets.FLY_ACCESS_TOKEN }} \
--container-env GCE_INSTANCE=${{ env.GCE_INSTANCE }} \
--container-env GCE_INSTANCE_ZONE=${{ env.GCE_INSTANCE_ZONE }} \
--container-env GCP_BILLING_PROJECT=${{ secrets.GCP_BILLING_PROJECT }} \
--container-env GITHUB_ACTION_TRIGGER=${{ github.event_name }} \
--container-env NIGHTLY_TAG=${{ env.NIGHTLY_TAG }} \
Expand All @@ -160,13 +150,13 @@ jobs:
if: ${{ env.SKIP_BUILD != 'true' }}
run: gcloud batch jobs submit run-etl-${{ env.BATCH_JOB_ID }} --config ${{ env.BATCH_JOB_JSON }} --location us-west1

- name: Post to a pudl-deployments channel
- name: Post to pudl-deployments channel
if: always()
id: slack
uses: slackapi/slack-github-action@v1
uses: slackapi/slack-github-action@v2
with:
channel-id: "C03FHB9N0PQ"
slack-message: "`${{ env.BUILD_ID }}` build-deploy-pudl status: ${{ (env.SKIP_BUILD == 'true') && 'skipped' || job.status }}\n${{ env.GCS_OUTPUT_BUCKET }}/${{ env.BUILD_ID }}"
env:
channel-id: "C03FHB9N0PQ"
SLACK_BOT_TOKEN: ${{ secrets.PUDL_DEPLOY_SLACK_TOKEN }}
method: chat.postMessage
token: ${{ secrets.PUDL_DEPLOY_SLACK_TOKEN }}
payload: |
text: "`${{ env.BUILD_ID }}` build-deploy-pudl status: ${{ (env.SKIP_BUILD == 'true') && 'skipped' || job.status }}\n${{ env.GCS_OUTPUT_BUCKET }}/${{ env.BUILD_ID }}"
channel: "C03FHB9N0PQ"
2 changes: 1 addition & 1 deletion .github/workflows/com-dev-notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Post to a Slack channel user isn't a part of Catalyst
if: ${{ !steps.is_organization_member.outputs.result }}
id: slack
uses: slackapi/slack-github-action@v1.24.0
uses: slackapi/slack-github-action@v2

with:
# Slack channel id, channel name, or user id to post message.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,13 @@ jobs:
micromamba run -n coverage coverage combine coverage/*/.coverage
micromamba run -n coverage coverage xml --fail-under=0
- name: Upload XML coverage report to CodeCov
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
disable_search: true
file: ./coverage.xml
files: ./coverage.xml
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true # optional (default = false)
plugin: noop
plugins: noop
verbose: true
- name: Display coverage report and ensure it meets required minimum
# Required coverage is set in pyproject.toml section [tool.coverage.report]
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ repos:
# Formatters: hooks that re-write Python & documentation files
####################################################################################
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.4
rev: v0.8.0
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ You'll need to fork this repository and get the

* Once you have an idea of how you want to tackle this issue, write out your
plan so we can guide you around obstacles in your way! Post a comment outlining:

* what steps have you broken this down into?
* what is the output of each step?
* how will one know that each step is working?
Expand Down
Loading

0 comments on commit 65a4990

Please sign in to comment.