From 53b68b1109b1032ac49ce035a692fa4d654c17d6 Mon Sep 17 00:00:00 2001 From: JeremyCCHsu Date: Mon, 20 Jan 2025 23:50:09 +0800 Subject: [PATCH 1/5] update ver. no. --- requirements.txt | 2 -- setup.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index c397591..679c45a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,2 @@ numpy -matplotlib argparse; python_version<"3.5" -soundfile diff --git a/setup.py b/setup.py index d60ce23..d3ede1a 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ from setuptools.command.build_ext import build_ext -_VERSION = '0.3.4' +_VERSION = '0.3.5' world_src_top = join("lib", "World", "src") From 27f9558063e8c49958c3c3bcb9c1371d7f172325 Mon Sep 17 00:00:00 2001 From: JeremyCCHsu Date: Mon, 20 Jan 2025 23:54:30 +0800 Subject: [PATCH 2/5] update contributor --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7eed13..d5702d1 100644 --- a/README.md +++ b/README.md @@ -142,4 +142,4 @@ You can install dependencies these by `pip install -r requirements.txt` ## Acknowledgement -Thank all contributors ([tats-u](https://github.com/tats-u), [wuaalb](https://github.com/wuaalb), [r9y9](https://github.com/r9y9), [rikrd](https://github.com/rikrd), [kudan2510](https://github.com/kundan2510)) for making this repo better and [sotelo](https://github.com/sotelo) whose [world.py](https://github.com/sotelo/world.py) inspired this repo.
+Thank all contributors ([tats-u](https://github.com/tats-u), [wuaalb](https://github.com/wuaalb), [r9y9](https://github.com/r9y9), [rikrd](https://github.com/rikrd), [kudan2510](https://github.com/kundan2510), [sabonerune](https://github.com/sabonerune)) for making this repo better and [sotelo](https://github.com/sotelo) whose [world.py](https://github.com/sotelo/world.py) inspired this repo.
From e17f3090d5848123b8782e1bbe81ec47ba2b5f19 Mon Sep 17 00:00:00 2001 From: JeremyCCHsu Date: Tue, 21 Jan 2025 00:21:33 +0800 Subject: [PATCH 3/5] remove dependency on pkg_resources --- pyworld/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pyworld/__init__.py b/pyworld/__init__.py index 73ba9e3..124ca31 100644 --- a/pyworld/__init__.py +++ b/pyworld/__init__.py @@ -7,11 +7,14 @@ For more information, see https://github.com/JeremyCCHsu/Python-Wrapper-for-World-Vocoder """ - from __future__ import division, print_function, absolute_import +import sys +if sys.version_info >= (3, 8): + from importlib.metadata import version +else: + from importlib_metadata import version -import pkg_resources +__version__ = version('pyworld') -__version__ = pkg_resources.get_distribution('pyworld').version from .pyworld import * From 6acd60c5f60891c70f1cd8cb49aebb1e50c69752 Mon Sep 17 00:00:00 2001 From: JeremyCCHsu Date: Tue, 21 Jan 2025 00:22:49 +0800 Subject: [PATCH 4/5] removing soundfile & matploblit dependency in setup.py requires adding them to appveyor --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 0fa3ee4..a28d9b9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -82,6 +82,7 @@ build_script: - pip install -e . test_script: + - pip install soundfile matplotlib - ps: | $ErrorActionPreference = "Stop" Set-Location "$env:APPVEYOR_BUILD_FOLDER\demo" From e1d1b761245be1cfb3e2b336d0961e56501b75ad Mon Sep 17 00:00:00 2001 From: JeremyCCHsu Date: Tue, 21 Jan 2025 10:04:03 +0800 Subject: [PATCH 5/5] version getter: use importlib for python 3.8+ and pkg_resources for earlier versions --- pyworld/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pyworld/__init__.py b/pyworld/__init__.py index 124ca31..d2c1211 100644 --- a/pyworld/__init__.py +++ b/pyworld/__init__.py @@ -11,10 +11,9 @@ import sys if sys.version_info >= (3, 8): from importlib.metadata import version + __version__ = version('pyworld') else: - from importlib_metadata import version - -__version__ = version('pyworld') - + import pkg_resources + __version__ = pkg_resources.get_distribution('pyworld').version from .pyworld import *