diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4449461..9e759e65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -115,10 +115,11 @@ jobs: uses: docker/setup-qemu-action@v3 - name: Build wheels - uses: pypa/cibuildwheel@v2.11.2 + uses: pypa/cibuildwheel@v2.23.3 with: package-dir: bindings/python output-dir: wheelhouse + env: # ---- Build selection ---- # Linux/Windows: Python 3.10, 3.11, 3.12 @@ -135,8 +136,6 @@ jobs: CIBW_ENVIRONMENT_LINUX: | TOKENIZER_ROOT=/project/build/install ICU_ROOT=/project/icu - CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 # ---- macOS ---- CIBW_BEFORE_ALL_MACOS: bindings/python/tools/prepare_build_environment_macos.sh diff --git a/bindings/python/pyonmttok/__init__.py b/bindings/python/pyonmttok/__init__.py index 70157fef..19c88c5c 100644 --- a/bindings/python/pyonmttok/__init__.py +++ b/bindings/python/pyonmttok/__init__.py @@ -4,11 +4,10 @@ import ctypes import glob import os + from importlib import resources - import pkg_resources - - module_name = sys.modules[__name__].__name__ - package_dir = pkg_resources.resource_filename(module_name, "") + # Get the package directory safely (no setuptools) + package_dir = str(resources.files(__package__)) add_dll_directory = getattr(os, "add_dll_directory", None) if add_dll_directory is not None: @@ -16,7 +15,7 @@ for library in glob.glob(os.path.join(package_dir, "*.dll")): ctypes.CDLL(library) - +# isort: off from pyonmttok._ext import ( BPELearner, Casing, @@ -31,6 +30,8 @@ is_valid_language, set_random_seed, ) + +# isort: on from pyonmttok.version import __version__ diff --git a/bindings/python/pyonmttok/version.py b/bindings/python/pyonmttok/version.py index 46362d72..7b416e3a 100644 --- a/bindings/python/pyonmttok/version.py +++ b/bindings/python/pyonmttok/version.py @@ -1,3 +1,3 @@ """Version information.""" -__version__ = "1.38.0" +__version__ = "1.38.1" diff --git a/bindings/python/pyproject.toml b/bindings/python/pyproject.toml index 7e40d19c..6e4c5f86 100644 --- a/bindings/python/pyproject.toml +++ b/bindings/python/pyproject.toml @@ -5,4 +5,5 @@ requires = [ "pybind11>=2.10.4" ] build-backend = "setuptools.build_meta" - +[tool.isort] +profile = "black" diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 1ac44c94..ef769db1 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -2,7 +2,6 @@ import sys import pybind11 - from setuptools import Extension, find_packages, setup include_dirs = [pybind11.get_include()] diff --git a/bindings/python/test/test.py b/bindings/python/test/test.py index 6485babf..66c1bbea 100644 --- a/bindings/python/test/test.py +++ b/bindings/python/test/test.py @@ -1,11 +1,11 @@ +# isort: off import copy import itertools import os import pickle -import pytest - import pyonmttok +import pytest _DATA_DIR = os.path.join( os.path.dirname(os.path.abspath(__file__)), "..", "..", "..", "test", "data"