From 5f1acbebaaeeb0370d786240ca64ceef0dc5efcf Mon Sep 17 00:00:00 2001 From: huangyuxin Date: Tue, 15 Mar 2022 09:54:46 +0000 Subject: [PATCH 1/2] fix setup.py for paddleaudio --- paddleaudio/paddleaudio/__init__.py | 7 ------- paddleaudio/setup.py | 16 +++++++--------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/paddleaudio/paddleaudio/__init__.py b/paddleaudio/paddleaudio/__init__.py index 6184c1dd..2dab610c 100644 --- a/paddleaudio/paddleaudio/__init__.py +++ b/paddleaudio/paddleaudio/__init__.py @@ -11,12 +11,5 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from . import compliance -from . import datasets -from . import features -from . import functional -from . import io -from . import metric -from . import sox_effects from .backends import load from .backends import save diff --git a/paddleaudio/setup.py b/paddleaudio/setup.py index b0ccd2eb..6c757d33 100644 --- a/paddleaudio/setup.py +++ b/paddleaudio/setup.py @@ -49,10 +49,6 @@ class InstallCommand(install): def write_version_py(filename='paddleaudio/__init__.py'): - import paddleaudio - if hasattr(paddleaudio, - "__version__") and paddleaudio.__version__ == VERSION: - return with open(filename, "a") as f: f.write(f"__version__ = '{VERSION}'") @@ -65,7 +61,7 @@ def remove_version_py(filename='paddleaudio/__init__.py'): if "__version__" not in line: f.write(line) - +remove_version_py() write_version_py() setuptools.setup( @@ -93,10 +89,12 @@ setuptools.setup( 'dtaidistance >= 2.3.6', 'mcd >= 0.4', ], - setup_requires=[ - 'nose', 'librosa==0.8.1', 'soundfile==0.10.3.post1', - 'torchaudio==0.10.2', 'pytest-benchmark' - ], + extras_require={ + 'test': [ + 'nose', 'librosa==0.8.1', 'soundfile==0.10.3.post1', + 'torchaudio==0.10.2', 'pytest-benchmark' + ], + }, cmdclass={ 'install': InstallCommand, 'test': TestCommand, From cacbab8f07e35cbb0a1365dc65f0a2f4a5b90c9b Mon Sep 17 00:00:00 2001 From: huangyuxin Date: Tue, 15 Mar 2022 11:35:15 +0000 Subject: [PATCH 2/2] reset __init__.py, test=audio --- paddleaudio/paddleaudio/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/paddleaudio/paddleaudio/__init__.py b/paddleaudio/paddleaudio/__init__.py index 2dab610c..6184c1dd 100644 --- a/paddleaudio/paddleaudio/__init__.py +++ b/paddleaudio/paddleaudio/__init__.py @@ -11,5 +11,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +from . import compliance +from . import datasets +from . import features +from . import functional +from . import io +from . import metric +from . import sox_effects from .backends import load from .backends import save