Skip to content

Commit 990ea4e

Browse files
Address code review comments
1 parent 3854746 commit 990ea4e

File tree

7 files changed

+23
-44
lines changed

7 files changed

+23
-44
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Installation
3232
pvlib-python releases may be installed using the ``pip`` and ``conda`` tools.
3333
Please see the [Installation page](http://pvlib-python.readthedocs.io/en/latest/installation.html) of the documentation for complete instructions.
3434

35-
pvlib-python is compatible with Python 3.5-7.
35+
pvlib-python is compatible with Python 3.5 and above.
3636

3737
**Python 2.7 support ended on June 1, 2019, with pvlib-python 0.6.3.**
3838

docs/environment.yml

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,18 @@ channels:
33
- conda-forge
44
- defaults
55
dependencies:
6-
- coveralls
7-
- cython
8-
- ephem
9-
- ipython
10-
- matplotlib
11-
- netcdf4
12-
- nose
13-
- numba
14-
- numpy
15-
- pandas
16-
- pip
17-
- pytables # tables when using pip+PyPI
18-
- pytest
19-
- pytest-cov
20-
- pytest-mock
21-
- pytest-timeout
226
- python=3.6
23-
- pytz
24-
- requests
7+
- numpy=1.14.2
258
- scipy
26-
- shapely # pvfactors dependency
27-
- siphon # conda-forge
28-
- sphinx
29-
- sphinx_rtd_theme
30-
- pip:
31-
- pvfactors==1.0.1
9+
- pytables
10+
- pandas=0.22.0
11+
- pytz
12+
- ephem
13+
- numba
14+
- ipython=6.3
15+
- matplotlib=2.2.2
16+
- siphon=0.7.0
17+
- sphinx=1.7.2
18+
- netCDF4=1.3.1
19+
- hdf4=4.2.12
20+
- sphinx_rtd_theme

docs/sphinx/source/conf.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
import os
1717

1818
# Mock modules so RTD works
19-
try:
20-
from mock import Mock as MagicMock
21-
except ImportError:
22-
from unittest.mock import MagicMock
19+
from unittest.mock import MagicMock
20+
2321

2422
class Mock(MagicMock):
2523
@classmethod

docs/sphinx/source/contributing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ pvlib python generally follows the `PEP 8 -- Style Guide for Python Code
196196
<https://www.python.org/dev/peps/pep-0008/>`_. Maximum line length for code
197197
is 79 characters.
198198

199-
Code must be compatible with Python 3.5-7.
199+
Code must be compatible with Python 3.5 and above.
200200

201201
pvlib python uses a mix of full and abbreviated variable names. See
202202
:ref:`variables_style_rules`. We could be better about consistency.

docs/sphinx/source/installation.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,7 @@ Any changes that you make to this pvlib-python will be available inside
201201
your environment. If you run a git checkout, branch, or pull command the
202202
result will be applied to your pvlib-python installation. This
203203
is great for development. Note, however, that you will need to use
204-
Python's ``reload`` function (`python 2
205-
<https://docs.python.org/2/library/functions.html#reload>`_, `python 3
204+
Python's ``reload`` function (`python 3
206205
<https://docs.python.org/3/library/importlib.html#importlib.reload>`_)
207206
if you make changes to pvlib during an interactive Python
208207
session (including a Jupyter notebook). Restarting the Python
@@ -216,7 +215,7 @@ environment) when you start a new shell or terminal.
216215
Compatibility
217216
-------------
218217

219-
pvlib-python is compatible with Python 3.5-7.
218+
pvlib-python is compatible with Python 3.5 and above.
220219

221220
pvlib-python requires Pandas and Numpy. The minimum version requirements
222221
are specified in

pvlib/__init__.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
# First ensure proper Python version.
2-
import sys
3-
if not ((3, 5) <= sys.version_info and sys.version_info < (3, 8)):
4-
raise RuntimeError("Current Python version is {}.{}.{}, but pvlib-python \
5-
is only compatible with Python 3.5-7.".format(
6-
sys.version_info[0], sys.version_info[1], sys.version_info[2]))
7-
81
from pvlib.version import __version__
92
from pvlib import tools
103
from pvlib import atmosphere

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
URL = 'https://github.com/pvlib/pvlib-python'
3939

4040
INSTALL_REQUIRES = ['numpy >= 1.10.1',
41-
'pandas >= 0.16.0',
41+
'pandas >= 0.18.0',
4242
'pytz',
4343
'requests']
4444
TESTS_REQUIRE = ['nose', 'pytest', 'pytest-cov', 'pytest-mock',
4545
'pytest-timeout']
4646
EXTRAS_REQUIRE = {
47-
'optional': ['scipy', 'tables', 'numba', 'siphon', 'netcdf4',
48-
'ephem', 'cython', 'pvfactors == 1.0.1'],
49-
'doc': ['sphinx', 'ipython', 'sphinx_rtd_theme', 'matplotlib'],
47+
'optional': ['ephem', 'cython', 'netcdf4', 'numba', 'pvfactors', 'scipy',
48+
'siphon', 'tables'],
49+
'doc': ['ipython', 'matplotlib', 'sphinx', 'sphinx_rtd_theme'],
5050
'test': TESTS_REQUIRE
5151
}
5252
EXTRAS_REQUIRE['all'] = sorted(set(sum(EXTRAS_REQUIRE.values(), [])))

0 commit comments

Comments
 (0)