Skip to content

Commit 98f3b52

Browse files
committed
Merge pull request #93 from wholmgren/pvsystem
Location demotion and PVSystem/LocalizedPVSystem/ModelChain addition
2 parents b7d8e64 + ab69f9a commit 98f3b52

32 files changed

+2900
-509
lines changed

appveyor.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ install:
3131
- "python --version"
3232
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
3333

34-
# install xray and depenencies
35-
- "conda install --yes --quiet pip numpy scipy pandas nose pytz ephem numba"
34+
# install depenencies
35+
- "conda install --yes --quiet pip numpy scipy=0.16.0 pandas nose pytz ephem numba"
36+
37+
# install pvlib
3638
- "python setup.py install"
3739

3840
build: false
3941

4042
test_script:
41-
- "nosetests -v pvlib"
43+
- "nosetests -v pvlib"

ci/requirements-py27-min.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ name: test_env
22
dependencies:
33
- python=2.7
44
- numpy==1.8.2
5-
- scipy
65
- pandas==0.13.1
76
- nose
87
- pytz
9-
- ephem
108
- pip:
119
- coveralls

docs/environment.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name: pvlib
22
dependencies:
3-
- python=2.7
3+
- python=2.7
44
- numpy
55
- scipy
66
- pandas
77
- pytz
88
- ephem
99
- numba
10-
- ipython
10+
- ipython=4.0.1
1111
- sphinx
1212
- numpydoc
1313
- matplotlib

docs/sphinx/source/_static/.gitignore

Whitespace-only changes.

docs/sphinx/source/classes.rst

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
.. _classes:
2+
3+
Classes
4+
=======
5+
6+
pvlib-python provides a collection of classes
7+
for users that prefer object-oriented programming.
8+
These classes can help users keep track of data in a more organized way,
9+
and can help to simplify the modeling process.
10+
The classes do not add any functionality beyond the procedural code.
11+
Most of the object methods are simple wrappers around the
12+
corresponding procedural code.
13+
14+
Location
15+
--------
16+
.. autoclass:: pvlib.location.Location
17+
:members:
18+
:undoc-members:
19+
:show-inheritance:
20+
21+
PVSystem
22+
--------
23+
.. autoclass:: pvlib.pvsystem.PVSystem
24+
:members:
25+
:undoc-members:
26+
:show-inheritance:
27+
28+
ModelChain
29+
----------
30+
.. autoclass:: pvlib.modelchain.ModelChain
31+
:members:
32+
:undoc-members:
33+
:show-inheritance:
34+
35+
LocalizedPVSystem
36+
-----------------
37+
.. autoclass:: pvlib.pvsystem.LocalizedPVSystem
38+
:members:
39+
:undoc-members:
40+
:show-inheritance:
41+
42+
SingleAxisTracker
43+
-----------------
44+
.. autoclass:: pvlib.tracking.SingleAxisTracker
45+
:members:
46+
:undoc-members:
47+
:show-inheritance:
48+
49+
LocalizedSingleAxisTracker
50+
--------------------------
51+
.. autoclass:: pvlib.tracking.LocalizedSingleAxisTracker
52+
:members:
53+
:undoc-members:
54+
:show-inheritance:
55+

docs/sphinx/source/conf.py

+12-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ def __getattr__(cls, name):
3737

3838
# -- General configuration ------------------------------------------------
3939

40+
# turns off numpydoc autosummary warnings
41+
numpydoc_show_class_members = False
42+
4043
# If your documentation needs a minimal Sphinx version, state it here.
4144
#needs_sphinx = '1.0'
4245

@@ -127,7 +130,15 @@ def __getattr__(cls, name):
127130

128131
# The theme to use for HTML and HTML Help pages. See the documentation for
129132
# a list of builtin themes.
130-
html_theme = 'default'
133+
# on_rtd is whether we are on readthedocs.org
134+
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
135+
136+
if not on_rtd: # only import and set the theme if we're building docs locally
137+
import sphinx_rtd_theme
138+
html_theme = 'sphinx_rtd_theme'
139+
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
140+
else:
141+
html_theme = 'default'
131142

132143
# Theme options are theme-specific and customize the look and feel of a theme
133144
# further. For a list of options available for each theme, see the

docs/sphinx/source/index.rst

+3-2
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,12 @@ Contents
6060
:maxdepth: 2
6161

6262
self
63+
package_overview
6364
whatsnew
65+
modules
66+
classes
6467
comparison_pvlib_matlab
6568
variables_style_rules
66-
pvlib
67-
6869

6970

7071
Indices and tables

docs/sphinx/source/pvlib.rst renamed to docs/sphinx/source/modules.rst

+17-9
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,79 @@
11
Modules
22
=======
33

4-
atmosphere module
4+
atmosphere
55
-----------------
66

77
.. automodule:: pvlib.atmosphere
88
:members:
99
:undoc-members:
1010
:show-inheritance:
1111

12-
clearsky module
12+
clearsky
1313
----------------
1414

1515
.. automodule:: pvlib.clearsky
1616
:members:
1717
:undoc-members:
1818
:show-inheritance:
1919

20-
irradiance module
20+
irradiance
2121
-----------------
2222

2323
.. automodule:: pvlib.irradiance
2424
:members:
2525
:undoc-members:
2626
:show-inheritance:
2727

28-
location module
28+
location
2929
---------------
3030

3131
.. automodule:: pvlib.location
3232
:members:
3333
:undoc-members:
3434
:show-inheritance:
3535

36-
pvsystem module
36+
modelchain
37+
----------
38+
39+
.. automodule:: pvlib.modelchain
40+
:members:
41+
:undoc-members:
42+
:show-inheritance:
43+
44+
pvsystem
3745
---------------
3846

3947
.. automodule:: pvlib.pvsystem
4048
:members:
4149
:undoc-members:
4250
:show-inheritance:
4351

44-
solarposition module
52+
solarposition
4553
--------------------
4654

4755
.. automodule:: pvlib.solarposition
4856
:members:
4957
:undoc-members:
5058
:show-inheritance:
5159

52-
tmy module
60+
tmy
5361
--------------------
5462

5563
.. automodule:: pvlib.tmy
5664
:members:
5765
:undoc-members:
5866
:show-inheritance:
5967

60-
tracking module
68+
tracking
6169
--------------------
6270

6371
.. automodule:: pvlib.tracking
6472
:members:
6573
:undoc-members:
6674
:show-inheritance:
6775

68-
tools module
76+
tools
6977
--------------------
7078

7179
.. automodule:: pvlib.tools

0 commit comments

Comments
 (0)