From 6a5c64dcd226cd15b70948fc742f77e8ba1c7eee Mon Sep 17 00:00:00 2001 From: Bastian Bechtold Date: Fri, 10 Apr 2015 16:00:23 +0200 Subject: [PATCH 1/2] updated installation instructions for wheels --- README.rst | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/README.rst b/README.rst index 150d425..533ee5b 100644 --- a/README.rst +++ b/README.rst @@ -43,30 +43,18 @@ PySoundFile depends on the Python packages CFFI and Numpy, and the system library libsndfile. To install the Python dependencies, I recommend using the `Anaconda -`__ Distribution of Python. Anaconda -provides the ``conda`` package manager, which will install all -dependencies using ``conda install cffi numpy`` (conda is also -independently available on pip). - -You will also need to install `libsndfile -`__. On Windows, libsndfile is -included in the binary installers (see below). On OS X, `homebrew -`__ can install libsndfile using -``brew install libsndfile``. On Linux, use your distribution's package -manager, for example ``sudo apt-get install libsndfile``. - -With CFFI, Numpy, and libsndfile installed, you can use `pip -`__ to install -`PySoundFile `__ with -``pip install pysoundfile`` or ``pip install pysoundfile --user`` if you -don't have administrator privileges. If you are running Windows you -should download the Windows installers for PySoundFile instead (which -also include libsndfile): - -| `PySoundFile-0.6.0.win-amd64-py2.7 `__ -| `PySoundFile-0.6.0.win-amd64-py3.4 `__ -| `PySoundFile-0.6.0.win32-py2.7 `__ -| `PySoundFile-0.6.0.win32-py3.4 `__ +`__ Distribution of Python. This +will come with all dependencies pre-installed. To install them +manually, you can use the ``conda`` package manager, which will +install all dependencies using ``conda install cffi numpy`` (conda is +also available independently of Anaconda with ``pip install conda; +conda init``). + +With CFFI and Numpy installed, you can use ``pip install pysoundfile`` +to download and install the latest version of PySoundFile. On Windows +and OS X, this will also install the library libsndfile. On Linux, you +need to install libsndfile using your distribution's package manager, +for example ``sudo apt-get install libsndfile``. Read/Write Functions -------------------- From 88916e591c89624dab6dc2121bf2ddb325261151 Mon Sep 17 00:00:00 2001 From: Bastian Bechtold Date: Sun, 12 Apr 2015 12:59:09 +0200 Subject: [PATCH 2/2] improved wording --- README.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 533ee5b..6b57c51 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ PySoundFile =========== `PySoundFile `__ is an audio -library based on libsndfile, CFFI and Numpy. Full documentation is +library based on libsndfile, CFFI and NumPy. Full documentation is available on http://pysoundfile.readthedocs.org/. PySoundFile can read and write sound files. File reading/writing is @@ -39,22 +39,22 @@ might be removed in the future. Installation ------------ -PySoundFile depends on the Python packages CFFI and Numpy, and the +PySoundFile depends on the Python packages CFFI and NumPy, and the system library libsndfile. To install the Python dependencies, I recommend using the `Anaconda -`__ Distribution of Python. This -will come with all dependencies pre-installed. To install them +`__ distribution of Python 3. This will +come with all dependencies pre-installed. To install the dependencies manually, you can use the ``conda`` package manager, which will install all dependencies using ``conda install cffi numpy`` (conda is also available independently of Anaconda with ``pip install conda; conda init``). -With CFFI and Numpy installed, you can use ``pip install pysoundfile`` -to download and install the latest version of PySoundFile. On Windows +With CFFI and NumPy installed, you can use ``pip install pysoundfile`` +to download and install the latest release of PySoundFile. On Windows and OS X, this will also install the library libsndfile. On Linux, you need to install libsndfile using your distribution's package manager, -for example ``sudo apt-get install libsndfile``. +for example ``sudo apt-get install libsndfile1``. Read/Write Functions --------------------