Drop Python 2 installation support.

This commit is contained in:
Ben Sturmfels
2021-03-03 21:40:10 +11:00
parent c5a4eb8da8
commit 83429a8658
8 changed files with 9 additions and 228 deletions

View File

@@ -56,7 +56,7 @@ Dependencies
MediaGoblin has the following core dependencies:
- Python 3.4+ (Python 2.7 is supported, but not recommended)
- Python 3.4+
- `python3-lxml <http://lxml.de/>`_
- `git <http://git-scm.com/>`_
- `SQLite <http://www.sqlite.org/>`_/`PostgreSQL <http://www.postgresql.org/>`_
@@ -82,13 +82,6 @@ Issue the following commands:
sudo dnf install automake gcc git-core make nodejs npm python3-devel \
python3-lxml python3-pillow virtualenv
.. 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. Python 2 installation has not been tested on Fedora.
For a production deployment, you'll also need Nginx as frontend web
server and RabbitMQ to store the media processing queue::
@@ -265,11 +258,6 @@ Set up the environment::
$ VIRTUALENV_FLAGS='--system-site-packages' ./configure
$ make
.. note::
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::

View File

@@ -29,10 +29,12 @@ carefully, or at least skim over it.
**Improvements:**
- Drop Python 2 installation support (Ben Sturmfels)
**Bug fixes:**
- Make LDAP plugin Python 3 compatible [#5607] (Olivier Mehani)
- Pin a compatible version of WTForms (milquetoast)
0.10.0

View File

@@ -58,20 +58,6 @@ Upgrade (upgrading to Python 3)
6. Restart MediaGoblin
Upgrade (remaining on Python 2 - not recommended)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1. Update to the latest release. In your ``mediagoblin`` directory, run:
``git fetch && git checkout -q stable && git submodule update``
2. Remove your existing installation:
``rm -rf bin include lib lib64 node_modules``
3. Install MediaGoblin:
``./bootstrap.sh && ./configure --without-python3 && make``
4. Update the database:
``./bin/gmg dbupdate``
5. Restart MediaGoblin
Updating your system Python
---------------------------