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

Skip to content

1.5.0 final work #5353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 29, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
DOC: remove more 2.6 references
  • Loading branch information
tacaswell committed Oct 29, 2015
commit ef4a9963e639752595b843c7da50e2c788a1a6e9
6 changes: 3 additions & 3 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ in addition to
For Python 3.5 the `Visual C++ Redistributable for Visual Studio 2015
<http://www.microsoft.com/en-us/download/details.aspx?id=48145>`_
needs to be installed.
In case Python 2.6 to 3.4 are not installed for all users (not the default),
In case Python 2.7 to 3.4 are not installed for all users (not the default),
the Microsoft Visual C++ 2008 (
`64 bit <http://www.microsoft.com/download/en/details.aspx?id=15336>`__
or
`32 bit <http://www.microsoft.com/download/en/details.aspx?id=29>`__
for Python 2.6 to 3.2) or Microsoft Visual C++ 2010 (
for Python 2.7 to 3.2) or Microsoft Visual C++ 2010 (
`64 bit <http://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
or
`32 bit <http://www.microsoft.com/en-us/download/details.aspx?id=5555>`__
Expand Down Expand Up @@ -184,7 +184,7 @@ themselves.
Required Dependencies
^^^^^^^^^^^^^^^^^^^^^

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

:term:`numpy` |minimum_numpy_version| (or later)
Expand Down
2 changes: 1 addition & 1 deletion doc/devel/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ Using tox

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

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