Skip to content

Commit

Permalink
Merge pull request #342 from GaelVaroquaux/rel_2017
Browse files Browse the repository at this point in the history
WIP: work on release 2017.1
  • Loading branch information
pdebuyl authored Oct 4, 2017
2 parents 779268a + a86c3fd commit 0cdda9c
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 4 deletions.
50 changes: 48 additions & 2 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ Listed by alphabetical order

- arunpersaud

- Lilian Besson

- Matthew Brett

- Lars Buitinck
Expand All @@ -67,14 +69,20 @@ Listed by alphabetical order

- David Cournapeau

- egens
- Török Edwin

- Andre Espaze
- egens

- André Espaze

- Loïc Estève

- Corey Farwell

- Olivier Georg

- Daniel Gerigk

- Robert Gieseke

- Philip Gillißen
Expand All @@ -89,6 +97,8 @@ Listed by alphabetical order

- Pierre Haessig

- Michael Hartmann

- Jonathan Helmus

- Tarek Hoteit
Expand All @@ -97,16 +107,38 @@ Listed by alphabetical order

- Zbigniew Jędrzejewski-Szmek

- Thouis (Ray) Jones

- jorgeprietoarranz

- kikocorreoso

- Vince Knight

- LFP6

- John McLaughlin

- mhemantha

- Mohammad

- negm

- John B Nelson

- nicoguaro

- Sergio Oller

- Theofilos Papapanagiotou

- patniharshit

- Fabian Pedregosa

- Philippe Pepiot

- Tiago M. D. Pereira

- Nicolas Pettiaux
Expand All @@ -117,14 +149,28 @@ Listed by alphabetical order

- Maximilien Riehl

- Nicolas P. Rougier

- Nicolas Rougier

- Rutzmoser

- João Felipe Santos

- Helen Sherwood-Taylor

- Shoeboxam

- Simon

- solarjoe

- ssmiller

- strpeter

- Bartosz T

- Wes Turner

- Akihiro Uchida
Expand Down
30 changes: 30 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,36 @@
What's new
==========

Release 2017.1 (October 2017)
-------------------------------------

* Update optimization chapter (Michael Hartmann, Gaël Varoquaux)

* Update SymPy chapter (Vince Knight)

* Update advanced NumPy (Bartosz Teleńczuk)

* Update scikit-learn chapter (Gaël Varoquaux)

* Update SciPy chapter (Gaël Varoquaux)

* Make '>>>' in the prompts unselectable (Pierre de Buyl)

* Use common package requirements for pip and conda and improve the build
instructions (Gert-Ludwig Ingold, Vince Knight, Pierre de Buyl)

* Set up Circle CI (Loïc Estève)

* Improved support for Python 3 integer divisions and calls to print (Loïc
Estève, Gert-Ludwig Ingold, Pierre de Buyl, Gaël Varoquaux)

* Change test runner to pytest (Pierre de Buyl)

* Replace the plot directive by sphinx-gallery (Gert-Ludwig Ingold)

Release 2016.1 (September 2016)
-------------------------------------

* Rework of intro chapter (Gaël Varoquaux)

* Integrate sphinx-gallery: examples are now Jupyter notebooks (Gaël
Expand Down
6 changes: 4 additions & 2 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@

# General information about the project.
project = u"Scipy lecture notes"
copyright = u'2012,2013,2015,2016'
copyright = u'2012,2013,2015,2016,2017'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand All @@ -117,7 +117,7 @@
version = p.stdout.read().strip().decode()

# The full version, including alpha/beta/rc tags.
release = '2016.1'
release = '2017.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -337,6 +337,8 @@ def __init__(self, **options):
\makeatother
\renewenvironment{wrapfigure}[2]{\begin{figure}[H]}{\end{figure}}
\def\shadowbox#1{\rule{\linewidth}{1pt}\nopagebreak
\nopagebreak\hspace*{.02\linewidth}#1\nopagebreak
Expand Down

0 comments on commit 0cdda9c

Please sign in to comment.