Merge remote-tracking branch 'upstream/master'

Author: Richardk2n

pyls_mypy/__init__.py

@@ -1,6 +1,9 @@
-from future.standard_library import install_aliases
 from ._version import get_versions
+import sys
+
+if sys.version_info[0] < 3:
+    from future.standard_library import install_aliases
+    install_aliases()
 
-install_aliases()
 __version__ = get_versions()['version']
 del get_versions

requirements.txt

@@ -1,4 +1,4 @@
-future
+future;python_version < '3'
 flake8
 configparser
 python-language-server

setup.cfg

@@ -1,7 +1,36 @@
+[metadata]
+name = pyls-mypy
+author = Tom van Ommeren
+description = Mypy linter for the Python Language Server
+url = https://github.com/tomv564/pyls-mypy
+long_description = file: README.rst
+
+[options]
+packages = find:
+install_requires = python-language-server; mypy
+
+
+[options.entry_points]
+pyls = pyls_mypy = pyls_mypy.plugin
+
+[options.extras_require]
+test =
+    tox
+    versioneer
+    pytest
+    pytest-cov
+    coverage
+
 [versioneer]
 VCS = git
 style = pep440
 versionfile_source = pyls_mypy/_version.py
 versionfile_build = pyls_mypy/_version.py
 tag_prefix =
 parentdir_prefix =
+
+[options.packages.find]
+exclude =
+    contrib
+    docs
+    test

setup.py

@@ -1,52 +1,6 @@
 #!/usr/bin/env python
-from setuptools import find_packages, setup
+from setuptools import setup
 import versioneer
 
-README = open('README.rst', 'r').read()
-
-
-setup(
-    name='pyls-mypy',
-
-    # Versions should comply with PEP440.  For a discussion on single-sourcing
-    # the version across setup.py and the project code, see
-    # https://packaging.python.org/en/latest/single_source_version.html
-    version=versioneer.get_version(),
-    cmdclass=versioneer.get_cmdclass(),
-
-    description='Mypy linter for the Python Language Server',
-
-    long_description=README,
-
-    # The project's main homepage.
-    url='https://github.com/tomv564/pyls-mypy',
-
-    author='Tom van Ommeren',
-
-    # You can just specify the packages manually here if your project is
-    # simple. Or you can use find_packages().
-    packages=find_packages(exclude=['contrib', 'docs', 'test']),
-
-    # List run-time dependencies here.  These will be installed by pip when
-    # your project is installed. For an analysis of "install_requires" vs pip's
-    # requirements files see:
-    # https://packaging.python.org/en/latest/requirements.html
-    install_requires=[
-        'python-language-server',
-        'mypy'
-    ],
-
-    # List additional groups of dependencies here (e.g. development
-    # dependencies). You can install these using the following syntax,
-    # for example:
-    # $ pip install -e .[test]
-    extras_require={
-        'test': ['tox', 'versioneer', 'pytest', 'pytest-cov', 'coverage'],
-    },
-
-    entry_points={
-        'pyls': [
-            'pyls_mypy = pyls_mypy.plugin',
-        ],
-    },
-)
+if __name__ == "__main__":
+    setup(version=versioneer.get_version(), cmdclass=versioneer.get_cmdclass())