From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sat, 20 Feb 2016 20:44:42 +0000 (-0800)
Subject: Basic explaination of how to deploy with Python 3.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e2212f944b113467faa7a8030c63ce75905a7bb7;p=mediagoblin.git

Basic explaination of how to deploy with Python 3.

Could be better, but "works" for now.
---

diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index b4d89e94..47901da9 100644
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -57,7 +57,7 @@ Dependencies
 
 MediaGoblin has the following core dependencies:
 
-- Python 2.7
+- Python 2.7 or Python 3.4+
 - `python-lxml <http://lxml.de/>`_
 - `git <http://git-scm.com/>`_
 - `SQLite <http://www.sqlite.org/>`_/`PostgreSQL <http://www.postgresql.org/>`_
@@ -79,6 +79,11 @@ following command::
         git-core python python-devel python-lxml python-imaging \
         python-virtualenv npm automake nginx
 
+(Note: MediaGoblin now officially supports Python 3.  You may instead
+substitute from "python" to "python3" for most package names in the
+Debian instructions and this should cover dependency installation.
+These instructions have not yet been tested on Fedora.)
+
 Configure PostgreSQL
 ~~~~~~~~~~~~~~~~~~~~
 
@@ -246,6 +251,9 @@ 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.)
+
 Create and set the proper permissions on the ``user_dev`` directory.
 This directory will be used to store uploaded media files::