Skip to content

Commit 0cdda9c

Browse files
authored
Merge pull request #342 from GaelVaroquaux/rel_2017
WIP: work on release 2017.1
2 parents 779268a + a86c3fd commit 0cdda9c

File tree

3 files changed

+82
-4
lines changed

3 files changed

+82
-4
lines changed

AUTHORS.rst

+48-2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ Listed by alphabetical order
5151

5252
- arunpersaud
5353

54+
- Lilian Besson
55+
5456
- Matthew Brett
5557

5658
- Lars Buitinck
@@ -67,14 +69,20 @@ Listed by alphabetical order
6769

6870
- David Cournapeau
6971

70-
- egens
72+
- Török Edwin
7173

72-
- Andre Espaze
74+
- egens
7375

7476
- André Espaze
7577

78+
- Loïc Estève
79+
7680
- Corey Farwell
7781

82+
- Olivier Georg
83+
84+
- Daniel Gerigk
85+
7886
- Robert Gieseke
7987

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

9098
- Pierre Haessig
9199

100+
- Michael Hartmann
101+
92102
- Jonathan Helmus
93103

94104
- Tarek Hoteit
@@ -97,16 +107,38 @@ Listed by alphabetical order
97107

98108
- Zbigniew Jędrzejewski-Szmek
99109

110+
- Thouis (Ray) Jones
111+
112+
- jorgeprietoarranz
113+
100114
- kikocorreoso
101115

116+
- Vince Knight
117+
118+
- LFP6
119+
120+
- John McLaughlin
121+
102122
- mhemantha
103123

124+
- Mohammad
125+
126+
- negm
127+
128+
- John B Nelson
129+
104130
- nicoguaro
105131

106132
- Sergio Oller
107133

134+
- Theofilos Papapanagiotou
135+
136+
- patniharshit
137+
108138
- Fabian Pedregosa
109139

140+
- Philippe Pepiot
141+
110142
- Tiago M. D. Pereira
111143

112144
- Nicolas Pettiaux
@@ -117,14 +149,28 @@ Listed by alphabetical order
117149

118150
- Maximilien Riehl
119151

152+
- Nicolas P. Rougier
153+
120154
- Nicolas Rougier
121155

156+
- Rutzmoser
157+
158+
- João Felipe Santos
159+
122160
- Helen Sherwood-Taylor
123161

162+
- Shoeboxam
163+
124164
- Simon
125165

166+
- solarjoe
167+
168+
- ssmiller
169+
126170
- strpeter
127171

172+
- Bartosz T
173+
128174
- Wes Turner
129175

130176
- Akihiro Uchida

CHANGES.rst

+30
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,36 @@
11
What's new
22
==========
33

4+
Release 2017.1 (October 2017)
5+
-------------------------------------
6+
7+
* Update optimization chapter (Michael Hartmann, Gaël Varoquaux)
8+
9+
* Update SymPy chapter (Vince Knight)
10+
11+
* Update advanced NumPy (Bartosz Teleńczuk)
12+
13+
* Update scikit-learn chapter (Gaël Varoquaux)
14+
15+
* Update SciPy chapter (Gaël Varoquaux)
16+
17+
* Make '>>>' in the prompts unselectable (Pierre de Buyl)
18+
19+
* Use common package requirements for pip and conda and improve the build
20+
instructions (Gert-Ludwig Ingold, Vince Knight, Pierre de Buyl)
21+
22+
* Set up Circle CI (Loïc Estève)
23+
24+
* Improved support for Python 3 integer divisions and calls to print (Loïc
25+
Estève, Gert-Ludwig Ingold, Pierre de Buyl, Gaël Varoquaux)
26+
27+
* Change test runner to pytest (Pierre de Buyl)
28+
29+
* Replace the plot directive by sphinx-gallery (Gert-Ludwig Ingold)
30+
31+
Release 2016.1 (September 2016)
32+
-------------------------------------
33+
434
* Rework of intro chapter (Gaël Varoquaux)
535

636
* Integrate sphinx-gallery: examples are now Jupyter notebooks (Gaël

conf.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101

102102
# General information about the project.
103103
project = u"Scipy lecture notes"
104-
copyright = u'2012,2013,2015,2016'
104+
copyright = u'2012,2013,2015,2016,2017'
105105

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

119119
# The full version, including alpha/beta/rc tags.
120-
release = '2016.1'
120+
release = '2017.1'
121121

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

0 commit comments

Comments
 (0)