From 8295dd4f4ab3f61ed0c2af3f270e46c979bc956d Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Fri, 6 Dec 2013 10:10:16 +0100 Subject: [PATCH] requirements: Fold http.txt into Mopidy-HTTP docs --- docs/ext/http.rst | 10 +++++++++- requirements/http.txt | 6 ------ 2 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 requirements/http.txt diff --git a/docs/ext/http.rst b/docs/ext/http.rst index ce79588e..d011a4b9 100644 --- a/docs/ext/http.rst +++ b/docs/ext/http.rst @@ -18,7 +18,15 @@ https://github.com/mopidy/mopidy/issues?labels=HTTP+frontend Dependencies ============ -.. literalinclude:: ../../requirements/http.txt +- cherrypy >= 3.2.2. Available as python-cherrypy3 in Debian/Ubuntu. + +- ws4py >= 0.2.3. Available as python-ws4py in newer Debian/Ubuntu and from + apt.mopidy.com for older releases of Debian/Ubuntu. + +If you're installing Mopidy with pip, you can run the following command to +install Mopidy with the extra dependencies for required for Mopidy-HTTP:: + + pip install --upgrade Mopidy[http] Default configuration diff --git a/requirements/http.txt b/requirements/http.txt deleted file mode 100644 index f38bfa3c..00000000 --- a/requirements/http.txt +++ /dev/null @@ -1,6 +0,0 @@ -cherrypy >= 3.2.2 -# Available as python-cherrypy3 in Debian/Ubuntu - -ws4py >= 0.2.3 -# Available as python-ws4py in newer Debian/Ubuntu and from apt.mopidy.com for -# older releases of Debian/Ubuntu