Merge pull request #1384 from hpk42/master

trying to settle the new layout

doc/en/_templates/layout.html

@@ -2,9 +2,16 @@
 {% block header %}
 <div align="center" xmlns="http://www.w3.org/1999/html" style="background-color: lightgreen;  padding: .5em">
   <h4>
+      Want to help improve pytest?  Please 
     <a href="https://www.indiegogo.com/projects/python-testing-sprint-mid-2016#/">
-      Support the future of py.test development: join or fund the next sprint in June in Germany
+        contribute to
     </a>
+    or 
+    <a href="announce/sprint2016.html">
+        join
+    </a>
+    our upcoming sprint in June 2016!
+
   </h4>
 </div>
   {{super()}}

doc/en/announce/index.rst

@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   sprint2016
    release-2.8.6
    release-2.8.5
    release-2.8.4

doc/en/announce/sprint-funding-2016.txt

@@ -1,62 +0,0 @@
-
-call for (funding of) the next pytest-sprint
-======================================================
-
-The pytest core group is looking for donations or invoiced
-money from companies and individuals in order to fund travels
-and accomodation for the next pytest sprint, June 20-26th 2016
-in Freiburg, Germany.  If this works out you can expect some
-great new developments in the python testing space to be released
-in 2016.  Here is a short list of preliminary topics:
-
-- improving pytest-xdist test scheduling to take into account
-  fixture setups and explicit user hints.
-
-- provide info on fixture dependencies during --collect-only
-
-- tying pytest-xdist to tox so that you can do "py.test -e py34"
-  to run tests in a particular tox-managed virtualenv.  Also
-  look into making pytest-xdist use tox environments on
-  remote ssh-sides so that remote dependency management becomes
-  easier.
-
-- refactoring the fixture system so more people understand it :)
-
-- integrating PyUnit setup methods as autouse fixtures.
-  possibly adding ways to influence ordering of same-scoped
-  fixtures (so you can make a choice of which fixtures come
-  before others)
-
-- fixing bugs and issues from the tracker, really an endless source :)
-
-The sprint is going to take place for several days with a break
-day in between in the black forest town Freiburg in Germany
-which also means we are going to do some hiking likely.
-
-Here are preliminary participants who said they are likely to come,
-given some expenses funding::
-
-    Andreas Pelme, Sweden
-    Brianna Laugher, Australia
-    Bruno Oliveira, Brazil
-    Florian Bruhin, Switzerland
-    Floris Bruynooghe, UK
-    Holger Krekel, Germany
-    Omar Kohl, Germany
-    Raphael Pierzina, US/UK
-
-Other contributors and newcomers are invited to join as well but please
-send a mail to the pytest-dev mailing list if you intend to do so
-somewhat soon, also how much funding you need if so.  And if you are
-working for a company and using pytest heavily you are welcome to join
-and we encourage your company to provide some funding for the
-sprint.  They may see it, and rightfully so, as a very cheap and deep
-training which brings you together with the experts in the field :)
-
-The money we need for travels and accommodation is estimated to
-sum up around 6000 Euro currently.  If you are a company and paying is easier
-for you to process after an invoice, Holger's company http://merlinux.eu
-can invoice you for the sprint and will channel the funds to the
-sprint budget.  If we get excess money we'll use it for funding
-future sprints.
-

doc/en/announce/sprint2016.rst

@@ -0,0 +1,102 @@
+python testing sprint June 20th-26th 2016
+======================================================
+
+.. image:: ../img/freiburg2.jpg
+   :width: 400
+
+The pytest core group is heading towards the biggest sprint
+in its history, to take place in the black forest town Freiburg
+in Germany.  As of February 2016 we have started a `funding
+campaign on Indiegogo to cover expenses
+<http://igg.me/at/pytest-sprint/x/4034848>`_ The page also mentions
+some preliminary topics:
+
+- improving pytest-xdist test scheduling to take into account
+  fixture setups and explicit user hints.
+
+- provide info on fixture dependencies during --collect-only
+
+- tying pytest-xdist to tox so that you can do "py.test -e py34"
+  to run tests in a particular tox-managed virtualenv.  Also
+  look into making pytest-xdist use tox environments on
+  remote ssh-sides so that remote dependency management becomes
+  easier.
+
+- refactoring the fixture system so more people understand it :)
+
+- integrating PyUnit setup methods as autouse fixtures.
+  possibly adding ways to influence ordering of same-scoped
+  fixtures (so you can make a choice of which fixtures come
+  before others)
+
+- fixing bugs and issues from the tracker, really an endless source :)
+
+
+Participants
+--------------
+
+Here are preliminary participants who said they are likely to come,
+given some expenses funding::
+
+    Anatoly Bubenkoff, Netherlands
+    Andreas Pelme, Sweden
+    Brianna Laugher, Australia
+    Bruno Oliveira, Brazil
+    Dave Hunt, UK
+    Florian Bruhin, Switzerland
+    Floris Bruynooghe, UK
+    Holger Krekel, Germany
+    Omar Kohl, Germany
+    Raphael Pierzina, US/UK
+    Tom Viner, UK
+
+    <your name here?>
+
+Other contributors and experienced newcomers are invited to join as well
+but please send a mail to the pytest-dev mailing list if you intend to
+do so somewhat soon, also how much funding you need if so.  And if you
+are working for a company and using pytest heavily you are welcome to
+join and we encourage your company to provide some funding for the
+sprint.  They may see it, and rightfully so, as a very cheap and deep
+training which brings you together with the experts in the field :)
+
+
+Sprint organisation, schedule
+-------------------------------
+
+tentative schedule:
+
+- 19/20th arrival in Freiburg
+- 20th social get together, initial hacking
+- 21/22th full sprint days
+- 23rd break day, hiking
+- 24/25th full sprint days
+- 26th departure
+
+We might adjust according to weather to make sure that if
+we do some hiking or excursion we'll have good weather.
+Freiburg is one of the sunniest places in Germany so
+it shouldn't be too much of a constraint.
+
+
+Accomodation
+----------------
+
+We'll see to arrange for renting a flat with multiple
+beds/rooms.  Hotels are usually below 100 per night.
+The earlier we book the better.
+
+Money / funding
+---------------
+
+The Indiegogo campaign asks for 11000 USD which should cover
+the costs for flights and accomodation, renting a sprint place
+and maybe a bit of food as well.
+
+If your organisation wants to support the sprint but prefers
+to give money according to an invoice, get in contact with
+holger at http://merlinux.eu who can invoice your organisation
+properly.
+
+If we have excess money we'll use for further sprint/travel
+funding for pytest/tox contributors.