From f79f8c36f3eb9507957b44521553cd7902a63ec4 Mon Sep 17 00:00:00 2001 From: Aiden Nibali Date: Sun, 17 Mar 2024 19:59:04 +1100 Subject: [PATCH] Minor changes --- .gitignore | 1 + pdm.lock | 2 +- pyproject.toml | 2 +- webp/__init__.py | 8 ++++---- webp_build/builder.py | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e74c99c..4e935ca 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ core /.eggs/ /conan_output/ *.so +/.envrc diff --git a/pdm.lock b/pdm.lock index 5e8f194..32ea3d5 100644 --- a/pdm.lock +++ b/pdm.lock @@ -6,7 +6,7 @@ groups = ["default", "dev", "test"] cross_platform = true static_urls = false lock_version = "4.3" -content_hash = "sha256:feca6d795895307710f5c9d8874ffb4ddea92b13975b9d1f5adea58bad93963d" +content_hash = "sha256:c51cbc0872cb8574a77ec966838f93f144a831bc3fa127829ad1647a98afcd63" [[package]] name = "annotated-types" diff --git a/pyproject.toml b/pyproject.toml index 65f8419..b492f0e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ Homepage = "https://github.com/anibali/pywebp" [build-system] requires = [ - "cffi>=1.0.0", + "cffi>=1.12", "conan>=2.0", "setuptools>=45", "wheel", diff --git a/webp/__init__.py b/webp/__init__.py index 53d0484..44a0ada 100644 --- a/webp/__init__.py +++ b/webp/__init__.py @@ -552,10 +552,10 @@ def imread(file_path: str, *args: Any, pilmode: str = 'RGBA') -> "np.ndarray[Any def _mimwrite_pics( - file_path: str, - pics: List[WebPPicture], - *args: Any, - fps: float = 30.0, + file_path: str, + pics: List[WebPPicture], + *args: Any, + fps: float = 30.0, **kwargs: Any ) -> None: enc_opts = WebPAnimEncoderOptions.new() diff --git a/webp_build/builder.py b/webp_build/builder.py index dd2744a..877d4da 100644 --- a/webp_build/builder.py +++ b/webp_build/builder.py @@ -81,7 +81,7 @@ def install_libwebp(arch: str) -> Dict[Any, Any]: conan_output = os.path.join('conan_output', arch) result = subprocess.run([ - 'conan', 'install', + 'conan', 'install', *[x for s in settings for x in ('-s', s)], *[x for b in build for x in ('-b', b)], '-of', conan_output, '--deployer=direct_deploy', '--format=json', '.'