From f9a6585f7182acbbcce8624cd909b23dd0f705bd Mon Sep 17 00:00:00 2001 From: Angeline Burrell Date: Fri, 17 Apr 2020 09:17:18 -0400 Subject: [PATCH 1/3] BUG: requirements Fixed bug where PyForecastTools wasn't required in setup.py and removed unnecessary requirements of numpy and pysat in requirements.txt. --- docs/requirements.txt | 2 -- setup.py | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index a9737541..f9389640 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,2 @@ -numpy numpydoc m2r -pysat diff --git a/setup.py b/setup.py index 56a05022..6fcdb5c9 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,8 @@ # change setup.py for readthedocs - commented for now # on_rtd = os.environ.get('READTHEDOCS') == 'True' -install_requires = ['pysat', 'scipy', 'pandas', 'xarray', 'numpy'] +install_requires = ['pysat', 'scipy', 'pandas', 'xarray', 'numpy', + 'PyForecastTools'] # Run setup From 95c21e1791b2d75d8ab75193f55678849a637a1c Mon Sep 17 00:00:00 2001 From: Angeline Burrell Date: Fri, 17 Apr 2020 09:26:25 -0400 Subject: [PATCH 2/3] BUG: added requirements Added requirements for readthedocs. --- docs/requirements.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index f9389640..d1c0375a 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,5 @@ -numpydoc m2r +numpy +numpydoc +PyForecastTools +pysat From 21702c613ba9f2e1adde4cd306ea7db8acabe7e3 Mon Sep 17 00:00:00 2001 From: Angeline Burrell Date: Fri, 17 Apr 2020 09:35:46 -0400 Subject: [PATCH 3/3] STY: comments and import order Removed unnecessary comments, changed import order to be alphabetical, and removed python 2.7 classifier. --- setup.py | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/setup.py b/setup.py index 6fcdb5c9..f1b704e9 100644 --- a/setup.py +++ b/setup.py @@ -4,8 +4,8 @@ # Full license can be found in License.md and AUTHORS.md # ----------------------------------------------------------------------------- -import os import codecs +import os from setuptools import setup, find_packages @@ -16,13 +16,11 @@ with codecs.open(os.path.join(here, version_filename)) as version_file: version = version_file.read().strip() -# change setup.py for readthedocs - commented for now -# on_rtd = os.environ.get('READTHEDOCS') == 'True' +# Define requirements install_requires = ['pysat', 'scipy', 'pandas', 'xarray', 'numpy', 'PyForecastTools'] # Run setup - setup(name='pysatModels', version=version, url='github.com/pysat/pysatModels', @@ -31,20 +29,16 @@ description='Model-data comparisons for the pysat ecosystem', long_description=long_description, packages=find_packages(), - classifiers=[ - "Development Status :: 4 - Beta", - "Topic :: Scientific/Engineering :: Physics", - "Intended Audience :: Science/Research", - "License :: BSD", - "Natural Language :: English", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Operating System :: MacOS :: MacOS X", - ], + classifiers=["Development Status :: 4 - Beta", + "Topic :: Scientific/Engineering :: Physics", + "Intended Audience :: Science/Research", + "License :: BSD", + "Natural Language :: English", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Operating System :: MacOS :: MacOS X",], include_package_data=True, zip_safe=False, - install_requires=install_requires, - ) + install_requires=install_requires,)