aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Sturmfels <ben@sturm.com.au>2021-09-23 16:36:20 +1000
committerBen Sturmfels <ben@sturm.com.au>2021-09-23 16:36:20 +1000
commit5bda90f8219a2b03d18f4762a2fd7e77ab91007c (patch)
tree18bb1e58e70ebc6f150cb7d5d5effbd325324ce2
parenta8334fa7d816a077446ebdbc646beb245fdcd347 (diff)
downloadmediagoblin-5bda90f8219a2b03d18f4762a2fd7e77ab91007c.tar.lz
mediagoblin-5bda90f8219a2b03d18f4762a2fd7e77ab91007c.tar.xz
mediagoblin-5bda90f8219a2b03d18f4762a2fd7e77ab91007c.zip
Update deploying docs to require Python 3.6+.
-rw-r--r--docs/source/siteadmin/deploying.rst9
-rw-r--r--docs/source/siteadmin/relnotes.rst1
2 files changed, 6 insertions, 4 deletions
diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 7f391660..37033efc 100644
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -56,11 +56,12 @@ Dependencies
MediaGoblin has the following core dependencies:
-- Python 3.4+
-- `python3-lxml <http://lxml.de/>`_
+- Python 3.6+
+- `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)
+- `SQLite <http://www.sqlite.org/>`_ or `PostgreSQL <http://www.postgresql.org/>`_
+- `Python Imaging Library <http://www.pythonware.com/products/pil/>`_
+ (PIL or Pillow)
- `virtualenv <http://www.virtualenv.org/>`_
- `Node.js <https://nodejs.org>`_
diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst
index ff7f9699..09513740 100644
--- a/docs/source/siteadmin/relnotes.rst
+++ b/docs/source/siteadmin/relnotes.rst
@@ -33,6 +33,7 @@ This chapter has important information about our current and previous releases.
- Fix incorrect setuptools install location for db/migrations/env.py (Elisei Roca)
- Set videos to preload="metadata" to prevent upfront download [trac#5625] (Michael McMahon)
- Add a "Troubleshooting" page to the documentation (Ben Sturmfels)
+- Add Ubuntu 20.04 CI build and reinstate Debian 10 CI build (Ben Sturmfels)
0.12.0