commit ac99c07020b914789df872c97ba8ffafdcf39720
parent 27035df71b63084874bf81a0518bd5c87eb509b6
Author: CarlSouthall <[email protected]>
Date: Wed, 3 Aug 2016 12:04:45 +0100
1.1
Diffstat:
2 files changed, 18 insertions(+), 40 deletions(-)
diff --git a/install.md b/install.md
@@ -4,55 +4,33 @@ This page contains information regarding installing ADTLib. It is suggested to i
easy_install pip
-Then install the automated drum transcription libarary using the following
-
- pip install ADTLib
-
-To update the libary use
-
- pip install --upgrade ADTlib
-
-This should install all of the extra required packages. If errors occur, try installing each package one by one as demonstrated below.
-
#### Required packages.
+ADTLib requires the following packages to already be installed.
+
• [numpy](https://www.numpy.org)
• [scipy](https://www.scipy.org)
• [cython](https://www.cython.org)
• [madmom](https://github.com/CPJKU/madmom)
• [tensorflow](https://www.tensorflow.org/)
-To install numpy
+If these are already installed install ADTLib using the following
- pip install numpy
+ pip install ADTLib
-To install scipy
-
- pip install scipy
-
-To install cython
+To update the libary use
- pip install cython
-
-To install madmom
-
- pip install madmom
+ pip install --upgrade ADTlib
-madmom requires [nose](http://nose.readthedocs.io/en/latest/) in addition to the above packages, if this does not automatically install with madmom use.
- pip install nose
-
-Although you can use
+If you do not already have the required packages the easiest way to install them all is to first install tensorflow using the instructions on the tensorflow github:
- pip install tensorflow
-
-to install tensorflow, problems sometimes occur. It is suggested to install tensorflow using the instructions on the tensorflow github https://github.com/tensorflow/tensorflow/blob/master/tensorflow/g3doc/get_started/os_setup.md
+https://github.com/tensorflow/tensorflow/blob/master/tensorflow/g3doc/get_started/os_setup.md
-Once you have installed all of those dependencies you can install ADTLib using pip as demonstrated at the top of this page.
-
-
+Then install ADTLib using the command above and all other dependencies should install.
-
-
+If problems occur try installing each package one by one using:
+
+ pip install <package_name>
diff --git a/setup.py b/setup.py
@@ -7,15 +7,15 @@ scripts = glob.glob('bin/*')
setup(
name = 'ADTLib',
- packages=find_packages(exclude=[]), # this must be the same as the name above
- version = '1.0',
+ packages=find_packages(exclude=[]),
+ version = '1.1',
description = 'Automated Drum Trancription Libray',
author = 'Carl Southall',
author_email = '[email protected]',
license='BSD',
- url = 'https://github.com/CarlSouthall/ADTLib', # use the URL to the github repo
- download_url = 'https://github.com/CarlSouthall/ADTLib', # I'll explain this in a second
- keywords = ['testing', 'logging', 'example'], # arbitrary keywords
+ url = 'https://github.com/CarlSouthall/ADTLib',
+ download_url = 'https://github.com/CarlSouthall/ADTLib',
+ keywords = ['Drums', 'Transcription', 'Automated'],
classifiers = ['Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
@@ -25,6 +25,6 @@ setup(
'Programming Language :: Python :: 3.4',],
scripts=scripts,
- install_requires=['numpy','scipy','cython','madmom','tensorflow'],
+ install_requires=['numpy','scipy','cython','madmom'],
package_data={'ADTLib': package_data},
)
