Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/empty-initial-state
Browse files Browse the repository at this point in the history
  • Loading branch information
daejunpark committed Aug 26, 2024
2 parents 4f069b0 + 7ffe5e0 commit 0c0cf63
Show file tree
Hide file tree
Showing 25 changed files with 674 additions and 383 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name: Lint
# Deprecated: use pre-commit instead
# name: Lint

on: [push, pull_request]
# on: [push, pull_request]

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: psf/black@stable
# jobs:
# lint:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# - uses: psf/black@stable
11 changes: 11 additions & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: pre-commit

on: [push, pull_request]

jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v3
- uses: pre-commit/[email protected]
30 changes: 21 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
repos:
- repo: https://github.com/psf/black
rev: 23.7.0
hooks:
- id: black
# It is recommended to specify the latest version of Python
# supported by your project here, or alternatively use
# pre-commit's default_language_version, see
# https://pre-commit.com/#top_level-default_language_version
language_version: python3.12
# - repo: https://github.com/psf/black
# rev: 23.7.0
# hooks:
# - id: black
# # It is recommended to specify the latest version of Python
# # supported by your project here, or alternatively use
# # pre-commit's default_language_version, see
# # https://pre-commit.com/#top_level-default_language_version
# language_version: python3.12

- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.6.2
hooks:
# Run the linter.
- id: ruff
# don't autofix by default, this runs in CI
# to run fix locally, use `ruff check src/ --fix`
# args: [ --fix ]
# Run the formatter.
- id: ruff-format
16 changes: 16 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,19 @@ target-version = ["py311", "py312"]
# TODO: re-add test_traces.py when we have a better way to support it in CI
addopts = "--ignore=tests/lib --ignore=tests/test_traces.py"
# addopts = "--ignore=tests/lib"

[tool.ruff.lint]
select = [
"E", # pycodestyle
"F", # pyflakes
"UP", # pyupgrade
"B", # flake8-bugbear
"SIM",# flake8-simplify
"I", # isort
]
ignore = [
"E501", # line too long
]
exclude = [
"tests/lib/**"
]
Loading

0 comments on commit 0c0cf63

Please sign in to comment.