Clean up cookie cutter and fix CI failures (#21)

Author: blink1073

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         # This will be used by the base setup action
-        python-version: ["3.7", "3.10"]
+        python-version: ["3.8", "3.11"]
 
     steps:
       - name: Checkout
@@ -97,6 +97,16 @@ jobs:
           pip uninstall -y my_server_extension
           rm -rf my_server_extension
 
+      - name: Run the linters
+        run: |
+          # Trick to use custom parameters
+          python -c "from cookiecutter.main import cookiecutter; import json; f=open('cookiecutter.json'); d=json.load(f); f.close(); d['author_name']='foo'; d['author_email']='[email protected]'; cookiecutter('.', extra_context=d, no_input=True)"
+          cd my_server_extension
+          bash ./.github/workflows/lint.sh
+          cd ..
+          pip uninstall -y my_server_extension
+          rm -rf my_server_extension
+
       - uses: actions/upload-artifact@v2
         if: startsWith(runner.os, 'Linux')
         with:

{{cookiecutter.package_name}}/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"

{{cookiecutter.package_name}}/.github/workflows/build.yml

@@ -14,6 +14,12 @@ defaults:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: [ '3.8', '3.9', '3.10', "3.11" ]
+
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -47,12 +53,33 @@ jobs:
       - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
       - uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1
 
-  pre_commit:
+  test_lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
-      - uses: jupyterlab/maintainer-tools/.github/actions/pre-commit@v1
+      - name: Run Linters
+        run: |
+          bash ./.github/workflows/lint.sh
+
+  check_release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Base Setup
+        uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
+      - name: Install Dependencies
+        run: |
+          pip install -e .
+      - name: Check Release
+        uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
+        with:
+          token: {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
+      - name: Upload Distributions
+        uses: actions/upload-artifact@v2
+        with:
+          name: {{ cookiecutter.package_name }}-releaser-dist-${{ '{{ github.run_number }}' }}
+          path: .jupyter_releaser_checkout/dist
 
   test_sdist:
     needs: build

{{cookiecutter.package_name}}/.github/workflows/check-release.yml

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+pip install -e ".[test,lint]"
+mypy --install-types --non-interactive .
+ruff .
+black --check --diff .
+mdformat --check *.md
+pipx run 'validate-pyproject[all]' pyproject.toml

{{cookiecutter.package_name}}/.github/workflows/lint.sh

@@ -1,9 +1,9 @@
-default_language_version:
-  node: system
+ci:
+  autoupdate_schedule: monthly
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: end-of-file-fixer
       - id: check-case-conflict
@@ -18,63 +18,25 @@ repos:
       - id: check-builtin-literals
       - id: trailing-whitespace
 
-  - repo: https://github.com/psf/black
-    rev: 22.10.0
-    hooks:
-      - id: black
-
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
-    hooks:
-      - id: isort
-        files: \.py$
-
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.982
-    hooks:
-      - id: mypy
-        additional_dependencies: [types-requests]
-
-  - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.10.1
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.19.2
     hooks:
-      - id: validate-pyproject
-        stages: [manual]
+      - id: check-github-workflows
 
   - repo: https://github.com/executablebooks/mdformat
     rev: 0.7.16
     hooks:
       - id: mdformat
+        additional_dependencies:
+          [mdformat-gfm, mdformat-frontmatter, mdformat-footnote]
 
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.0.0
-    hooks:
-      - id: pyupgrade
-        args: [--py37-plus]
-
-  - repo: https://github.com/PyCQA/doc8
-    rev: v1.0.0
-    hooks:
-      - id: doc8
-        args: [--max-line-length=200]
-        exclude: docs/source/other/full-config.rst
-        stages: [manual]
-
-  - repo: https://github.com/john-hen/Flake8-pyproject
-    rev: 1.0.1
+  - repo: https://github.com/psf/black
+    rev: 22.10.0
     hooks:
-      - id: Flake8-pyproject
-        alias: flake8
-        additional_dependencies:
-          ["flake8-bugbear==22.6.22", "flake8-implicit-str-concat==0.2.0"]
-        stages: [manual]
+      - id: black
 
-  - repo: https://github.com/sirosen/check-jsonschema
-    rev: 0.18.3
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.0.165
     hooks:
-      - id: check-jsonschema
-        name: "Check GitHub Workflows"
-        files: ^\.github/workflows/
-        types: [yaml]
-        args: ["--schemafile", "https://json.schemastore.org/github-workflow"]
-        stages: [manual]
+      - id: ruff
+        args: ["--fix"]

{{cookiecutter.package_name}}/.pre-commit-config.yaml

@@ -1,31 +1,38 @@
 [build-system]
-requires = ["hatchling>=1.0"]
+requires = ["hatchling>=1.5"]
 build-backend = "hatchling.build"
 
 [project]
 name = "{{cookiecutter.package_name}}"
 authors = [{name = "{{cookiecutter.author_name}}", email = "{{cookiecutter.author_email}}"}]
 dynamic = ["version"]
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 keywords = ["Jupyter", "Extension"]
 classifiers = [
     "License :: OSI Approved :: BSD License",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Framework :: Jupyter",
 ]
-dependencies = ["jupyter_server>=1.6,<2"]
+dependencies = ["jupyter_server>=1.6,<3"]
 
 [project.optional-dependencies]
 test = [
   "pytest>=7.0",
-  "jupyter_server[test]"
+  "pytest-jupyter[server]>=0.6"
 ]
+lint = [
+  "black>=22.6.0",
+  "mdformat>0.7",
+  "mdformat-gfm>=0.3.5",
+  "ruff>=0.0.156"
+]
+typing = ["mypy>=0.990"]
 
 [project.license]
 file="LICENSE"
@@ -39,12 +46,6 @@ path = "{{ cookiecutter.package_name }}/__init__.py"
 [tool.hatch.build.targets.wheel.shared-data]
 "jupyter-config" = "etc/jupyter"
 
-[tool.black]
-line_length = 100
-
-[tool.isort]
-profile = "black"
-
 [tool.pytest.ini_options]
 filterwarnings = [
   "error",
@@ -66,23 +67,27 @@ warn_unused_configs = true
 warn_unused_ignores = true
 warn_redundant_casts = true
 
-[tool.flake8]
-ignore = "E501, W503, E402"
-builtins = "c, get_config"
-exclude = [
-    ".cache",
-    ".github",
-    "docs",
-    "setup.py",
-]
-enable-extensions = "G"
-extend-ignore = [
-    "G001", "G002", "G004", "G200", "G201", "G202",
-    # black adds spaces around ':'
-    "E203",
+[tool.black]
+line-length = 100
+target-version = ["py38"]
+skip-string-normalization = true
+
+[tool.ruff]
+target-version = "py38"
+line-length = 100
+select = [
+  "A", "B", "C", "E", "F", "FBT", "I", "N", "Q", "RUF", "S", "T",
+  "UP", "W", "YTT",
 ]
-per-file-ignores = [
-    # B011: Do not call assert False since python -O removes these calls
-    # F841 local variable 'foo' is assigned to but never used
-    "tests/*: B011", "F841",
+ignore = [
+# Q000 Single quotes found but double quotes preferred
+"Q000",
+# FBT001 Boolean positional arg in function definition
+"FBT001", "FBT002", "FBT003",
+# C901 `foo` is too complex (12)
+"C901",
 ]
+
+[tool.ruff.per-file-ignores]
+# S101 Use of `assert` detected
+"{{cookiecutter.package_name}}/tests/*" = ["S101"]