From 482acd92ff2f5292c15e62cd0191845536312fc1 Mon Sep 17 00:00:00 2001 From: rjdbcm Date: Mon, 2 Dec 2024 23:13:33 -0600 Subject: [PATCH 1/3] fix wheel format Signed-off-by: rjdbcm --- meson.build | 2 +- pyproject.toml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 05f0871..78aa0b2 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('OZI.build', version : '1.7.0', license : 'apache-2.0') +project('OZI.build', version : '1.7.1', license : 'apache-2.0') fs = import('fs') python = import('python').find_installation() subdir('ozi_build') diff --git a/pyproject.toml b/pyproject.toml index c9a95f1..bdb822d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,5 +56,8 @@ project-urls= [ pure-python-abi="py3-none" summary="Create pep517 compliant packages from the meson build system, OZI-maintained fork." +[tool.ozi-build.pyc_wheel] +exclude = ".*\\.py" + [tool.deptry.per_rule_ignores] DEP002 = ["meson"] From 7caac3da5b5a7a82b7f8c94e79af3acd73fa087d Mon Sep 17 00:00:00 2001 From: rjdbcm Date: Mon, 2 Dec 2024 23:23:52 -0600 Subject: [PATCH 2/3] fix wheel format --- ozi_build/_pyc_wheel.py | 1 + pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ozi_build/_pyc_wheel.py b/ozi_build/_pyc_wheel.py index c2a4493..4fe10c3 100644 --- a/ozi_build/_pyc_wheel.py +++ b/ozi_build/_pyc_wheel.py @@ -135,6 +135,7 @@ def convert_wheel( if exclude: exclude = re.compile(re.escape(exclude)) + print(exclude) dist_info = "-".join(whl_file.stem.split("-")[:-3]) diff --git a/pyproject.toml b/pyproject.toml index bdb822d..e114ab0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,7 +57,7 @@ pure-python-abi="py3-none" summary="Create pep517 compliant packages from the meson build system, OZI-maintained fork." [tool.ozi-build.pyc_wheel] -exclude = ".*\\.py" +exclude = ".*.py" [tool.deptry.per_rule_ignores] DEP002 = ["meson"] From a346d98843527d9c0500c59d9faefaa11b7f88cd Mon Sep 17 00:00:00 2001 From: rjdbcm Date: Mon, 2 Dec 2024 23:25:29 -0600 Subject: [PATCH 3/3] fix wheel format --- ozi_build/_pyc_wheel.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ozi_build/_pyc_wheel.py b/ozi_build/_pyc_wheel.py index 4fe10c3..6145609 100644 --- a/ozi_build/_pyc_wheel.py +++ b/ozi_build/_pyc_wheel.py @@ -134,8 +134,7 @@ def convert_wheel( raise TypeError("File to convert must be a *.whl") if exclude: - exclude = re.compile(re.escape(exclude)) - print(exclude) + exclude = re.compile(exclude) dist_info = "-".join(whl_file.stem.split("-")[:-3])