Skip to content

Commit f448798

Browse files
committed
Merge pull request #108 from wholmgren/rtdconda
Use conda on readthedocs
2 parents 4da65ee + bf4794b commit f448798

23 files changed

+23
-5280
lines changed

docs/environment.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: pvlib
2+
dependencies:
3+
- python=2.7
4+
- numpy
5+
- scipy
6+
- pandas
7+
- pytz
8+
- ephem
9+
- numba
10+
- ipython
11+
- sphinx
12+
- numpydoc
13+
- matplotlib
14+
- seaborn

docs/sphinx/source/conf.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ class Mock(MagicMock):
2626
def __getattr__(cls, name):
2727
return Mock()
2828

29-
MOCK_MODULES = ['scipy', 'scipy.io', 'numpy', 'ephem', 'pandas',
30-
'pvlib.spa_c_files.spa_py', 'dateutil']
29+
MOCK_MODULES = []
3130
sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
3231

3332
# If extensions (or modules to document with autodoc) are in another directory,
@@ -50,7 +49,9 @@ def __getattr__(cls, name):
5049
'sphinx.ext.viewcode',
5150
'sphinx.ext.extlinks',
5251
'numpydoc',
53-
'sphinx.ext.autosummary'
52+
'sphinx.ext.autosummary',
53+
'IPython.sphinxext.ipython_directive',
54+
'IPython.sphinxext.ipython_console_highlighting',
5455
]
5556

5657
# Add any paths that contain templates here, relative to this directory.

docs/sphinx/sphinxext/README.rst

Lines changed: 0 additions & 11 deletions
This file was deleted.

docs/sphinx/sphinxext/ipython_console_highlighting.py

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)