progress

setup.py

@@ -5,131 +5,121 @@ import sys
 
 from codecs import open
 
-from setuptools import setup
+from setuptools import setup, Command
 from setuptools.command.test import test as TestCommand
 
 here = os.path.abspath(os.path.dirname(__file__))
 
 
-class Format(TestCommand):
+class Format(Command):
     user_options = []
 
     def initialize_options(self):
-        TestCommand.initialize_options(self)
         pass
 
     def finalize_options(self):
         pass
 
-    def run_tests(self):
-        os.system('white requests')
+    def run(self):
+        os.system("black requests3")
 
 
-class PyTest(TestCommand):
-    user_options = [('pytest-args=', 'a', "Arguments to pass into py.test")]
+class PyTest(Command):
+    user_options = [("pytest-args=", "a", "Arguments to pass into py.test")]
 
     def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.pytest_args = ['-n', 'auto']
+        pass
 
     def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
+        # Command.finalize_options(self)
+        pass
 
-    def run_tests(self):
+    def run(self):
         import pytest
 
-        errno = pytest.main(self.pytest_args)
+        errno = pytest.main(["-n", "auto"])
         sys.exit(errno)
 
 
-class MyPyTest(TestCommand):
-    user_options = [('pytest-args=', 'a', "Arguments to pass into py.test")]
+class MyPyTest(Command):
+    user_options = [("pytest-args=", "a", "Arguments to pass into py.test")]
 
     def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.pytest_args = ['-n', 'auto', '--mypy', 'tests']
+        pass
 
     def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
+        pass
 
     def run_tests(self):
         import pytest
 
-        errno = pytest.main(self.pytest_args)
+        errno = pytest.main(["-n", "auto", "--mypy", "tests"])
         sys.exit(errno)
 
 
 # 'setup.py publish' shortcut.
-if sys.argv[-1] == 'publish':
-    os.system('python setup.py sdist bdist_wheel')
-    os.system('twine upload dist/*')
+if sys.argv[-1] == "publish":
+    os.system("python setup.py sdist bdist_wheel")
+    os.system("twine upload dist/*")
     sys.exit()
-packages = ['requests3']
+packages = ["requests3"]
 requires = [
-    'chardet>=3.0.2,<3.1.0',
-    'idna>=2.5,<2.9',
-    'urllib3>=1.21.1,<1.25',
-    'certifi>=2017.4.17',
-    'requests-toolbelt'
-
+    "chardet>=3.0.2,<3.1.0",
+    "idna>=2.5,<2.9",
+    "urllib3>=1.21.1,<1.25",
+    "certifi>=2017.4.17",
 ]
 test_requirements = [
-    'pytest-httpbin==0.0.7',
-    'pytest-cov',
-    'pytest-mock',
-    'pytest-xdist',
-    'PySocks>=1.5.6, !=1.5.7',
-    'pytest>=2.8.0'
+    "pytest-httpbin==0.0.7",
+    "pytest-cov",
+    "pytest-mock",
+    "pytest-xdist",
+    "PySocks>=1.5.6, !=1.5.7",
+    "pytest>=2.8.0",
 ]
 
 about = {}
-with open(os.path.join(here, 'requests3', '__version__.py'), 'r', 'utf-8') as f:
+with open(os.path.join(here, "requests3", "__version__.py"), "r", "utf-8") as f:
     exec(f.read(), about)
 
-with open('README.md', 'r', 'utf-8') as f:
+with open("README.md", "r", "utf-8") as f:
     readme = f.read()
-with open('HISTORY.md', 'r', 'utf-8') as f:
+with open("HISTORY.md", "r", "utf-8") as f:
     history = f.read()
 setup(
-    name=about['__title__'],
-    version=about['__version__'],
-    description=about['__description__'],
+    name=about["__title__"],
+    version=about["__version__"],
+    description=about["__description__"],
     long_description=readme,
-    long_description_content_type='text/markdown',
-    author=about['__author__'],
-    author_email=about['__author_email__'],
-    url=about['__url__'],
+    long_description_content_type="text/markdown",
+    author=about["__author__"],
+    author_email=about["__author_email__"],
+    url=about["__url__"],
     packages=packages,
-    package_data={'': ['LICENSE', 'NOTICE'], 'requests': ['*.pem']},
-    package_dir={'requests': 'requests'},
+    package_data={"": ["LICENSE", "NOTICE"], "requests": ["*.pem"]},
+    package_dir={"requests": "requests"},
     include_package_data=True,
     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
     install_requires=requires,
-    license=about['__license__'],
+    license=about["__license__"],
     zip_safe=False,
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Natural Language :: English',
-        'License :: OSI Approved :: Apache Software License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy',
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "Natural Language :: English",
+        "License :: OSI Approved :: Apache Software License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
     ],
-    cmdclass={'test': PyTest, 'mypy': MyPyTest, 'format': Format},
+    cmdclass={"test": PyTest, "mypy": MyPyTest, "format": Format},
     tests_require=test_requirements,
     extras_require={
-        'security': ['pyOpenSSL >= 0.14', 'cryptography>=1.3.4', 'idna>=2.0.0'],
-        'socks': ['PySocks>=1.5.6, !=1.5.7'],
-        'socks:sys_platform == "win32" and python_version == "2.7"': [
-            'win_inet_pton'
-        ],
+        "security": ["pyOpenSSL >= 0.14", "cryptography>=1.3.4", "idna>=2.0.0"],
+        "socks": ["PySocks>=1.5.6, !=1.5.7"],
+        'socks:sys_platform == "win32" and python_version == "2.7"': ["win_inet_pton"],
     },
 )