From 078079ab7ef5efcab403d3b1fb430aff15fffb50 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Sat, 28 Feb 2015 14:20:55 -0700 Subject: [PATCH 1/2] fix description and url --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index db5155ef5c..d877d864fb 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ except ImportError: raise RuntimeError('setuptools is required') -DESCRIPTION = 'Pythonic port of the python port of the PVLIB package' +DESCRIPTION = 'The PVLIB toolbox provides a set functions for simulating the performance of photovoltaic energy systems.' LONG_DESCRIPTION = open('README.md').read() # consider changing name to pythonic-pvlib @@ -19,7 +19,7 @@ LICENSE = 'The BSD 3-Clause License' AUTHOR = 'Dan Riley, Clifford Hanson, Rob Andrews, Will Holmgren, github contributors' MAINTAINER_EMAIL = 'holmgren@email.arizona.edu' -URL = 'https://github.com/UARENForecasting/pythonic-PVLIB' +URL = 'https://github.com/pvlib/pvlib-python' # imports __version__ into the local namespace version_file = os.path.join(os.path.dirname(__file__), 'pvlib/version.py') From 373eaeaf4232751c3e132a18df6afbe05a35f53e Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Sat, 28 Feb 2015 15:09:36 -0700 Subject: [PATCH 2/2] add version checking. remove old comments --- setup.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index d877d864fb..6a831e2ada 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,6 @@ DESCRIPTION = 'The PVLIB toolbox provides a set functions for simulating the performance of photovoltaic energy systems.' LONG_DESCRIPTION = open('README.md').read() -# consider changing name to pythonic-pvlib DISTNAME = 'pvlib' LICENSE = 'The BSD 3-Clause License' AUTHOR = 'Dan Riley, Clifford Hanson, Rob Andrews, Will Holmgren, github contributors' @@ -27,8 +26,8 @@ exec(f.read()) # check python version. -#if sys.version_info[:2] != (2, 7): -# sys.exit('%s requires Python 2.7' % DISTNAME) +if not sys.version_info[:2] in ((2,7), (3,3), (3,4)): + sys.exit('%s requires Python 2.7, 3.3, or 3.4' % DISTNAME) setuptools_kwargs = { 'zip_safe': False, @@ -42,15 +41,8 @@ } # more packages that we should consider requiring: -# 'scipy >= 0.14.0', -# 'matplotlib', -# 'ipython >= 2.0', -# 'pyzmq >= 2.1.11', -# 'jinja2', -# 'tornado', # 'pyephem', - # set up pvlib packages to be installed and extensions to be compiled PACKAGES = ['pvlib', 'pvlib.spa_c_files']