Skip to content

Commit

Permalink
Merge branch 'dev' into dagsterize-ppe
Browse files Browse the repository at this point in the history
  • Loading branch information
katie-lamb committed Sep 11, 2023
2 parents 836672b + 543d19d commit 7c4b719
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/tox-pytest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
---
name: tox-pytest

on: [pull_request]
on:
pull_request:
types:
- created
- opened
- synchronize
- ready_for_review

env:
PUDL_OUTPUT: /home/runner/pudl-work/output
Expand Down Expand Up @@ -101,6 +107,7 @@ jobs:
runs-on:
group: large-runner-group
labels: ubuntu-22.04-4core
if: github.event.pull_request.draft == false
permissions:
contents: read
id-token: write
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ repos:
args: [--fix, --exit-non-zero-on-fix]

# Format the code
- repo: https://github.com/psf/black
rev: 23.7.0
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 23.9.1
hooks:
- id: black
language_version: python3.11
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ pudl_check_fks = "pudl.etl.check_foreign_keys:main"

[project.optional-dependencies]
dev = [
"black>=22.0,<23.8",
"black>=22.0,<23.10",
"build>=0.10,<1.1",
"ipdb>=0.13,<0.14",
"jedi>=0.18,<0.20",
Expand Down

0 comments on commit 7c4b719

Please sign in to comment.