Remove 2.6 from documentation and setup

sebastinas · sebastinas · commit 1202d1448476 · 2016-01-13T23:56:42.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/.travis.install.sh b/.travis.install.sh
@@ -17,7 +17,7 @@ if [[ $RUN == nosetests ]]; then
     pip install jedi
     # translation specific dependencies
     pip install babel
-    # Python 2.6 specific dependencies
+    # Python 2.7 specific dependencies
     if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then
       # dependencies for crasher tests
       pip install Twisted urwid
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -436,7 +436,7 @@ def startup(self):
             with io.open(filename, 'rt', encoding=encoding) as f:
                 source = f.read()
                 if not py3:
-                    # Python 2.6 and early 2.7.X need bytes.
+                    # Early Python 2.7.X need bytes.
                     source = source.encode(encoding)
                 self.interp.runsource(source, filename, 'exec', encode=False)
 
diff --git a/doc/sphinx/source/contributing.rst b/doc/sphinx/source/contributing.rst
@@ -17,7 +17,7 @@ the time of day.
 Getting your development environment set up
 -------------------------------------------
 
-bpython supports Python 2.6, 2.7, 3.3 and 3.4. The code is compatible with all
+bpython supports Python 2.7, 3.3 and newer. The code is compatible with all
 supported versions without the need to run post processing like `2to3`.
 
 Using a virtual environment is probably a good idea. Create a virtual
diff --git a/doc/sphinx/source/releases.rst b/doc/sphinx/source/releases.rst
@@ -45,7 +45,7 @@ A checklist to perform some manual tests before a release:
 
 Check that all of the following work before a release:
 
-* Runs under Python 2.6, 2.7, 3.3, 3.4 and 3.5.
+* Runs under Python 2.7, 3.3, 3.4 and 3.5.
 * Save
 * Rewind
 * Pastebin
diff --git a/doc/sphinx/source/tips.rst b/doc/sphinx/source/tips.rst
@@ -21,8 +21,8 @@ equivalent file.
 Where the `~/python/bpython`-path is the path to where your bpython source code
 resides.
 
-You can of course add multiple aliases, so you can run bpython with 2.6, 2.7
-and the 3 series.
+You can of course add multiple aliases, so you can run bpython with 2.7 and the
+3 series.
 
 .. note::
 
diff --git a/setup.py b/setup.py
@@ -221,13 +221,12 @@ def initialize_options(self):
     'watch': ['watchdog'],
     'jedi': ['jedi'],
     # need requests[security] for SNI support (only before 2.7.7)
-    ':python_version == "2.6" or '
-            'python_full_version == "2.7.0" or ' \
-            'python_full_version == "2.7.1" or ' \
-            'python_full_version == "2.7.2" or ' \
-            'python_full_version == "2.7.3" or ' \
-            'python_full_version == "2.7.4" or ' \
-            'python_full_version == "2.7.5" or ' \
+    ':python_full_version == "2.7.0" or '
+            'python_full_version == "2.7.1" or '
+            'python_full_version == "2.7.2" or '
+            'python_full_version == "2.7.3" or '
+            'python_full_version == "2.7.4" or '
+            'python_full_version == "2.7.5" or '
             'python_full_version == "2.7.6"': [
         'pyOpenSSL',
         'pyasn1',
@@ -254,8 +253,6 @@ def initialize_options(self):
 }
 
 tests_require = []
-if sys.version_info[0] == 2 and sys.version_info[1] < 7:
-    tests_require.append('unittest2')
 if (sys.version_info[0] == 2 or
         (sys.version_info[0] == 3 and sys.version_info[0] < 3)):
     tests_require.append('mock')
