Simplify packaging

cucumber · Sep 21, 2024 · 18ecb39 · 18ecb39
1 parent f6ecf72
commit 18ecb39
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 64 deletions.
diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
 build-backend = "setuptools.build_meta"
-requires = ["setuptools", "wheel"]
+requires = ["setuptools>=61.0", "wheel"]
 
 [project]
 authors = [
@@ -84,3 +84,52 @@ warn_unused_configs = true
 ignore_missing_imports = true
 module = [
 ]
+# Wait until is ready: https://github.com/tox-dev/tox/issues/999
+[tool.tox]
+legacy_tox_ini = """
+    [tox]
+    requires =
+        tox>=4.2
+    env_list =
+        py312-pre-commit
+        py{312, 311, 310, 39, 38}-mypy
+        py{py310, py39, py38, 312, 311, 310, 39, 38}-pytest-coverage-lin
+        py312-pytest-coverage-{win, mac}
+    distshare = {homedir}/.tox/distshare
+
+    [testenv]
+    platform =
+        lin: linux
+        mac: darwin
+        win: win32
+
+    [testenv:py312-pre-commit]
+    skip_install = true
+    deps =
+        pre-commit
+    commands =
+        pre-commit run
+
+    [testenv:py{312, 311, 310, 39, 38}-mypy]
+    deps =
+        mypy
+    commands =
+        python -m mypy
+
+    [testenv:py{py310, py39, py38, 312, 311, 310, 39, 38}-pytest-coverage-{lin, win, mac}]
+    deps =
+        .[test-coverage]
+    commands =
+        coverage run --append -m pytest -vvl
+
+    [gh-actions]
+    python =
+        3.8: py38
+        3.9: py39
+        3.10: py310
+        3.11: py311
+        3.12: py312
+        pypy-3.8: pypy38
+        pypy-3.9: pypy39
+        pypy-3.10: pypy310
+"""
diff --git a/python/setup.cfg b/python/setup.cfg
diff --git a/python/src/cucumber_messages/__init__.py b/python/src/cucumber_messages/__init__.py
@@ -0,0 +1,4 @@
+from python.src.cucumber_messages.messages import *
+
+ExpressionType = Type1
+del Type1
diff --git a/python/src/_messages.py → python/src/cucumber_messages/messages.py b/python/src/_messages.py → python/src/cucumber_messages/messages.py
diff --git a/python/src/messages.py b/python/src/messages.py
diff --git a/python/src/message_samples/__init__.py → ...on/tests/data/message_samples/__init__.py b/python/src/message_samples/__init__.py → ...on/tests/data/message_samples/__init__.py
diff --git a/...c/message_samples/minimal/minimal.feature → ...a/message_samples/minimal/minimal.feature b/...c/message_samples/minimal/minimal.feature → ...a/message_samples/minimal/minimal.feature
diff --git a/...ge_samples/minimal/minimal.feature.ndjson → ...ge_samples/minimal/minimal.feature.ndjson b/...ge_samples/minimal/minimal.feature.ndjson → ...ge_samples/minimal/minimal.feature.ndjson
diff --git a/...essage_samples/minimal/minimal.feature.ts → ...essage_samples/minimal/minimal.feature.ts b/...essage_samples/minimal/minimal.feature.ts → ...essage_samples/minimal/minimal.feature.ts
diff --git a/python/tests/test_model_load.py b/python/tests/test_model_load.py
@@ -1,18 +1,17 @@
 import json
-from itertools import chain
 from pathlib import Path
 
-from importlib_resources import files
 from pytest import mark, param
 
-from messages import Envelope
+from cucumber_messages import Envelope
 
+resource_path = Path(__file__).parent.absolute()
 
 @mark.parametrize(
     "ast_path",
     map(
         lambda file: param(file, id=file.name),  # type: ignore[no-any-return]
-        chain.from_iterable(map(lambda p: p.glob("*.ndjson"), files("message_samples").iterdir())),
+        resource_path.rglob("*.ndjson"),
     ),
 )
 def test_simple_load_model(ast_path: Path):

diff --git a/python/tox.ini b/python/tox.ini