Merge branch 'python3-testing' of github.com:pyrocko/pyrocko into pyt…

…hon3-testing

doc/source/apps/jackseis/index.rst

@@ -4,7 +4,7 @@ Jackseis
 .. highlight:: sh
 
 Jackseis is a simple tool to convert seismic waveform archive datasets. It can
-be used to downsample, rename meta-data, to cut out time windows, to convert
+be used to downsample, to rename meta-data, to cut out time windows, to convert
 between different file formats, and to convert the sample data types.
 
 Synopsis

doc/source/install/upgrade.rst

@@ -4,69 +4,51 @@ Upgrading Pyrocko from v0.3 to v2017.11 or later
 This document describes details of the upgrade from Pyrocko version **v0.3** to
 **v2017.11** or later. Starting with v2017.11,  **Pyrocko supports Python 3**.
 
-With the upgrade the module hierarchy changed (see :doc:`../library/index`) -
-The API is backwards-compatible so your old scripts still work. Under Python 2,
-upgrading the framework requires purging of the old v0.3 version and installing
-some new dependencies.
+With the version jump, Pyrocko's internal module hierarchy
+has changed (see :doc:`../library/index`) - The API is backwards-compatible so
+your old scripts still work. **Under Python 2, upgrading the framework requires
+purging of the old v0.3 version and installing some new dependencies**. Pyrocko
+will continue to work under Python 2.
 
 
 Python 3
 --------
 
-Nothing special need to be considered when you want to start working with Python 3.
+Nothing special has to be considered if you want to start working with Python 3.
 Simply do a fresh install of Pyrocko as described in :doc:`index`.
 
 Python 2
 --------
 
-If you have previously installed Pyrocko in an older version on Python 2,
+If you have previously installed Pyrocko in an older version under Python 2,
 please follow the steps below for a clean new installation.
 
 Anaconda2
 .........
 
-.. note::
-    Prebuilt Pyrocko packages for Anaconda3 are available from version 2017.11!
-
-Only if you built Pyrocko v0.3 for Anaconda2 you have to purge the old installation:
+If you have installed Pyrocko v0.3 under Anaconda2 you have to purge the
+old installation:
 
 .. code-block:: bash
-    :caption: Upgrade on Anaconda2
 
     conda remove --all pyrocko
 
-Then follow the install instructions here :doc:`packages/anaconda`.
+Then follow the instructions in :doc:`packages/anaconda`.
 
 Ubuntu, Debian, Mint, ...
 .........................
 
-The ``setup.py`` installer identifies earlier installations of Pyrocko, if
-there is a conflict you have to delete the old pyrocko directory and upgrade
-the dependencies:
-
-.. code-block:: bash
-    :caption: We have to install new dependencies
-
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/pyrocko*
-
-    # Upgrade to PyQt5 and other depedencies
-    sudo apt-get install -y python-requests python-pyqt5 python-future
-    sudo apt-get install -y python-pyqt5 python-pyqt5.qtopengl python-pyqt5.qtsvg
-    sudo apt-get install -y python-pyqt5.qtwebengine || sudo apt-get install -y python-pyqt5.qtwebkit
-
-    # Clean GitHub clone
-    cd src
-    rm -rf pyrocko
-    git clone https://github.com/pyrocko/pyrocko.git
-    cd pyrocko
-    sudo setup.py install
+Following the steps described in :doc:`system/deb` will **install the new
+dependencies**.
 
-More information here :doc:`system/deb` or :doc:`packages/pip`.
+Pyrocko's ``setup.py`` installer recognizes earlier installations of Pyrocko.
+If there is a conflict it will tell you how to **purge your old installation**
+when you try to run ``python setup.py install``.
 
 Mac OS X with MacPorts
 ......................
 
-If you had Pyrocko v0.3 installed throug MacPorts you have to delete that
+If you had Pyrocko v0.3 installed through MacPorts you have to delete that
 installation:
 
 .. code-block:: bash

doc/source/overview.rst

@@ -12,13 +12,13 @@ written in the Python programming language, a few parts are written in C.
 It can be used as a framework for own developments but also contains a few
 standalone tools for everyday seismological practice:
 
-* Snuffler: an extensible seismogram browser and workbench
-* Cake: travel-time and ray-path computations for 1D layered earthmodels
-* Fomosto: a tool to manage pre-calculated Green's function stores
-* Jackseis: a command-line tool for common waveform archive data manipulations
+* :doc:`apps/snuffler/index`: an extensible seismogram browser and workbench
+* :doc:`apps/cake/index`: travel-time and ray-path computations for 1D layered earthmodels
+* :doc:`apps/fomosto/index`: a tool to manage pre-calculated Green's function stores
+* :doc:`apps/jackseis/index`: a command-line tool for common waveform archive data manipulations
 
 To download the software or if you wish to contribute, please use the `Pyrocko
 project page on GitHub <https://github.com/pyrocko/pyrocko>`_. If you want to
 file a bug report or need help, please use the `GitHub issues page
-<https://github.com/pyrocko/pyrocko/issues>`_.
-
+<https://github.com/pyrocko/pyrocko/issues>`_. Chat with us and other Pyrocko
+users our `support forum <https://hive.pyrocko.org/>`_.