🔧 PEP 621 package build, drop Python 3.6 (#51)

chrisjsewell · web-flow · commit 6fbc43fddd31 · 2022-09-27T09:17:47.000+02:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,8 +28,9 @@ jobs:
 
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: [pypy3, 3.6, 3.7, 3.8, 3.9]
+        python-version: ['pypy-3.7', '3.7', '3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v2
@@ -64,13 +65,13 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
-    - name: Build package
+        python-version: "3.8"
+    - name: install flit
       run: |
-        pip install build
-        python -m build
-    - name: Publish
-      uses: pypa/gh-action-pypi-publish@v1.1.0
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_KEY }}
+        pip install flit~=3.4
+    - name: Build and publish
+      run: |
+        flit publish
+      env:
+        FLIT_USERNAME: __token__
+        FLIT_PASSWORD: ${{ secrets.PYPI_KEY }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -19,27 +19,13 @@ repos:
     - id: end-of-file-fixer
     - id: trailing-whitespace
 
-  - repo: https://github.com/mgedmin/check-manifest
-    rev: "0.48"
-    hooks:
-    - id: check-manifest
-      args: [--no-build-isolation]
-      additional_dependencies: [setuptools>=46.4.0]
-
-  # this is not used for now,
-  # since it converts mdit-py-plugins to mdit_py_plugins and removes comments
-  # - repo: https://github.com/asottile/setup-cfg-fmt
-  #   rev: v1.17.0
-  #   hooks:
-  #   - id: setup-cfg-fmt
-
   - repo: https://github.com/timothycrosley/isort
     rev: 5.10.1
     hooks:
     - id: isort
 
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 22.8.0
     hooks:
     - id: black
 
@@ -50,7 +36,7 @@ repos:
       additional_dependencies: [flake8-bugbear==21.3.1]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.961
+    rev: v0.971
     hooks:
     - id: mypy
-      additional_dependencies: [markdown-it-py~=1.0]
+      additional_dependencies: [markdown-it-py~=2.0]
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,67 @@
 [build-system]
-requires = ["setuptools>=46.4.0", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["flit_core >=3.4,<4"]
+build-backend = "flit_core.buildapi"
+
+[project]
+name = "mdit-py-plugins"
+dynamic = ["version"]
+description = "Collection of plugins for markdown-it-py"
+readme = "README.md"
+authors = [{name = "Chris Sewell", email = "chrisj_sewell@hotmail.com"}]
+license = {file = "LICENSE"}
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "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 :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Text Processing :: Markup",
+]
+keywords = ["markdown", "markdown-it", "lexer", "parser", "development"]
+requires-python = ">=3.7"
+dependencies = ["markdown-it-py>=1.0.0,<3.0.0"]
+
+[project.urls]
+Homepage = "https://github.com/executablebooks/mdit-py-plugins"
+Documentation = "https://markdown-it-py.readthedocs.io"
+
+[project.optional-dependencies]
+code_style = ["pre-commit"]
+testing = [
+    "coverage",
+    "pytest",
+    "pytest-cov",
+    "pytest-regressions",
+]
+rtd = [
+    "attrs",
+    "myst-parser~=0.16.1",
+    "sphinx-book-theme~=0.1.0",
+]
+
+[tool.flit.module]
+name = "mdit_py_plugins"
+
+[tool.flit.sdist]
+exclude = [
+    "docs/",
+    "tests/",
+]
 
 [tool.isort]
 profile = "black"
+force_sort_within_sections = true
 known_first_party = ["mdit_py_plugins", "tests"]
+
+[tool.mypy]
+show_error_codes = true
+warn_unused_ignores = true
+warn_redundant_casts = true
+no_implicit_optional = true
+strict_equality = true
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/tests/test_amsmath.py b/tests/test_amsmath.py
@@ -1,9 +1,9 @@
 from pathlib import Path
 from textwrap import dedent
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.amsmath import amsmath_plugin
 
diff --git a/tests/test_anchors.py b/tests/test_anchors.py
@@ -1,8 +1,8 @@
 from pathlib import Path
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.anchors import anchors_plugin
 
diff --git a/tests/test_colon_fence.py b/tests/test_colon_fence.py
@@ -1,9 +1,9 @@
 from pathlib import Path
 from textwrap import dedent
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.colon_fence import colon_fence_plugin
 
diff --git a/tests/test_container.py b/tests/test_container.py
@@ -1,9 +1,9 @@
 from pathlib import Path
 from textwrap import dedent
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.container import container_plugin
 
diff --git a/tests/test_deflist.py b/tests/test_deflist.py
@@ -1,9 +1,9 @@
 from pathlib import Path
 from textwrap import dedent
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.deflist import deflist_plugin
 
diff --git a/tests/test_dollarmath.py b/tests/test_dollarmath.py
@@ -1,11 +1,11 @@
 from pathlib import Path
 from textwrap import dedent
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.rules_block import StateBlock
 from markdown_it.rules_inline import StateInline
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.dollarmath import dollarmath_plugin
 from mdit_py_plugins.dollarmath import index as main
diff --git a/tests/test_field_list.py b/tests/test_field_list.py
@@ -1,9 +1,9 @@
 from pathlib import Path
 from textwrap import dedent
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.field_list import fieldlist_plugin
 
diff --git a/tests/test_footnote.py b/tests/test_footnote.py
@@ -1,12 +1,12 @@
 from pathlib import Path
 from textwrap import dedent
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.rules_block import StateBlock
 from markdown_it.rules_inline import StateInline
 from markdown_it.token import Token
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.footnote import footnote_plugin, index
 
diff --git a/tests/test_front_matter.py b/tests/test_front_matter.py
@@ -1,9 +1,9 @@
 from pathlib import Path
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.token import Token
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.front_matter import front_matter_plugin
 
diff --git a/tests/test_myst_block.py b/tests/test_myst_block.py
@@ -1,9 +1,9 @@
 from pathlib import Path
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.token import Token
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.myst_blocks import myst_block_plugin
 
diff --git a/tests/test_myst_role.py b/tests/test_myst_role.py
@@ -1,9 +1,9 @@
 from pathlib import Path
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.token import Token
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.myst_role import myst_role_plugin
 
diff --git a/tests/test_substitution.py b/tests/test_substitution.py
@@ -1,9 +1,9 @@
 from pathlib import Path
 from textwrap import dedent
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.utils import read_fixture_file
+import pytest
 
 # from markdown_it.token import Token
 from mdit_py_plugins.substitution import substitution_plugin
diff --git a/tests/test_tasklists.py b/tests/test_tasklists.py
@@ -1,9 +1,9 @@
 from pathlib import Path
 from textwrap import dedent
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.tasklists import tasklists_plugin
 
diff --git a/tests/test_texmath.py b/tests/test_texmath.py
@@ -1,11 +1,11 @@
 from pathlib import Path
 from textwrap import dedent
 
-import pytest
 from markdown_it import MarkdownIt
 from markdown_it.rules_block import StateBlock
 from markdown_it.rules_inline import StateInline
 from markdown_it.utils import read_fixture_file
+import pytest
 
 from mdit_py_plugins.texmath import index as main
 from mdit_py_plugins.texmath import texmath_plugin
diff --git a/tests/test_wordcount.py b/tests/test_wordcount.py
diff --git a/tox.ini b/tox.ini
