use extras_require to add typing pkg (#3701)

* use extras_require to add typing pkg

* pip to install packages

Author: graingert

.travis.yml

@@ -14,9 +14,10 @@ python:
   # - "pypy3"
 
 install:
+  - pip install -U pip setuptools wheel
   - pip install -r test-requirements.txt
   - python2 -m pip install --user typing
-  - python setup.py install
+  - pip install .
 
 script:
   - python runtests.py -j16 -x lint

README.md

@@ -129,7 +129,7 @@ Or you can jump straight to the documentation:
 Troubleshooting
 ---------------
 
-Depending on your configuration, you may have to run `pip3` like
+Depending on your configuration, you may have to run `pip` like
 this:
 
     $ python3 -m pip install -U mypy
@@ -140,8 +140,8 @@ can install it manually:
 
     $ python3 -m pip install -U typed-ast
 
-If the `mypy` command isn't found after installation: After either
-`pip3 install` or `setup.py install`, the `mypy` script and
+If the `mypy` command isn't found after installation: After
+`python3 -m pip install`, the `mypy` script and
 dependencies, including the `typing` module, will be installed to
 system-dependent locations.  Sometimes the script directory will not
 be in `PATH`, and you have to add the target directory to `PATH`

appveyor.yml

@@ -14,7 +14,7 @@ install:
     - "%PYTHON%\\python.exe -m pip install -r test-requirements.txt"
     - "git submodule update --init typeshed"
     - "cd typeshed && git config core.symlinks true && git reset --hard && cd .."
-    - "%PYTHON%\\python.exe setup.py -q install"
+    - "%PYTHON%\\python.exe -m pip install ."
 
 build: off
 

setup.cfg

@@ -49,12 +49,3 @@ parallel = true
 
 [coverage:report]
 show_missing = true
-
-[metadata]
-# This seems to be used only by bdist_wheel.
-# You need "pip3 install wheel".
-# Then run "python3 setup.py bdist_wheel" to build a wheel file
-# (and then upload that to PyPI).
-requires-dist =
-    typed-ast >= 1.0.4, < 1.1.0
-    typing >= 3.5.3; python_version < "3.5"

setup.py

@@ -94,16 +94,6 @@ def run(self):
 
 package_dir = {'mypy': 'mypy'}
 
-
-# These requirements are used when installing by other means than bdist_wheel.
-# E.g. "pip3 install ." or
-# "pip3 install git+git://github.com/python/mypy.git"
-# (as suggested by README.md).
-install_requires = []
-install_requires.append('typed-ast >= 1.0.4, < 1.1.0')
-if sys.version_info < (3, 5):
-    install_requires.append('typing >= 3.5.3')
-
 setup(name='mypy',
       version=version,
       description=description,
@@ -121,5 +111,8 @@ def run(self):
       data_files=data_files,
       classifiers=classifiers,
       cmdclass={'build_py': CustomPythonBuild},
-      install_requires=install_requires,
+      install_requires = ['typed-ast >= 1.0.4, < 1.1.0'],
+      extras_require = {
+          ':python_version < "3.5"': 'typing >= 3.5.3',
+      },
       )