Bump linters and add 3.10 to the CI

Signed-off-by: Bernát Gábor <[email protected]>

Author: gaborbernat

.github/workflows/check.yml

@@ -1,39 +1,41 @@
 name: check
-
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 8 * * *"
 
 concurrency:
   group: check-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   lint:
-    runs-on: ubuntu-latest
-
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-      - uses: pre-commit/[email protected].0
+      - uses: pre-commit/[email protected].3
 
   test:
-    name: ${{ matrix.py }}
-    runs-on: Ubuntu-latest
+    name: test on ${{ matrix.py }}
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         py:
-          - 3.9
-          - 3.8
-          - 3.7
-          - 3.6
+          - "3.10"
+          - "3.9"
+          - "3.8"
+          - "3.7"
+          - "3.6"
           - pypy3
-
     steps:
       - uses: actions/checkout@v2
       - name: setup python for tox
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: install tox
         run: python -m pip install tox
       - name: setup python for test ${{ matrix.py }}
@@ -57,19 +59,19 @@ jobs:
 
   check:
     name: check ${{ matrix.tox_env }}
-    runs-on: Ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         tox_env:
           - pkg_desc
-
+          - dev
     steps:
       - uses: actions/checkout@v2
-      - name: setup Python 3.9
+      - name: setup Python 3.10
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: install tox
         run: python -m pip install tox
       - name: run check for ${{ matrix.tox_env }}
@@ -83,7 +85,7 @@ jobs:
       - name: setup python to build package
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: install build
         run: python -m pip install build
       - uses: actions/checkout@v2

.gitignore

@@ -162,3 +162,4 @@ ipydatagrid/labextension
 
 conda_out
 recipe
+/examples/trees.json

.pre-commit-config.yaml

@@ -1,57 +1,57 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.1.0
     hooks:
+      - id: check-ast
+      - id: check-builtin-literals
+      - id: check-docstring-first
+      - id: check-merge-conflict
       - id: check-yaml
-      - id: trailing-whitespace
+      - id: check-toml
+      - id: debug-statements
       - id: end-of-file-fixer
+      - id: trailing-whitespace
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.10.0
+    rev: v2.29.1
     hooks:
       - id: pyupgrade
-        args: ['--py36-plus']
+        args: [ "--py36-plus" ]
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
   - repo: https://github.com/psf/black
-    rev: 21.4b0
+    rev: 21.12b0
     hooks:
       - id: black
-        args: [--safe]
-  - repo: https://github.com/tomcatling/black-nb
-    rev: 0.5.0
+        args: [ --safe ]
+  - repo: https://github.com/asottile/blacken-docs
+    rev: v1.12.0
     hooks:
-      - id: black-nb
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.7.0
+      - id: blacken-docs
+        additional_dependencies: [ black==21.12b0 ]
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.9.0
     hooks:
-      - id: isort
-  - repo: https://github.com/PyCQA/flake8
-    rev: 3.8.4
+      - id: rst-backticks
+  - repo: https://github.com/tox-dev/tox-ini-fmt
+    rev: "0.5.1"
     hooks:
-      - id: flake8
-        additional_dependencies:
-          - 'flake8-bugbear == 20.11.1'
-          - 'flake8-unused-arguments == 0.0.6'
-          - 'flake8-comprehensions == 3.3.1'
+      - id: tox-ini-fmt
+        args: [ "-p", "fix" ]
   - repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.16.0
+    rev: v1.20.0
     hooks:
       - id: setup-cfg-fmt
-  - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: '0.5.0'
+        args: [ --min-py3-version, "3.6", "--max-py-version", "3.10" ]
+  - repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
     hooks:
-      - id: tox-ini-fmt
-        args: ['-p', 'fix_lint']
-  - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: 'v7.29.0'
-    hooks:
-      - id: eslint
-        files: \.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx
-        types: [file]
-        args: ['--fix']
+      - id: flake8
         additional_dependencies:
-          - [email protected]
-          - [email protected] # prettier used with eslint directly
-          - [email protected]
-          - [email protected]
-          - [email protected]
-          - '@typescript-eslint/eslint-plugin'
-          - '@typescript-eslint/parser'
+          - flake8-bugbear==21.11.29
+          - flake8-comprehensions==3.7
+          - flake8-pytest-style==1.6
+          - flake8-unused-arguments==0.0.9
+          - flake8-noqa==1.2.1
+          - pep8-naming==0.12.1

ipydatagrid/__init__.py

@@ -1,16 +1,16 @@
 # Copyright (c) Bloomberg.
 # Distributed under the terms of the Modified BSD License.
 
-from ._version import __version__  # noqa
-from .cellrenderer import (  # noqa
+from ._version import __version__
+from .cellrenderer import (
     BarRenderer,
     CellRenderer,
     Expr,
     HyperlinkRenderer,
     TextRenderer,
     VegaExpr,
 )
-from .datagrid import DataGrid, SelectionHelper  # noqa
+from .datagrid import DataGrid, SelectionHelper
 
 
 def _jupyter_nbextension_paths():
@@ -26,3 +26,16 @@ def _jupyter_nbextension_paths():
 
 def _jupyter_labextension_paths():
     return [{"src": "labextension", "dest": "ipydatagrid"}]
+
+
+__all__ = [
+    "__version__",
+    "BarRenderer",
+    "CellRenderer",
+    "Expr",
+    "HyperlinkRenderer",
+    "TextRenderer",
+    "VegaExpr",
+    "DataGrid",
+    "SelectionHelper",
+]

setup.cfg

@@ -20,6 +20,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 description_file = README.md
 keywords = Jupyter, Widgets, IPython
 
@@ -35,18 +36,7 @@ include_package_data = True
 zip_safe = False
 
 [options.extras_require]
-dev =
-    pre-commit
-docs =
-    jupyter_sphinx
-    nbsphinx>=0.2.13,<0.4.0
-    nbsphinx-link
-    pypandoc
-    pytest_check_links
-    recommonmark
-    sphinx>=1.5
-    sphinx_rtd_theme
 test =
-    nbval
-    pytest>=3.6
-    pytest-cov
+    nbval>=0.9
+    pytest>=6
+    pytest-cov>=3

tests/test_datagrid.py

@@ -4,19 +4,19 @@
 from ipydatagrid import DataGrid
 
 
-@pytest.fixture
+@pytest.fixture()
 def dataframe() -> None:
     return pd.DataFrame(
         data={"A": [1, 2, 3], "B": [4, 5, 6]}, index=["One", "Two", "Three"]
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def datagrid(dataframe) -> None:
     return DataGrid(dataframe)
 
 
-@pytest.fixture
+@pytest.fixture()
 def data_object(dataframe) -> None:
     return DataGrid.generate_data_object(dataframe, "ipydguuid", "key")
 

tox.ini

@@ -1,11 +1,13 @@
 [tox]
 envlist =
-    fix_lint
+    fix
+    py310
     py39
     py38
     py37
     py36
     pypy3
+    docs
     pkg_desc
 isolated_build = true
 skip_missing_interpreters = true
@@ -15,12 +17,12 @@ minversion = 3.7
 extras =
     test
 commands =
-    pytest tests
+    pytest {tty:--color=yes} tests
     pytest --nbval examples
 package = wheel
 wheel_build_env = .pkg
 
-[testenv:fix_lint]
+[testenv:fix]
 description = format the code base to adhere to our styles, and complain about what we cannot do automatically
 passenv =
     PROGRAMDATA
@@ -29,15 +31,13 @@ deps =
     pre-commit>=2
 commands =
     pre-commit run --all-files --show-diff-on-failure
-    python -c 'import pathlib; print("hint: run \{\} install to add checks as pre-commit hook".format(pathlib.Path(r"{envdir}") / "bin" / "pre-commit"))'
 
 [testenv:pkg_desc]
 description = check that the long description is valid
 skip_install = true
 deps =
-    build>=0.2
-    readme-renderer[md]>=24
-    twine>=3
+    build[virtualenv]>=0.7
+    twine>=3.7
 commands =
     python -m build --sdist --wheel . -o {envtmpdir}
     twine check {envtmpdir}/*
@@ -47,7 +47,6 @@ description = dev environment with all deps at {envdir}
 usedevelop = true
 extras =
     dev
-    docs
     test
 commands =
     python -m pip list --format=columns
@@ -57,6 +56,7 @@ commands =
 max-complexity = 22
 max-line-length = 80
 extend-ignore = E203, W503
+noqa-require-code = true
 
 [pep8]
 max-line-length = 80