diff options
Diffstat (limited to 'docs/source')
| -rw-r--r-- | docs/source/siteadmin/deploying.rst | 24 | ||||
| -rw-r--r-- | docs/source/siteadmin/media-types.rst | 10 |
2 files changed, 17 insertions, 17 deletions
diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst index 60ec2dce..d5a7fe69 100644 --- a/docs/source/siteadmin/deploying.rst +++ b/docs/source/siteadmin/deploying.rst @@ -58,7 +58,7 @@ Dependencies MediaGoblin has the following core dependencies: - Python 2.7 or Python 3.4+ -- `python-lxml <http://lxml.de/>`_ +- `python3-lxml <http://lxml.de/>`_ - `git <http://git-scm.com/>`_ - `SQLite <http://www.sqlite.org/>`_/`PostgreSQL <http://www.postgresql.org/>`_ - `Python Imaging Library <http://www.pythonware.com/products/pil/>`_ (PIL) @@ -68,19 +68,19 @@ MediaGoblin has the following core dependencies: On a DEB-based system (e.g Debian, gNewSense, Trisquel, \*buntu, and derivatives) issue the following command:: - sudo apt-get install git-core python python-dev python-lxml \ - python-imaging python-virtualenv npm nodejs-legacy automake \ + sudo apt-get install git-core python python3-dev python3-lxml \ + python3-imaging python3-virtualenv npm nodejs-legacy automake \ nginx rabbitmq-server On a RPM-based system (e.g. Fedora, RedHat, and derivatives) issue the following command:: - sudo yum install python-paste-deploy python-paste-script \ - git-core python python-devel python-lxml python-imaging \ - python-virtualenv npm automake nginx rabbitmq-server + sudo yum install python3-paste-deploy python3-paste-script \ + git-core python python3-devel python3-lxml python3-imaging \ + python3-virtualenv npm automake nginx rabbitmq-server -(Note: MediaGoblin now officially supports Python 3. You may instead -substitute from "python" to "python3" for most package names in the +(Note: MediaGoblin now uses Python 3 by default. To use Python 2, you may instead +substitute from "python3" to "python" for most package names in the Debian instructions and this should cover dependency installation. These instructions have not yet been tested on Fedora.) @@ -103,11 +103,11 @@ Configure PostgreSQL These are the packages needed for Debian Jessie (stable):: - sudo apt-get install postgresql postgresql-client python-psycopg2 + sudo apt-get install postgresql postgresql-client python3-psycopg2 These are the packages needed for an RPM-based system:: - sudo yum install postgresql postgresql-server python-psycopg2 + sudo yum install postgresql postgresql-server python3-psycopg2 An rpm-based system also requires that you initialize and start the PostgreSQL database with a few commands. The following commands are @@ -256,8 +256,8 @@ Set up the hacking environment:: $ ./bootstrap.sh && ./configure && make -(Note that if you'd prefer to run MediaGoblin with Python 3, pass in -`--with-python3` to the `./configure` command.) +(Note that if you'd prefer to run MediaGoblin with Python 2, pass in +`--without-python3` to the `./configure` command.) Create and set the proper permissions on the ``user_dev`` directory. This directory will be used to store uploaded media files:: diff --git a/docs/source/siteadmin/media-types.rst b/docs/source/siteadmin/media-types.rst index 57d967eb..2e21c340 100644 --- a/docs/source/siteadmin/media-types.rst +++ b/docs/source/siteadmin/media-types.rst @@ -84,7 +84,7 @@ good/bad/ugly). On Debianoid systems .. code-block:: bash - sudo apt-get install python-gi python3-gi \ + sudo apt-get install python3-gi \ gstreamer1.0-tools \ gir1.2-gstreamer-1.0 \ gir1.2-gst-plugins-base-1.0 \ @@ -92,7 +92,7 @@ good/bad/ugly). On Debianoid systems gstreamer1.0-plugins-ugly \ gstreamer1.0-plugins-bad \ gstreamer1.0-libav \ - python-gst-1.0 + python3-gst-1.0 Add ``[[mediagoblin.media_types.video]]`` under the ``[plugins]`` section in @@ -123,8 +123,8 @@ as whatever GStreamer plugins you want, good/bad/ugly), SciPy and NumPy are also needed for the audio spectrograms. To install these on Debianoid systems, run:: - sudo apt-get install python-gst-1.0 gstreamer1.0-plugins-{base,bad,good,ugly} \ - gstreamer1.0-libav python-numpy python-scipy libsndfile1-dev libasound2-dev + sudo apt-get install python3-gst-1.0 gstreamer1.0-plugins-{base,bad,good,ugly} \ + gstreamer1.0-libav python3-numpy python3-scipy libsndfile1-dev libasound2-dev .. note:: scikits.audiolab will display a warning every time it's imported if you do @@ -160,7 +160,7 @@ To enable raw image you need to install pyexiv2. On Debianoid systems .. code-block:: bash - sudo apt-get install python-pyexiv2 + sudo apt-get install python3-pyexiv2 Add ``[[mediagoblin.media_types.raw_image]]`` under the ``[plugins]`` section in your ``mediagoblin.ini`` and restart MediaGoblin. |