Merge ba42bd1 into 9410589

pyproject.toml

@@ -0,0 +1,5 @@
+[build-system]
+requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4.3"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]

setup.cfg

@@ -1,8 +1,47 @@
-[bdist_wheel]
-universal = 1
-
 [metadata]
+name = ntlm-auth
+author = Jordan Borean
+author_email = jborean93@gmail.com
+license = MIT
 license_file = LICENSE
+description = Creates NTLM authentication structures
+long_description = file: README.md
+long_description_content_type = text/markdown
+keywords =
+    authentication
+    auth
+    microsoft
+    ntlm
+    lm
+url = https://github.com/jborean93/ntlm-auth
+classifiers =
+    Development Status :: 5 - Production/Stable
+    License :: OSI Approved :: MIT License
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.6
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+
+[options]
+packages = ntlm_auth
+install_requires =
+    ordereddict; python_version<"2.7"
+python_requires = >=2.6,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
+
+[options.extras_require]
+# Adds faster RC4 message encryption, optional as we can fallback
+# to the slower Python imp.
+# 2.2+ droppped Python 2.6 support
+cryptography =
+    cryptography<2.2; python_version<"2.7"
+    cryptography; python_version>="2.7"
+
+[bdist_wheel]
+universal = 1
 
 [tool:pytest]
-pep8maxlinelength = 119
+pep8maxlinelength = 119

setup.py

@@ -3,50 +3,5 @@
 
 from setuptools import setup
 
-# PyPi supports only reStructuredText, so pandoc should be installed
-# before uploading package
-try:
-    import pypandoc
-    long_description = pypandoc.convert('README.md', 'rst')
-except ImportError:
-    long_description = ''
-
-setup(
-    name='ntlm-auth',
-    version='1.5.0',
-    packages=['ntlm_auth'],
-    install_requires=[],
-    extras_require={
-        ':python_version<"2.7"': [
-            'ordereddict'
-        ],
-        # Adds faster RC4 message encryption, optional as we can fallback
-        # to the slower Python imp.
-        'cryptography:python_version<"2.7"': [
-            'cryptography<2.2'  # 2.2+ droppped Python 2.6 support
-        ],
-        'cryptography:python_version>="2.7"': [
-            'cryptography'
-        ]
-    },
-    author='Jordan Borean',
-    author_email='jborean93@gmail.com',
-    url='https://github.com/jborean93/ntlm-auth',
-    description='Creates NTLM authentication structures',
-    long_description=long_description,
-    keywords='authentication auth microsoft ntlm lm',
-    license='MIT',
-    python_requires='>=2.6,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-    ],
-)
+if __name__ == "__main__":
+    setup()