Skip to content

Commit aa643d5

Browse files
committed
change authors, clean up setup.py (#186)
* setup.py authors and minor updates * update setup.py descriptions * update whatsnew * tweak matlab origin story
1 parent 7b12fb3 commit aa643d5

File tree

4 files changed

+49
-25
lines changed

4 files changed

+49
-25
lines changed

README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ pvlib-python
88
[![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.50141.svg)](http://dx.doi.org/10.5281/zenodo.50141)
99

1010

11-
pvlib-python is a community supported tool that provides a set of functions and classes for simulating the performance of photovoltaic energy systems.
12-
The toolbox was originally developed in MATLAB at Sandia National Laboratories and it implements many of the models and methods developed at the Labs.
13-
More information on Sandia Labs PV performance modeling programs can be found at https://pvpmc.sandia.gov/.
14-
We collaborate with the PVLIB-MATLAB project, but operate independently of it.
11+
PVLIB Python is a community supported tool that provides a set of
12+
functions and classes for simulating the performance of photovoltaic
13+
energy systems. PVLIB Python was originally ported from the PVLIB MATLAB
14+
toolbox developed at Sandia National Laboratories and it implements many
15+
of the models and methods developed at the Labs. More information on
16+
Sandia Labs PV performance modeling programs can be found at
17+
https://pvpmc.sandia.gov/. We collaborate with the PVLIB MATLAB project,
18+
but operate independently of it.
1519

1620

1721
Documentation

docs/sphinx/source/index.rst

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
pvlib-python
22
========================================
33

4-
pvlib-python provides a set of documented functions for simulating the
5-
performance of photovoltaic energy systems. The toolbox was originally
6-
developed in MATLAB at Sandia National Laboratories and it implements
7-
many of the models and methods developed at the Labs. More information
8-
on Sandia Labs PV performance modeling programs can be found at
9-
https://pvpmc.sandia.gov/.
4+
PVLIB Python is a community supported tool that provides a set of
5+
functions and classes for simulating the performance of photovoltaic
6+
energy systems. PVLIB Python was originally ported from the PVLIB MATLAB
7+
toolbox developed at Sandia National Laboratories and it implements many
8+
of the models and methods developed at the Labs. More information on
9+
Sandia Labs PV performance modeling programs can be found at
10+
https://pvpmc.sandia.gov/. We collaborate with the PVLIB MATLAB project,
11+
but operate independently of it.
1012

1113
The source code for pvlib-python is hosted on `github
1214
<https://github.com/pvlib/pvlib-python>`_.

docs/sphinx/source/whatsnew/v0.3.3.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ Documentation
3232
* Fix version number in 0.3.2 whatsnew file.
3333
* Shorten README.md file and move information to official documentation.
3434
(:issue:`182`)
35+
* Change authors to *PVLIB Python Developers* and clean up setup.py.
36+
(:issue:`184`)
3537

3638

3739
Other

setup.py

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,38 @@
1515
import versioneer
1616

1717

18-
DESCRIPTION = 'The PVLIB toolbox provides a set functions for simulating the performance of photovoltaic energy systems.'
19-
LONG_DESCRIPTION = open('README.md').read()
18+
DESCRIPTION = ('A set of functions and classes for simulating the ' +
19+
'performance of photovoltaic energy systems.')
20+
LONG_DESCRIPTION = """
21+
PVLIB Python is a community supported tool that provides a set of
22+
functions and classes for simulating the performance of photovoltaic
23+
energy systems. PVLIB Python was originally ported from the PVLIB MATLAB
24+
toolbox developed at Sandia National Laboratories and it implements many
25+
of the models and methods developed at the Labs. More information on
26+
Sandia Labs PV performance modeling programs can be found at
27+
https://pvpmc.sandia.gov/. We collaborate with the PVLIB MATLAB project,
28+
but operate independently of it.
29+
30+
We need your help to make pvlib-python a great tool!
31+
32+
Documentation: http://pvlib-python.readthedocs.io
33+
34+
Source code: https://github.com/pvlib/pvlib-python
35+
"""
2036

2137
DISTNAME = 'pvlib'
22-
LICENSE = 'The BSD 3-Clause License'
23-
AUTHOR = 'Dan Riley, Clifford Hanson, Rob Andrews, Will Holmgren, github contributors'
38+
LICENSE = 'BSD 3-Clause'
39+
AUTHOR = 'PVLIB Python Developers'
2440
MAINTAINER_EMAIL = '[email protected]'
2541
URL = 'https://github.com/pvlib/pvlib-python'
2642

43+
INSTALL_REQUIRES = ['numpy >= 1.8.2',
44+
'pandas >= 0.13.1',
45+
'pytz',
46+
'six',
47+
]
48+
TESTS_REQUIRE = ['nose']
49+
2750
CLASSIFIERS = [
2851
'Development Status :: 4 - Beta',
2952
'License :: OSI Approved :: BSD License',
@@ -39,17 +62,8 @@
3962
'Topic :: Scientific/Engineering',
4063
]
4164

42-
# check python version.
43-
if not sys.version_info[:2] in ((2,7), (3,3), (3,4), (3,5)):
44-
sys.exit('%s requires Python 2.7, 3.3, or 3.4' % DISTNAME)
45-
4665
setuptools_kwargs = {
4766
'zip_safe': False,
48-
'install_requires': ['numpy >= 1.8.2',
49-
'pandas >= 0.13.1',
50-
'pytz',
51-
'six',
52-
],
5367
'scripts': [],
5468
'include_package_data': True
5569
}
@@ -68,18 +82,20 @@
6882
print('all spa_c files found')
6983
PACKAGES.append('pvlib.spa_c_files')
7084

71-
spa_ext = Extension('pvlib.spa_c_files.spa_py',
85+
spa_ext = Extension('pvlib.spa_c_files.spa_py',
7286
sources=spa_sources, depends=spa_depends)
7387
extensions.append(spa_ext)
7488
else:
7589
print('WARNING: spa_c files not detected. ' +
7690
'See installation instructions for more information.')
7791

78-
92+
7993
setup(name=DISTNAME,
8094
version=versioneer.get_version(),
8195
cmdclass=versioneer.get_cmdclass(),
8296
packages=PACKAGES,
97+
install_requires=INSTALL_REQUIRES,
98+
tests_require=TESTS_REQUIRE,
8399
ext_modules=extensions,
84100
description=DESCRIPTION,
85101
long_description=LONG_DESCRIPTION,

0 commit comments

Comments
 (0)