Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6514211

Browse files
tacaswelltacaswell
committed
Merge pull request #5353 from tacaswell/1.5.0_final_work
1.5.0 final work
2 parents a8d8877 + ef4a996 commit 6514211

File tree

8 files changed

+1397
-1064
lines changed

8 files changed

+1397
-1064
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,4 @@ texput.aux
7171
result_images
7272

7373
*.swp
74+
setup.cfg

‎INSTALL

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ in addition to
7171
For Python 3.5 the `Visual C++ Redistributable for Visual Studio 2015
7272
<http://www.microsoft.com/en-us/download/details.aspx?id=48145>`_
7373
needs to be installed.
74-
In case Python 2.6 to 3.4 are not installed for all users (not the default),
74+
In case Python 2.7 to 3.4 are not installed for all users (not the default),
7575
the Microsoft Visual C++ 2008 (
7676
`64 bit <http://www.microsoft.com/download/en/details.aspx?id=15336>`__
7777
or
7878
`32 bit <http://www.microsoft.com/download/en/details.aspx?id=29>`__
79-
for Python 2.6 to 3.2) or Microsoft Visual C++ 2010 (
79+
for Python 2.7 to 3.2) or Microsoft Visual C++ 2010 (
8080
`64 bit <http://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
8181
or
8282
`32 bit <http://www.microsoft.com/en-us/download/details.aspx?id=5555>`__
@@ -184,7 +184,7 @@ themselves.
184184
Required Dependencies
185185
^^^^^^^^^^^^^^^^^^^^^
186186

187-
:term:`python` 2.6, 2.7, 3.3, 3.4, or 3.5
187+
:term:`python` 2.7, 3.4, or 3.5
188188
`Download python <http://www.python.org/download/>`_.
189189

190190
:term:`numpy` |minimum_numpy_version| (or later)

‎doc/devel/testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ Using tox
265265

266266
`Tox <http://tox.testrun.org/>`_ is a tool for running tests against
267267
multiple Python environments, including multiple versions of Python
268-
(e.g., 2.6, 2.7, 3.2, etc.) and even different Python implementations
268+
(e.g., 2.7, 3.4, 3.5) and even different Python implementations
269269
altogether (e.g., CPython, PyPy, Jython, etc.)
270270

271271
Testing all versions of Python (2.6, 2.7, 3.*) requires

0 commit comments

Comments
 (0)