all in on hatch + pre-commit update

Author: RonnyPfannschmidt

.github/workflows/main.yml

@@ -1,6 +1,15 @@
 name: build
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - main
+    - master
+    - '*deploy*'
+    tags:
+    - v*
+  pull_request:
+
 
 jobs:
   tests:
@@ -10,19 +19,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-latest]
-        python: ["3.7","3.8","3.10","3.11", "pypy-3.7"]
+        os: [windows-latest, ubuntu-latest, osx-latest]
+        python: ["3.7","3.8","3.10","3.11", "pypy-3.7", "pypy-3.8"]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
-    - name: Install tox
-      run: pip install tox
+    - name: Install hatch
+      run: pip install hatch
+    - id: pyname_fix
+      run: python -c "import sys;print('pyversion=' + sys.argv[1].replace('pypy-', 'pypy'))" ${{ matrix.python }} >> $GITHUB_OUTPUT
     - name: Test
-      run: tox -e py
+      run: hatch run +py=${{ steps.pyname_fix.outputs.pyversion }} test:test --color=yes
 
   deploy:
 

.gitignore

@@ -1,7 +1,6 @@
 doc/_build
 build/
-execnet.egg-info/
-execnet/_version.py
+src/execnet/_version.py
 dist/
 .pytest_cache/
 .eggs/

.pre-commit-config.yaml

@@ -39,3 +39,7 @@ repos:
     rev: 'v0.991'
     hooks:
     -   id: mypy
+- repo: https://github.com/tox-dev/pyproject-fmt
+  rev: "0.4.1"
+  hooks:
+    - id: pyproject-fmt

doc/example/test_funcmultiplier.py

@@ -1,2 +1,2 @@
 def test_function():
-    import funcmultiplier
+    import funcmultiplier  # type: ignore[import]

pyproject.toml

@@ -1,20 +1,22 @@
 [build-system]
+build-backend = "hatchling.build"
 requires = [
-    "hatchling",
-    "hatch-vcs",
+  "hatch-vcs",
+  "hatchling",
 ]
-build-backend = "hatchling.build"
 
 [project]
 name = "execnet"
-dynamic = ["version"]
 description = "execnet: rapid multi-Python deployment"
-long_description_file = "README.rst"
+readme = "README.rst"
 license = "MIT"
-requires-python = ">=3.7"
 authors = [
     { name = "holger krekel and others" },
 ]
+requires-python = ">=3.7"
+dynamic = [
+  "version",
+]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
@@ -33,29 +35,63 @@ classifiers = [
     "Topic :: System :: Distributed Computing",
     "Topic :: System :: Networking",
 ]
-
 [project.optional-dependencies]
+dev = [
+  "hatch",
+]
+docs = [
+  "pyyaml",
+  "sphinx",
+]
 testing = [
-    "pre-commit",
-    "pytest",
-    "tox",
-    "hatch",
+  "pytest",
+  "pytest-timeout",
 ]
 
 [project.urls]
 Homepage = "https://execnet.readthedocs.io/en/latest/"
 
+
+[tool.pytest.ini_options]
+timeout = 20
+addopts = "-ra"
+testpaths = ["testing"]
+
+
 [tool.hatch.version]
 source = "vcs"
 
+[tool.hatch.envs.test]
+features = ["testing"]
+
+[[tool.hatch.envs.test.matrix]]
+python = ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.7","pypy3.8"]
+
+[tool.hatch.envs.test.scripts]
+test = "pytest {args:testing}"
+
+
+[tool.hatch.envs.docs]
+features = ["docs"]
+
+[tool.hatch.envs.docs.scripts]
+html = "sphinx-build -W -b html doc doc/_build"
+
+
+[tool.hatch.envs.pre-commit]
+detached = true
+dependences = ["pre-commit>1.11.0"]
+
+[tool.hatch.envs.pre-commit.scripts]
+all = "pre-commit run --all-files --show-diff-on-failure"
+
 [tool.hatch.build.hooks.vcs]
-version-file = "execnet/_version.py"
+version-file = "src/execnet/_version.py"
 
-[tool.hatch.build.targets.sdist]
-include = [
-    "/execnet",
-]
+[tool.hatch.build]
+sources = ["src"]
 
 
 [tool.mypy]
 python_version = "3.7"
+mypy_path = "$MYPY_CONFIG_FILE_DIR/src"

execnet/__init__.py renamed to src/execnet/__init__.py

@@ -7,6 +7,7 @@
 (c) 2012, Holger Krekel and others
 """
 from ._version import version as __version__
+from .gateway_base import Channel
 from .gateway_base import DataFormatError
 from .gateway_base import dump
 from .gateway_base import dumps

execnet/gateway.py renamed to src/execnet/gateway.py

@@ -170,10 +170,7 @@ def rinfo_source(channel):
 def _find_non_builtin_globals(source, codeobj):
     import ast
 
-    try:
-        import __builtin__
-    except ImportError:
-        import builtins as __builtin__
+    import builtins as __builtin__
 
     vars = dict.fromkeys(codeobj.co_varnames)
     return [