From ed884322b9c7379289cc4503242d6a995f2e96d0 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 1 Nov 2018 20:28:52 -0600 Subject: [PATCH 1/3] Add VSCode to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0aa04c2..9207dc4 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,7 @@ dist # IDE Files atlassian-ide-plugin.xml .idea/ +.vscode/ *.swp *.kate-swp .ropeproject/ From 43c48a768a7a2dd0196f78be8faf2a2cbb3a806e Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 1 Nov 2018 20:29:24 -0600 Subject: [PATCH 2/3] Ensure LICENSE gets included in the package --- setup.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.cfg b/setup.cfg index 7cbab2d..073d2b1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,3 +4,6 @@ universal = 1 [flake8] ignore = F401,F403,E502,E123,E127,E128,E303,E713,E111,E241,E302,E121,E261,W391 max-line-length = 120 + +[metadata] +license_file = LICENSE From fbaa7e2c216bd2c065735f1a5ed46518b6256252 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 1 Nov 2018 20:30:32 -0600 Subject: [PATCH 3/3] Use Markdown README for PyPI The new version of PyPI and Warehouse added support for PEP 566, which adds the option "long_description_content_type" to specify the format of the long description used on the PyPI page. This removes the need to convert it to RST using pypandoc. --- setup.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index a8ea364..aabfe3d 100755 --- a/setup.py +++ b/setup.py @@ -75,16 +75,17 @@ def run_tests(self): cmdclass['test'] = PyTest -try: - import pypandoc - readme = pypandoc.convert('README.md', 'rst') -except (IOError, ImportError, OSError, RuntimeError): - readme = '' + +with open('README.md', encoding='utf-8') as f: # Loads in the README for PyPI + long_description = f.read() + setup(name='hug_authentication_ldap', version='1.0.3', description='LDAP based authentication support for hug', - long_description=readme, + long_description=long_description, + # PEP 566, the new PyPI, and setuptools>=38.6.0 make markdown possible + long_description_content_type='text/markdown', author='Timothy Crosley', author_email='timothy.crosley@gmail.com', url='https://github.com/timothycrosley/hug_authentication_ldap',