From 3086592639c70e985298fc64b46f98b7267dea8f Mon Sep 17 00:00:00 2001 From: Ray Luo Date: Tue, 12 May 2020 16:50:53 -0700 Subject: [PATCH 1/3] Update metadata for next release --- setup.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index a8800300..4ddda28a 100644 --- a/setup.py +++ b/setup.py @@ -35,6 +35,11 @@ io.open('adal/__init__.py', encoding='utf_8_sig').read() ).group(1) +try: + long_description = open('README.md').read() +except OSError: + long_description = "README.md is not accessible on TRAVIS CI's Python 3.5" + # To build: # python setup.py sdist # python setup.py bdist_wheel @@ -54,13 +59,16 @@ version=__version__, description=('The ADAL for Python library makes it easy for python ' + 'application to authenticate to Azure Active Directory ' + - '(AAD) in order to access AAD protected web resources.'), + '(AAD) in order to access AAD protected web resources. ' + + '(It is now SUPERSEDED by MSAL Python.)'), license='MIT', author='Microsoft Corporation', author_email='nugetaad@microsoft.com', url='https://github.com/AzureAD/azure-activedirectory-library-for-python', + long_description=long_description, + long_description_content_type="text/markdown", classifiers=[ - 'Development Status :: 3 - Alpha', + 'Development Status :: 5 - Production/Stable', 'Programming Language :: Python', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', From 444603fede822d083804e54cc2c111db41ffcdc2 Mon Sep 17 00:00:00 2001 From: Ray Luo Date: Wed, 13 May 2020 13:44:17 -0700 Subject: [PATCH 2/3] Move the note to the beginning of the description --- setup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 4ddda28a..72dc6bcd 100644 --- a/setup.py +++ b/setup.py @@ -57,10 +57,12 @@ setup( name='adal', version=__version__, - description=('The ADAL for Python library makes it easy for python ' + + description=('Note: This library is already replaced by MSAL Python, ' + + 'available here: https://pypi.org/project/msal/ .' + + 'ADAL Python remains available here as a legacy. ' + + 'The ADAL for Python library makes it easy for python ' + 'application to authenticate to Azure Active Directory ' + - '(AAD) in order to access AAD protected web resources. ' + - '(It is now SUPERSEDED by MSAL Python.)'), + '(AAD) in order to access AAD protected web resources.'), license='MIT', author='Microsoft Corporation', author_email='nugetaad@microsoft.com', From a1d7a288909c46e83429a5df01818d1d0aade1f6 Mon Sep 17 00:00:00 2001 From: Ray Luo Date: Fri, 5 Jun 2020 14:01:58 -0700 Subject: [PATCH 3/3] Use setup.cfg for long_description --- setup.cfg | 3 ++- setup.py | 9 +-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/setup.cfg b/setup.cfg index 24378bc0..e984b799 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,4 +2,5 @@ universal=1 [metadata] -description-file = README.md +long_description = file: README.md +long_description_content_type = text/markdown diff --git a/setup.py b/setup.py index 72dc6bcd..8f87b429 100644 --- a/setup.py +++ b/setup.py @@ -35,11 +35,6 @@ io.open('adal/__init__.py', encoding='utf_8_sig').read() ).group(1) -try: - long_description = open('README.md').read() -except OSError: - long_description = "README.md is not accessible on TRAVIS CI's Python 3.5" - # To build: # python setup.py sdist # python setup.py bdist_wheel @@ -67,10 +62,8 @@ author='Microsoft Corporation', author_email='nugetaad@microsoft.com', url='https://github.com/AzureAD/azure-activedirectory-library-for-python', - long_description=long_description, - long_description_content_type="text/markdown", classifiers=[ - 'Development Status :: 5 - Production/Stable', + 'Development Status :: 6 - Mature', 'Programming Language :: Python', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7',