4 files changed, 41 insertions(+), 18 deletions(-)

M configure.ac
M docs/source/siteadmin/relnotes.rst
M docs/source/siteadmin/upgrading.rst
M mediagoblin/_version.py

@@ 56,7 56,7 @@ dnl # * x.y.dev  - dev
 dnl
 dnl # see http://www.python.org/dev/peps/pep-0386/
 
-AC_INIT([mediagoblin], [0.11.dev], [mediagoblin-devel@gnu.org])
+AC_INIT([mediagoblin], [0.11.0], [mediagoblin-devel@gnu.org])
 
 
 dnl----

@@ 17,15 17,29 @@
 Release Notes
 =============
 
-This chapter has important information for releases in it.
-If you're upgrading from a previous release, please read it
-carefully, or at least skim over it.
+This chapter has important information about our current and previous releases.
 
 
+0.11.0
+======
+
+This release of MediaGoblin drops support for Python 2 and removes all Python 2
+compatibility code, significantly reducing the work of maintaining MediaGoblin
+going forward. Please see details about upgrading below.
+
+This release also reinstates audio spectrograms with a completely rewritten
+Python 3 replacement for the previous Python 2-only audio feature by Fernando
+Gutierrez.
 
-0.11.0 (work in progress)
-=========================
+**Upgrading:**
 
+For detailed instructions on installing or upgrading, see ":doc:`deploying`" and
+":doc:`upgrading`".
+
+If you have any problems, please drop in to the `#mediagoblin IRC chat
+<https://webchat.freenode.net/#mediagoblin>`_, report an issue on our `issue
+tracker <https://issues.mediagoblin.org/>`_ or drop us an email to
+`mediagoblin-devel@gnu.org <mailto:mediagoblin-devel@gnu.org>`_.
 
 **Improvements:**
 

@@ 27,19 27,28 @@ way if something goes wrong, we can fix things!
 And be sure to shut down your current MediaGoblin/Celery processes before
 upgrading!
 
+.. note::
+
+   Previous versions of the upgrade docs recommended ``./bootstrap.sh &&
+   ./configure && make`` without ``--system-site-packages``. This ignores any
+   system-wide Python modules and installs everything from the Python Package
+   Index. That's not strictly a problem, but is inconsistent with the
+   ":doc:`deploying`" instructions. If you have problems with dependencies, feel
+   free to revert to this approach.
+
 
 Upgrade (already on Python 3)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 1. Update to the latest release.  In your ``mediagoblin`` directory, run:
-   ``git fetch && git checkout -q v0.10.0 && git submodule update``
+   ``git fetch && git checkout -q v0.11.0 && git submodule update``
 2. Remove your existing installation:
-   ``rm -rf bin include lib lib64 node_modules``
+   ``make distclean``
 3. Install MediaGoblin:
-   ``./bootstrap.sh && ./configure && make``
+   ``./bootstrap.sh && VIRTUALENV_FLAGS='--system-site-packages' ./configure && make``
 4. Update the database:
    ``./bin/gmg dbupdate``
-5. Restart MediaGoblin
+5. Restart the Paster and Celery processes
 
 
 Upgrade (upgrading to Python 3)


@@ 48,14 57,14 @@ Upgrade (upgrading to Python 3)
 1. Refer to the "Dependences" and "Configure PostgreSQL" sections of
    ":doc:`deploying`" to install the necessary Python 3 dependencies.
 2. Update to the latest release.  In your ``mediagoblin`` directory, run:
-   ``git fetch && git checkout -q stable && git submodule update``
+   ``git fetch && git checkout -q v0.11.0 && git submodule update``
 3. Remove your existing installation:
-   ``rm -rf bin include lib lib64 node_modules``
+   ``make distclean``
 4. Install MediaGoblin:
-   ``./bootstrap.sh && ./configure && make``
+   ``./bootstrap.sh && VIRTUALENV_FLAGS='--system-site-packages' ./configure && make``
 5. Update the database:
    ``./bin/gmg dbupdate``
-6. Restart MediaGoblin
+6. Restart the Paster and Celery processes
 
 
 Updating your system Python


@@ 66,9 75,9 @@ Python may break MediaGoblin. This typically occurs because Python virtual
 environment is referring to a copy of Python that no longer exists. To fix this:
 
 1. In your ``mediagoblin`` directory, remove your existing installation:
-   ``rm -rf bin include lib lib64 node_modules``
+   ``make disclean``
 2. Install MediaGoblin:
-   ``./bootstrap.sh && ./configure && make``
+   ``./bootstrap.sh && VIRTUALENV_FLAGS='--system-site-packages' ./configure && make``
 3. Update the database:
    ``./bin/gmg dbupdate``
-4. Restart MediaGoblin
+4. Restart the Paster and Celery processes

@@ 23,4 23,4 @@
 
 # see http://www.python.org/dev/peps/pep-0386/
 
-__version__ = "0.11.dev"
+__version__ = "0.11.0"