diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 4347e6d..49af3a7 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -46,7 +46,7 @@ jobs: - name: Test with pytest run: | python -m pip install pytest==7.2.1 - pytest tests/ + pytest --import-mode=importlib tests/ build-wheels: name: Build ${{ matrix.cibw_build }} wheels @@ -146,7 +146,7 @@ jobs: CIBW_ENVIRONMENT: PYWEBP_COMPILE_TARGET=${{ matrix.compile_target }} CIBW_PROJECT_REQUIRES_PYTHON: '>=3.8' CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: pytest {package}/tests + CIBW_TEST_COMMAND: pytest --import-mode=importlib {package}/tests - name: abi3audit run: | pip install abi3audit && diff --git a/webp/__init__.py b/webp/__init__.py index 44a0ada..ff7783d 100644 --- a/webp/__init__.py +++ b/webp/__init__.py @@ -4,7 +4,7 @@ from PIL import Image from typing import Any, Generator, List, Optional, Tuple -from _webp import ffi, lib +from webp._webp import ffi, lib class WebPPreset(Enum): DEFAULT: int = lib.WEBP_PRESET_DEFAULT # Default diff --git a/webp_build/builder.py b/webp_build/builder.py index 877d4da..5da7b51 100644 --- a/webp_build/builder.py +++ b/webp_build/builder.py @@ -149,7 +149,7 @@ def create_ffibuilder(): # Specify C sources to be built by CFFI ffibuilder = FFI() ffibuilder.set_source( - '_webp', + 'webp._webp', read_text(webp_build, 'source.c'), extra_objects=cffi_settings['extra_objects'], extra_compile_args=cffi_settings['extra_compile_args'],