Skip to content

Commit

Permalink
Merge 0d2249f into ea14f22
Browse files Browse the repository at this point in the history
  • Loading branch information
LilSpazJoekp committed Aug 22, 2021
2 parents ea14f22 + 0d2249f commit cf11d59
Show file tree
Hide file tree
Showing 9 changed files with 95 additions and 21 deletions.
5 changes: 5 additions & 0 deletions .flake8
@@ -1,2 +1,7 @@
[flake8]
exclude = .eggs,build,docs,.venv*
ignore = E203 E501 W503 W504
per-file-ignores =
praw/models/__init__.py:F401
praw/models/listing/mixins/__init__.py:F401
praw/models/reddit/mixins/__init__.py:F401
19 changes: 19 additions & 0 deletions .github/workflows/pre-commit_autoupdate.yml
@@ -0,0 +1,19 @@
jobs:
auto-update:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: browniebroke/pre-commit-autoupdate-action@main
- uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: update/pre-commit-hooks
title: Update pre-commit hooks
commit-message: "Update pre-commit hooks"
body: Update versions of pre-commit hooks to the latest version.
name: 'Update pre-commit hooks'
on:
schedule:
- cron: '0 15 * * 1'
workflow_dispatch:
1 change: 0 additions & 1 deletion .github/workflows/tag_release.yml
Expand Up @@ -41,4 +41,3 @@ on:
branches:
- master
- release_test

67 changes: 61 additions & 6 deletions .pre-commit-config.yaml
@@ -1,7 +1,62 @@
fail_fast: true
repos:
- hooks:
- id: black
language_version: python3
repo: https://github.com/psf/black
rev: 20.8b1

- repo: https://github.com/pre-commit/pre-commit-hooks
hooks:
- id: end-of-file-fixer
exclude: .*\.txt
rev: v4.0.1

- repo: local
hooks:
- id: static_word_checks
args:
- '--replace'
entry: python -m tools.static_word_checks
language: system
name: Static Word Checks
pass_filenames: false
types: [ python ]

- id: check_documentation
entry: python -m tools.check_documentation
language: system
name: Check Documentation
pass_filenames: false
types: [ python ]

- repo: https://github.com/psf/black
hooks:
- id: black
language_version: python3
rev: 21.7b0

- repo: https://github.com/LilSpazJoekp/docstrfmt
hooks:
- id: docstrfmt
rev: v1.4.0

- repo: https://github.com/pycqa/flake8
hooks:
- id: flake8
rev: 3.9.2

- repo: https://github.com/ikamensh/flynt/
hooks:
- id: flynt
args:
- '-ll'
- '1000'
- '-tc'
language_version: python3.8
rev: '0.66'

- repo: https://github.com/pycqa/isort
hooks:
- id: isort
rev: 5.9.3

- repo: https://github.com/pycqa/pydocstyle
hooks:
- id: pydocstyle
files: praw/.*
rev: 6.1.1
2 changes: 1 addition & 1 deletion docs/conf.py
Expand Up @@ -6,7 +6,7 @@
sys.path.insert(0, ".")
sys.path.insert(1, "..")

from praw import __version__
from praw import __version__ # noqa: E402

copyright = datetime.today().strftime("%Y, Bryce Boe")
exclude_patterns = ["_build"]
Expand Down
4 changes: 2 additions & 2 deletions pre_push.py
Expand Up @@ -52,7 +52,7 @@ def run_static():
success &= do_process(["flynt", "-q", "-tc", "-ll", "1000", "."])
# needs to be first because flynt is not black compliant
success &= do_process(["black", "."])
success &= do_process(["docstrfmt", "-e", "docs/examples", "."])
success &= do_process(["docstrfmt", "."])
success &= do_process(["isort", "."])
# Linters
success &= do_process(
Expand All @@ -61,7 +61,7 @@ def run_static():
path.join(current_directory, "tools", "check_documentation.py"),
]
)
success &= do_process(["flake8", "--exclude=.eggs,build,docs,.venv*"])
success &= do_process(["flake8"])
success &= do_process(["pydocstyle", "praw"])
# success &= do_process(["pylint", "--rcfile=.pylintrc", "praw"])

Expand Down
9 changes: 6 additions & 3 deletions pyproject.toml
@@ -1,7 +1,10 @@
[tool.black]
exclude = '/(\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv.*|_build|buck-out|build|dist)/'
extend_exclude = '/(\.venv.*)/'
line-length = 88

[tool.docstrfmt]
extend_exclude = ['./docs/examples/']

[tool.isort]
profile = "black"
skip_glob = '.venv*'
profile = 'black'
skip_glob = '.venv*'
7 changes: 0 additions & 7 deletions setup.cfg
@@ -1,9 +1,2 @@
[aliases]
test = pytest

[flake8]
ignore = E203 W503
per-file-ignores =
praw/models/__init__.py:F401
praw/models/listing/mixins/__init__.py:F401
praw/models/reddit/mixins/__init__.py:F401
Expand Up @@ -449,4 +449,4 @@
}
],
"recorded_with": "betamax/0.8.1"
}
}

0 comments on commit cf11d59

Please sign in to comment.