Jakub Roztocil 3 months ago
parent
commit
56af5c6396
2 changed files with 7 additions and 24 deletions
  1. 7 17
      docs/contributor-guide.rst
  2. 0 7
      setup.py

+ 7 - 17
docs/contributor-guide.rst

@@ -185,39 +185,29 @@ Deactivate it first if you're in a virtualenv::
 Make sure you have installed all the Python versions we're targeting. If not,
 do::
 
-    $ pyenv install 2.6.9
-    $ pyenv install 2.7.12
-    $ pyenv install 3.3.6
-    $ pyenv install 3.4.5
-    $ pyenv install 3.5.2
     $ pyenv install 3.6.0
-    $ pyenv install pypy-5.3.1
-    $ pyenv install pypy3-2.4.0
+    $ pyenv install 3.7.0
+    $ pyenv install 3.8.0
 
 To use Tox_ with pyenv_, you have to instruct pyenv to use multiple Python
 versions for the project::
 
     $ cd ~/Projects/http-prompt
-    $ pyenv local 3.6.0 3.5.2 3.4.5 3.3.6 2.7.12 2.6.9 pypy-5.3.1 pypy3-2.4.0
+    $ pyenv local 3.6.0 3.7.0 3.8.0
 
 This will generate a ``.python-version`` in the project directory::
 
     $ cat ~/Projects/http-prompt/.python-version
     3.6.0
-    3.5.2
-    3.4.5
-    3.3.6
-    2.7.12
-    2.6.9
-    pypy-5.3.1
-    pypy3-2.4.0
+    3.7.0
+    3.8.0
 
 This tells pyenv_ to choose a Python version based on the above order. In this
 case, 3.6.0 is the first choice, so any Python executables (such as ``python``
 and ``pip``) will be automatically mapped to the ones in
-``~/.pyenv/versions/3.6.0/bin``.
+``~/.pyenv/versions/3.8.0/bin``.
 
-We want to run ``tox`` using on Python 3.6.0. Make sure you have installed
+We want to run ``tox`` using on Python 3.8.0. Make sure you have installed
 Tox_::
 
     $ pip install tox

+ 0 - 7
setup.py

@@ -6,7 +6,6 @@ except ImportError:
 import codecs
 import os
 import re
-import sys
 
 
 here = os.path.abspath(os.path.dirname(__file__))
@@ -41,12 +40,6 @@ def read_requirements(filename):
             result = [line.rstrip() for line in f]
     except IOError:
         raise IOError(os.getcwd())
-    else:
-        # "New in version 2.7."
-        # https://docs.python.org/2/library/collections.html#collections.OrderedDict
-        if sys.version_info < (2, 7):
-            result.append('ordereddict>=1.1')
-        return result
 
 
 setup(