maturin 0.14.17__py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl → 0.15.1__py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl

maturin/__init__.py

@@ -8,21 +8,22 @@ On windows, apparently pip's subprocess handling sets stdout to some windows enc
 even though the terminal supports utf8. Writing directly to the binary stdout buffer avoids encoding errors due to
 maturin's emojis.
 """
+from __future__ import annotations
 
 import os
 import platform
 import shlex
 import shutil
+import struct
 import subprocess
 import sys
-import struct
 from subprocess import SubprocessError
-from typing import Dict
+from typing import Any, Dict, Mapping
 
 try:
     import tomllib
 except ModuleNotFoundError:
-    import tomli as tomllib
+    import tomli as tomllib  # type: ignore
 
 
 def get_config() -> Dict[str, str]:
@@ -31,12 +32,12 @@ def get_config() -> Dict[str, str]:
     return pyproject_toml.get("tool", {}).get("maturin", {})
 
 
-def get_maturin_pep517_args():
+def get_maturin_pep517_args() -> list[str]:
     args = shlex.split(os.getenv("MATURIN_PEP517_ARGS", ""))
     return args
 
 
-def _additional_pep517_args():
+def _additional_pep517_args() -> list[str]:
     # Support building for 32-bit Python on x64 Windows
     if platform.system().lower() == "windows" and platform.machine().lower() == "amd64":
         pointer_width = struct.calcsize("P") * 8
@@ -47,8 +48,11 @@ def _additional_pep517_args():
 
 # noinspection PyUnusedLocal
 def _build_wheel(
-    wheel_directory, config_settings=None, metadata_directory=None, editable=False
-):
+    wheel_directory: str,
+    config_settings: Mapping[str, Any] | None = None,
+    metadata_directory: str | None = None,
+    editable: bool = False,
+) -> str:
     # PEP 517 specifies that only `sys.executable` points to the correct
     # python interpreter
     command = [
@@ -86,12 +90,18 @@ def _build_wheel(
 
 
 # noinspection PyUnusedLocal
-def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
+def build_wheel(
+    wheel_directory: str,
+    config_settings: Mapping[str, Any] | None = None,
+    metadata_directory: str | None = None,
+) -> str:
     return _build_wheel(wheel_directory, config_settings, metadata_directory)
 
 
 # noinspection PyUnusedLocal
-def build_sdist(sdist_directory, config_settings=None):
+def build_sdist(
+    sdist_directory: str, config_settings: Mapping[str, Any] | None = None
+) -> str:
     command = ["maturin", "pep517", "write-sdist", "--sdist-directory", sdist_directory]
 
     print("Running `{}`".format(" ".join(command)))
@@ -109,7 +119,9 @@ def build_sdist(sdist_directory, config_settings=None):
 
 
 # noinspection PyUnusedLocal
-def get_requires_for_build_wheel(config_settings=None):
+def get_requires_for_build_wheel(
+    config_settings: Mapping[str, Any] | None = None
+) -> list[str]:
     if get_config().get("bindings") == "cffi":
         return ["cffi"]
     else:
@@ -117,7 +129,11 @@ def get_requires_for_build_wheel(config_settings=None):
 
 
 # noinspection PyUnusedLocal
-def build_editable(wheel_directory, config_settings=None, metadata_directory=None):
+def build_editable(
+    wheel_directory: str,
+    config_settings: Mapping[str, Any] | None = None,
+    metadata_directory: str | None = None,
+) -> str:
     return _build_wheel(
         wheel_directory, config_settings, metadata_directory, editable=True
     )
@@ -128,12 +144,16 @@ get_requires_for_build_editable = get_requires_for_build_wheel
 
 
 # noinspection PyUnusedLocal
-def get_requires_for_build_sdist(config_settings=None):
+def get_requires_for_build_sdist(
+    config_settings: Mapping[str, Any] | None = None
+) -> list:
     return []
 
 
 # noinspection PyUnusedLocal
-def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
+def prepare_metadata_for_build_wheel(
+    metadata_directory: str, config_settings: Mapping[str, Any] | None = None
+) -> str:
     print("Checking for Rust toolchain....")
     is_cargo_installed = False
     try:
@@ -171,13 +191,13 @@ def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
 
     print("Running `{}`".format(" ".join(command)))
     try:
-        output = subprocess.check_output(command)
+        _output = subprocess.check_output(command)
     except subprocess.CalledProcessError as e:
         sys.stderr.write(f"Error running maturin: {e}\n")
         sys.exit(1)
-    sys.stdout.buffer.write(output)
+    sys.stdout.buffer.write(_output)
     sys.stdout.flush()
-    output = output.decode(errors="replace")
+    output = _output.decode(errors="replace")
     return output.strip().splitlines()[-1]
 
 

maturin/__main__.py

@@ -1,17 +1,18 @@
+from __future__ import annotations
+
 import os
 import sys
 from pathlib import Path
 import sysconfig
-from typing import Optional
 
 
-def get_maturin_path() -> Optional[Path]:
+def get_maturin_path() -> Path | None:
     SCRIPT_NAME = "maturin"
 
-    def script_dir(scheme: str) -> Path:
+    def script_dir(scheme: str) -> str:
         return sysconfig.get_path("scripts", scheme)
 
-    def script_exists(dir: Path) -> bool:
+    def script_exists(dir: str) -> bool:
         for _, _, files in os.walk(dir):
             for f in files:
                 name, *_ = os.path.splitext(f)

maturin/import_hook.py

@@ -1,31 +1,39 @@
+from __future__ import annotations
+
 import contextlib
 import importlib
 import importlib.util
-from importlib import abc
-from importlib.machinery import ModuleSpec
 import os
 import pathlib
 import shutil
-import sys
 import subprocess
-from typing import Optional
+import sys
+from importlib import abc
+from importlib.machinery import ModuleSpec
+from types import ModuleType
+from typing import Sequence
 
 try:
     import tomllib
 except ModuleNotFoundError:
-    import tomli as tomllib
+    import tomli as tomllib  # type: ignore
 
 
 class Importer(abc.MetaPathFinder):
     """A meta-path importer for the maturin based packages"""
 
-    def __init__(self, bindings: Optional[str] = None, release: bool = False):
+    def __init__(self, bindings: str | None = None, release: bool = False):
         self.bindings = bindings
         self.release = release
 
-    def find_spec(self, fullname, path, target=None):
+    def find_spec(
+        self,
+        fullname: str,
+        path: Sequence[str | bytes] | None = None,
+        target: ModuleType | None = None,
+    ) -> ModuleSpec | None:
         if fullname in sys.modules:
-            return
+            return None
         mod_parts = fullname.split(".")
         module_name = mod_parts[-1]
 
@@ -51,17 +59,21 @@ class Importer(abc.MetaPathFinder):
             cargo_toml = project_dir / "Cargo.toml"
             return self._build_and_load(fullname, cargo_toml)
 
-    def _build_and_load(self, fullname: str, cargo_toml: pathlib.Path) -> ModuleSpec:
+        return None
+
+    def _build_and_load(
+        self, fullname: str, cargo_toml: pathlib.Path
+    ) -> ModuleSpec | None:
         build_module(cargo_toml, bindings=self.bindings)
         loader = Loader(fullname)
         return importlib.util.spec_from_loader(fullname, loader)
 
 
 class Loader(abc.Loader):
-    def __init__(self, fullname):
+    def __init__(self, fullname: str):
         self.fullname = fullname
 
-    def load_module(self, fullname):
+    def load_module(self, fullname: str) -> ModuleType:
         return importlib.import_module(self.fullname)
 
 
@@ -84,7 +96,7 @@ def generate_project(rust_file: pathlib.Path, bindings: str = "pyo3") -> pathlib
     if project_dir.exists():
         shutil.rmtree(project_dir)
 
-    command = ["maturin", "new", "-b", bindings, project_dir]
+    command: list[str] = ["maturin", "new", "-b", bindings, str(project_dir)]
     result = subprocess.run(command, stdout=subprocess.PIPE)
     if result.returncode != 0:
         sys.stderr.write(
@@ -101,9 +113,9 @@ def generate_project(rust_file: pathlib.Path, bindings: str = "pyo3") -> pathlib
 
 
 def build_module(
-    manifest_path: pathlib.Path, bindings: Optional[str] = None, release: bool = False
-):
-    command = ["maturin", "develop", "-m", manifest_path]
+    manifest_path: pathlib.Path, bindings: str | None = None, release: bool = False
+) -> None:
+    command = ["maturin", "develop", "-m", str(manifest_path)]
     if bindings:
         command.append("-b")
         command.append(bindings)
@@ -126,7 +138,7 @@ def _have_importer() -> bool:
     return False
 
 
-def install(bindings: Optional[str] = None, release: bool = False):
+def install(bindings: str | None = None, release: bool = False) -> Importer | None:
     """
     Install the import hook.
 
@@ -136,13 +148,13 @@ def install(bindings: Optional[str] = None, release: bool = False):
     :param release: Build in release mode, otherwise debug mode by default
     """
     if _have_importer():
-        return
+        return None
     importer = Importer(bindings=bindings, release=release)
     sys.meta_path.append(importer)
     return importer
 
 
-def uninstall(importer: Importer):
+def uninstall(importer: Importer) -> None:
     """
     Uninstall the import hook.
     """

{maturin-0.14.17.dist-info → maturin-0.15.1.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: maturin
-Version: 0.14.17
+Version: 0.15.1
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Dist: tomli >= 1.1.0 ; python_version < '3.11'
-Requires-Dist: ziglang ~= 0.10.0 ; extra == 'zig'
+Requires-Dist: tomli >=1.1.0 ; python_version < '3.11'
+Requires-Dist: ziglang ~=0.10.0 ; extra == 'zig'
 Requires-Dist: patchelf ; extra == 'patchelf'
 Provides-Extra: zig
 Provides-Extra: patchelf
@@ -16,7 +16,7 @@ Home-Page: https://github.com/pyo3/maturin
 Author: konstin <konstin@mailbox.org>, messense <messense@icloud.com>
 Author-email: konstin <konstin@mailbox.org>, messense <messense@icloud.com>
 License: MIT OR Apache-2.0
-Requires-Python: >= 3.7
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: Source Code, https://github.com/PyO3/maturin
 Project-URL: Issues, https://github.com/PyO3/maturin/issues
@@ -164,6 +164,7 @@ my-project
 ```
 
 > **Note**
+>
 > This structure is recommended to avoid [a common `ImportError` pitfall](https://github.com/PyO3/maturin/issues/490)
 
 maturin will add the native extension as a module in your python folder. When using develop, maturin will copy the native library and for cffi also the glue code to your python folder. You should add those files to your gitignore.
@@ -205,7 +206,7 @@ The keys are the script names while the values are the path to the function in t
 get_42 = "my_project:DummyClass.get_42"
 ```
 
-You can also specify [trove classifiers](https://pypi.org/classifiers/) in your Cargo.toml under `project.classifiers`:
+You can also specify [trove classifiers](https://pypi.org/classifiers/) in your `pyproject.toml` under `project.classifiers`:
 
 ```toml
 [project]

maturin-0.15.1.dist-info/RECORD

@@ -0,0 +1,7 @@
+maturin-0.15.1.dist-info/METADATA,sha256=TaFtxobvSBAvw7h6QJfyKWLWt-6bNura2O7aDs4UAE8,17753
+maturin-0.15.1.dist-info/WHEEL,sha256=lkEbBBNKltfxfYjmo9uuymhSBcX2U-86PF05Q_gj9fg,131
+maturin/__main__.py,sha256=hDlP-5HIi0cJ_glQYNPENWOtOb5Hh7TMDeCIos5mPX8,956
+maturin/__init__.py,sha256=PIXDyJHtVGdXe2OzmNYudC0s4Z1d7OIBv-yvq7sLiqs,6236
+maturin/import_hook.py,sha256=ZuSpyCxJ7j_vw2KW4SoyHWQeaxQDo8dl6XsN9BAUZWk,5162
+maturin-0.15.1.data/scripts/maturin,sha256=FdTb9Nb6a-fVyTtAt6b3jJP5UDFutL6kYP-juSYBb4E,31836808
+maturin-0.15.1.dist-info/RECORD,,

{maturin-0.14.17.dist-info → maturin-0.15.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.0.0-beta.7)
+Generator: maturin (1.0.0-beta.9)
 Root-Is-Purelib: false
 Tag: py3-none-manylinux_2_17_s390x.manylinux2014_s390x

maturin-0.14.17.dist-info/RECORD

@@ -1,7 +0,0 @@
-maturin-0.14.17.dist-info/METADATA,sha256=Qt0ksLm4_X4_E8UkadcD976rRJa6DPyKYqLgU98gLDs,17749
-maturin-0.14.17.dist-info/WHEEL,sha256=XCycZvuzWC9oXXMXG51hIWS3JAzD4EM_8Zsp5EhkNo8,131
-maturin/import_hook.py,sha256=yg1ffV6WFRncQ6iUXPFDFMscZkwE9E-BbqEvxRtUjYg,4835
-maturin/__init__.py,sha256=b6BRnt-3sJXjk9Leh9gOrM-tg4dLonFL-zz1d7Qg1Pg,5748
-maturin/__main__.py,sha256=5Drhx-fkJD3t8fT69IZhaQR12lSaZu81ck-oBbm6Uj0,953
-maturin-0.14.17.data/scripts/maturin,sha256=R1mSsPEe_hl4VOTXVxwTqGwPKigv7bexd_OfNrH5PL8,35842440
-maturin-0.14.17.dist-info/RECORD,,