move black & flake8 to precommit

.github/workflows/ci.yml

@@ -29,8 +29,7 @@ jobs:
           set -xe
           python -VV
           python -m site
-          python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade coverage[toml] virtualenv tox tox-gh-actions
+          python -m pip install --upgrade pip setuptools wheel coverage[toml] virtualenv tox tox-gh-actions
 
       - name: "Run tox targets for ${{ matrix.python-version }}"
         run: python -m tox
@@ -47,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        toxenv: ["flake8", "black", "manifest", "docs", "binder"]
+        toxenv: ["manifest", "docs", "binder"]
     env:
       TOXENV: ${{ matrix.toxenv }}
     steps:

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.5.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -21,7 +21,7 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v3.15.0
     hooks:
       - id: pyupgrade
         args: [--py37-plus]
@@ -38,21 +38,31 @@ repos:
   #  hooks:
   #    - id: isort
 
-  #- repo: https://github.com/psf/black
-  #  rev: 22.6.0
-  #  hooks:
-  #    - id: black
-  #      name: Black code
+  - repo: https://github.com/psf/black
+    rev: 23.11.0
+    hooks:
+      - id: black
+        name: Black code
+        args: ["-S"]
 
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.15
+    rev: 0.7.17
     hooks:
       - id: mdformat
         additional_dependencies:
           - mdformat-gfm
           - mdformat_frontmatter
 
   - repo: https://github.com/asottile/yesqa
-    rev: v1.4.0
+    rev: v1.5.0
     hooks:
       - id: yesqa
+
+  - repo: https://github.com/pycqa/flake8
+    rev: 6.1.0
+    hooks:
+      - id: flake8
+        arge:
+          - "--count"
+          - "--show-source"
+          - "--statistics"

MANIFEST.in

@@ -8,7 +8,7 @@ recursive-include papermill *.txt
 
 include setup.py
 include requirements.txt
-include tox_py_installer
+include tox_py_installer.sh
 recursive-include requirements *.txt
 include docs/requirements.txt
 include tox.ini

pyproject.toml

@@ -7,6 +7,7 @@
 
 [tool.black]
 line-length = 100
+target-version = ['py312']
 include = '\.pyi?$'
 exclude = '''
 /(

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 skipsdist = true
-envlist = py{38,39,310,311,312}, flake8, dist, manifest, docs, binder
+envlist = py{38,39,310,311,312}, dist, manifest, docs, binder
 
 [gh-actions]
 python =
@@ -10,12 +10,6 @@ python =
     3.11: py311
     3.12: py312, dist
 
-# Linters
-[testenv:flake8]
-skip_install = true
-deps = flake8
-commands = flake8 papermill --count --show-source --statistics
-
 # Manifest
 [testenv:manifest]
 skip_install = true
@@ -48,14 +42,6 @@ commands =
     python setup.py sdist --dist-dir={distdir} bdist_wheel --dist-dir={distdir}
     /bin/bash -c 'python -m pip install -U --force-reinstall {distdir}/papermill*.whl'
 
-# Black
-[testenv:black]
-description = apply black linter with desired rules
-basepython = python3.12
-deps =
-    black
-commands = black -S -l 100 .
-
 [testenv]
 # disable Python's hash randomization for tests that stringify dicts, etc
 setenv =
@@ -69,15 +55,13 @@ basepython =
     py310: python3.10
     py311: python3.11
     py312: python3.12
-    flake8: python3.12
     manifest: python3.12
     dist: python3.12
     docs: python3.12
     binder: python3.12
-    black: python3.12
 deps = .[dev]
 # Have to use /bin/bash or the `*` will cause that argument to get quoted by the tox command line...
 allowlist_externals = /bin/bash
 # Python 3.12 breaks default pip/setuptools versions ... force an upgrade of these before anything else
-install_command = /bin/bash ./tox_py_installer {opts} {packages}
+install_command = /bin/bash ./tox_py_installer.sh {opts} {packages}
 commands = pytest -v --maxfail=2 --cov=papermill -W always {posargs}