From e39ab0e62e8c4c15f9fe25e61b745a1ba9278f20 Mon Sep 17 00:00:00 2001
From: Romain Dorgueil <romain@dorgueil.net>
Date: Sun, 3 Dec 2017 09:57:56 +0100
Subject: [PATCH] Fixes packaging: *.py-tpl are now included using
 recursive-include in MANIFEST.in

---
 MANIFEST.in                       |  2 +-
 docs/_static/custom.css           | 18 ------------------
 docs/_templates/sidebarintro.html |  5 +----
 docs/install.rst                  | 24 +++++++++++++++++-------
 docs/tutorial/index.rst           | 12 ++++++++----
 tests/commands/test_convert.py    |  3 ---
 6 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 4c2c662..f0e3359 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
 include *.txt
-include *.py-tpl
+recursive-include bonobo *.py-tpl
diff --git a/docs/_static/custom.css b/docs/_static/custom.css
index 231ec92..3de53da 100644
--- a/docs/_static/custom.css
+++ b/docs/_static/custom.css
@@ -19,28 +19,10 @@ div.related {
     font-size: 0.9em;
 }
 
-div.sphinxsidebar h1,
-div.sphinxsidebar h2,
-div.sphinxsidebar h3,
-div.sphinxsidebar h4,
-div.sphinxsidebar h5,
-div.sphinxsidebar h6 {
-    font-family: 'Ubuntu', 'goudy old style', 'minion pro', 'bell mt', Georgia, 'Hiragino Mincho Pro', serif;
-}
-
 div.sphinxsidebar h3 {
     margin: 30px 0 10px 0;
 }
 
-div.body h1,
-div.body h2,
-div.body h3,
-div.body h4,
-div.body h5,
-div.body h6 {
-    font-family: 'Ubuntu', 'goudy old style', 'minion pro', 'bell mt', Georgia, 'Hiragino Mincho Pro', serif;
-}
-
 div.admonition p.admonition-title {
     font-family: 'Ubuntu', 'goudy old style', 'minion pro', 'bell mt', Georgia, 'Hiragino Mincho Pro', serif;
 }
diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
index d4abd00..05a2198 100644
--- a/docs/_templates/sidebarintro.html
+++ b/docs/_templates/sidebarintro.html
@@ -1,9 +1,6 @@
 <h3>About Bonobo</h3>
 <p>
-    Bonobo is a data-processing toolkit for python 3.5+.
-</p>
-<p>
-    It's a swiss-army knife for everyday's data.
+    Bonobo is a data-processing toolkit for python 3.5+, your swiss-army knife for everyday's data.
 </p>
 
 <h3>Other Formats</h3>
diff --git a/docs/install.rst b/docs/install.rst
index 615e4bc..e220ab0 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -35,13 +35,6 @@ Now, you can head to :doc:`tutorial/index`.
     along with pointers on how to move this first file into an existing fully
     featured python package.
 
-    You can also avoid all the comments boilerplate by using `--bare` option
-    (which is a shorthand for `--template bare`):
-
-    .. code-block:: shell-session
-
-        $ bonobo init --bare my-bare-etl-job.py
-
 
 Other installation options
 ::::::::::::::::::::::::::
@@ -55,6 +48,12 @@ You can install it directly from the `Python Package Index <https://pypi.python.
 
     $ pip install bonobo
 
+To upgrade an existing installation, use `--upgrade`:
+
+.. code-block:: shell-session
+
+    $ pip install --upgrade bonobo
+
 
 Install from source
 -------------------
@@ -119,6 +118,17 @@ I usually name the git remote for the main bonobo repository "upstream", and my
 
 Of course, replace my github username by the one you used to fork bonobo. You should be good to go!
 
+Preview versions
+----------------
+
+Sometimes, there are pre-versions available (before a major release, for example). By default, pip does not target
+pre-versions to avoid accidental upgrades to a potentially instable software, but you can easily opt-in:
+
+.. code-block:: shell-session
+
+    $ pip install --upgrade --pre bonobo
+
+
 Supported platforms
 :::::::::::::::::::
 
diff --git a/docs/tutorial/index.rst b/docs/tutorial/index.rst
index 111c543..438d9d8 100644
--- a/docs/tutorial/index.rst
+++ b/docs/tutorial/index.rst
@@ -39,12 +39,16 @@ More
 What's next?
 ::::::::::::
 
-* :doc:`The Bonobo Guide <../guide/index>`
-* :doc:`Extensions <../extension/index>`
+
+Once you're familiar with all the base concepts, you can...
+
+* Read the :doc:`Guides </guide/index>` to have a deep dive in each concept.
+* Explore the :doc:`Extensions </extension/index>` to widen the possibilities.
+* Open the :doc:`References </reference/index>` and start hacking like crazy.
 
 
-We're there!
-::::::::::::
+You're not alone!
+:::::::::::::::::
 
 Good documentation is not easy to write.
 
diff --git a/tests/commands/test_convert.py b/tests/commands/test_convert.py
index 8f1aea8..d61d8c5 100644
--- a/tests/commands/test_convert.py
+++ b/tests/commands/test_convert.py
@@ -6,9 +6,6 @@ from bonobo.util.environ import change_working_directory
 from bonobo.util.testing import all_runners
 
 
-@pytest.mark.skipif(
-    sys.version_info < (3, 6), reason="python 3.5 does not preserve kwargs order and this cant pass for now"
-)
 @all_runners
 def test_convert(runner, tmpdir):
     csv_content = 'id;name\n1;Romain'