From 34d0a142539920b0f8b4835d534fcbfb3bdc36be Mon Sep 17 00:00:00 2001 From: Jason Cramer Date: Tue, 16 Nov 2021 09:48:14 -0500 Subject: [PATCH] Replace PySoundFile with SoundFile --- README.md | 4 ++-- docs/installation.rst | 9 +++------ setup.py | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 9ad518f..cd9647d 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Dependencies Currently, we support Python 3.6, 3.7, and 3.8. #### libsndfile (Linux only) -BirdVoxClassify depends on the PySoundFile module to load audio files, which itself depends on the non-Python library libsndfile. +BirdVoxClassify depends on the SoundFile module to load audio files, which itself depends on the non-Python library libsndfile. On Windows and Mac OS X, these will be installed automatically via the ``pip`` package manager and you can therefore skip this step. However, on Linux, `libsndfile` must be installed manually via your platform's package manager. For Debian-based distributions (such as Ubuntu), this can be done by simply running @@ -31,7 +31,7 @@ For Debian-based distributions (such as Ubuntu), this can be done by simply runn apt-get install libsndfile For more detailed information, please consult the -[installation instructions of pysoundfile](https://pysoundfile.readthedocs.io/en/0.9.0/#installation>). +[installation instructions of soundfile](https://pysoundfile.readthedocs.io/en/latest/#installation>). #### Note about TensorFlow: We have dropped support for Tensorflow 1.x, and have moved to Tensorflow 2.x. diff --git a/docs/installation.rst b/docs/installation.rst index 2d5658f..d8cb8e1 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -3,9 +3,6 @@ Installation instructions Dependencies ------------ -Python Versions -^^^^^^^^^^^^^^^ -Currently, we support Python 3.6 and Python 3.7. Python 3.8 is not currently supported since TensorFlow 1.x is not supported for Python 3.8. Python Versions ^^^^^^^^^^^^^^^ @@ -14,7 +11,7 @@ Currently, we support Python 3.6, 3.7, and 3.8. libsndfile (Linux only) ^^^^^^^^^^^^^^^^^^^^^^^ -BirdVoxClassify depends on the PySoundFile module to load audio files, +BirdVoxClassify depends on the SoundFile module to load audio files, which itself depends on the non-Python library libsndfile. On Windows and Mac OS X, these will be installed automatically via the ``pip`` package manager and you can therefore skip this step. However, on Linux, @@ -27,7 +24,7 @@ done by simply running apt-get install libsndfile For more detailed information, please consult the `installation -instructions of pysoundfile`_. +instructions of soundfile`_. Note about TensorFlow: @@ -62,5 +59,5 @@ To install the latest version of BirdVoxClassify from source: cd birdvoxclassify pip install -e . -.. _installation instructions of pysoundfile: https://pysoundfile.readthedocs.io/en/0.9.0/#installation%3E +.. _installation instructions of soundfile: https://pysoundfile.readthedocs.io/en/latest/#installation .. _BirdVoxDetect: https://github.com/BirdVox/birdvoxdetect diff --git a/setup.py b/setup.py index 6125e98..df250a3 100644 --- a/setup.py +++ b/setup.py @@ -115,7 +115,7 @@ 'librosa>=0.6.2', 'numpy>=1.13.0', 'scipy>=1.0.0', - 'PySoundFile>=0.9.0', + 'SoundFile>=0.9.0', 'resampy>=0.2.0', 'h5py>=2.7.0', 'pandas>=0.23',