From 118bd874855571e64ff170f61bae99ebb9196ea4 Mon Sep 17 00:00:00 2001 From: Matthew Templeton Date: Tue, 22 Feb 2022 13:45:13 -0500 Subject: [PATCH 1/4] new file: setup.py --- setup.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 setup.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..6956305 --- /dev/null +++ b/setup.py @@ -0,0 +1,48 @@ +import os +from subprocess import Popen, PIPE + +try: + from setuptools import setup, find_packages +except ImportError: + from distutils.core import setup, find_packages + +with open('requirements.txt') as f: + required = f.read().splitlines() + +with open('dev-requirements.txt') as f: + dev_required = f.read().splitlines() + +def get_git_version(default="v0.0.1"): + try: + p = Popen(['git', 'describe', '--tags'], stdout=PIPE, stderr=PIPE) + p.stderr.close() + line = p.stdout.readlines()[0] + line = line.strip() + return line.decode() + except: + return default + +setup( + name='ingest_data_model', + version=get_git_version(default="v0.0.1"), + url='http://github.com/adsabs/ingest_data_model/', + license='MIT', + author='NASA/SAO ADS', + description='JSON Schema for ADS Ingest Data', + long_description=__doc__, + long_description_content_type='text/markdown', + packages=find_packages(), + zip_safe=False, + include_package_data=True, + platforms='any', + classifiers=[ + 'Intended Audience :: Developers', + 'License :: OSI Approved :: MIT License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.7', + 'Topic :: Software Development :: Libraries :: Python Modules' + ] +) From e2e7d0726a08d2a69a5a28a6762b4ce17e3643c6 Mon Sep 17 00:00:00 2001 From: Matthew Templeton Date: Tue, 22 Feb 2022 13:49:37 -0500 Subject: [PATCH 2/4] modified: setup.py --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 6956305..5bce0fc 100644 --- a/setup.py +++ b/setup.py @@ -9,8 +9,11 @@ with open('requirements.txt') as f: required = f.read().splitlines() -with open('dev-requirements.txt') as f: - dev_required = f.read().splitlines() +try: + with open('dev-requirements.txt') as f: + dev_required = f.read().splitlines() +except Exception as err: + dev_required = None def get_git_version(default="v0.0.1"): try: From 9e5a94d73ad0eea2ead0cc64267fba1fcd2e11f4 Mon Sep 17 00:00:00 2001 From: Matthew Templeton Date: Tue, 22 Feb 2022 13:52:52 -0500 Subject: [PATCH 3/4] modified: setup.py --- setup.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 5bce0fc..8aa80d3 100644 --- a/setup.py +++ b/setup.py @@ -9,11 +9,6 @@ with open('requirements.txt') as f: required = f.read().splitlines() -try: - with open('dev-requirements.txt') as f: - dev_required = f.read().splitlines() -except Exception as err: - dev_required = None def get_git_version(default="v0.0.1"): try: @@ -38,6 +33,7 @@ def get_git_version(default="v0.0.1"): zip_safe=False, include_package_data=True, platforms='any', + install_requires=required, classifiers=[ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', From 97a0c6ea65eaa9229a63642fc999633a4ddafac2 Mon Sep 17 00:00:00 2001 From: Matthew Templeton Date: Fri, 25 Feb 2022 07:30:38 -0500 Subject: [PATCH 4/4] modified: setup.py --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8aa80d3..bdd61cd 100644 --- a/setup.py +++ b/setup.py @@ -20,6 +20,9 @@ def get_git_version(default="v0.0.1"): except: return default +with open('README.md', 'r') as fd: + long_description = fd.read() + setup( name='ingest_data_model', version=get_git_version(default="v0.0.1"), @@ -27,7 +30,7 @@ def get_git_version(default="v0.0.1"): license='MIT', author='NASA/SAO ADS', description='JSON Schema for ADS Ingest Data', - long_description=__doc__, + long_description=long_description, long_description_content_type='text/markdown', packages=find_packages(), zip_safe=False,