diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index db449d447..eff60a04c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -13,7 +13,7 @@ the problem ourselves. ### Environment and Platform - OS: Linux, Windows or BSD / OS X? -- Python: 2.6, 2.7, 3.5, PyPy? +- Python: 2.7, 3.5, PyPy? - circuits: 3.2? Something older? ---- diff --git a/.travis.yml b/.travis.yml index e83d2d35a..95e7912dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,6 @@ language: python matrix: include: - - os: linux - python: 2.6 - env: TOXENV=py26 - os: linux python: 2.7 env: TOXENV=py27 diff --git a/README.md b/README.md index da3be0135..718839819 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Supported Platforms =================== - Linux, FreeBSD, Mac OS X, Windows -- Python 2.6, 2.7, 3.2, 3.3, 3.4 +- Python 2.7, 3.3, 3.4, 3.5 - pypy 2.0, 2.1, 2.2 Installation diff --git a/README.rst b/README.rst index 55ff9981c..e27527350 100644 --- a/README.rst +++ b/README.rst @@ -78,7 +78,7 @@ Supported Platforms ------------------- - Linux, FreeBSD, Mac OS X, Windows -- Python 2.6, 2.7, 3.2, 3.3, 3.4 +- Python 2.7, 3.3, 3.4, 3.5 - pypy 2.0, 2.1, 2.2 diff --git a/docs/source/dev/environment.rst b/docs/source/dev/environment.rst index 898ac4318..cdb89f85e 100644 --- a/docs/source/dev/environment.rst +++ b/docs/source/dev/environment.rst @@ -13,7 +13,7 @@ This is the recommended way to setup a development enviornment for developing with or on circuits. .. note:: This document *assumes* you already have a working `Python`_ - environment with a minimum `Python`_ version of 2.6 as well + environment with a minimum `Python`_ version of 2.7 or 3.3 as well as `pip`_ already installed. diff --git a/docs/source/faq.rst b/docs/source/faq.rst index 65a9da315..e1fa3a631 100644 --- a/docs/source/faq.rst +++ b/docs/source/faq.rst @@ -42,7 +42,7 @@ General ... What platforms does circuits support? circuits currently supports Linux, FreeBSD, OSX and Windows and is currently continually tested against Linux and Windows against Python - versions 2.6, 2.7, 3.1 and 3.2 + versions 2.7, 3.3, 3.4 and 3.5 ... Can circuits be used for concurrent or distributed programming? Yes. We also have plans to build more distributed components into circuits diff --git a/docs/source/start/requirements.rst b/docs/source/start/requirements.rst index ac4f3b202..47ed1fb8d 100644 --- a/docs/source/start/requirements.rst +++ b/docs/source/start/requirements.rst @@ -6,11 +6,11 @@ Requirements and Dependencies - circuits has no **required** dependencies beyond the `Python Standard Library`_. -- Python: >= 2.6 or pypy >= 2.0 +- Python: >= 2.7 or pypy >= 2.0 :Supported Platforms: Linux, FreeBSD, Mac OS X, Windows -:Supported Python Versions: 2.6, 2.7, 3.2, 3.3 +:Supported Python Versions: 2.7, 3.3, 3.4, 3.5 :Supported pypy Versions: 2.0 diff --git a/setup.py b/setup.py index c0070e878..8dd9e5cab 100755 --- a/setup.py +++ b/setup.py @@ -43,11 +43,12 @@ def read_file(filename): "Operating System :: POSIX :: Linux", "Operating System :: MacOS :: MacOS X", "Operating System :: Microsoft :: Windows", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.1", - "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Adaptive Technologies",