8000 python >= 3.6, add scipy 1.2.0 to min requirements (#1035) · unoffices/pvlib-python@edea606 · GitHub
[go: up one dir, main page]
Skip to content

Commit edea606

Browse files
wholmgrenwholmgren
authored
python >= 3.6, add scipy 1.2.0 to min requirements (pvlib#1035)
* add scipy==1.2.0 to min requirements * missed a needs numpy 10 * revert an import change in test_location * whats new * add missing requires_tables * import cleanup. fix stray requires_scipy * and fix new requires_scipy marks * remove unneeded pytest.param * fix depedency specs * lint * sdm.py import clean up * move 3.5 packages to pip. spec versions in all yml files * require python 3.6 or greater * remove 3.5 ci, rename 35 min file * update ci for 36 * remove from readme * installation instructions * fix python 3.5 references in contributing
1 parent 0271a3e commit edea606

32 files changed

+72
-354
lines changed

‎README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,6 @@ Installation
105105
pvlib-python releases may be installed using the ``pip`` and ``conda`` tools.
106106
Please see the [Installation page](http://pvlib-python.readthedocs.io/en/stable/installation.html) of the documentation for complete instructions.
107107

108-
pvlib-python is compatible with Python 3.5 and above.
109-
110-
**Python 2.7 support ended on June 1, 2019, with pvlib-python 0.6.3.**
111-
112108

113109
Contributing
114110
============

‎ci/azure/conda_linux.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ jobs:
88
vmImage: ${{ parameters.vmImage }}
99
strategy:
1010
matrix:
11-
Python35:
12-
python.version: '35'
13-
Python35-min:
14-
python.version: '35'
11+
Python36-min:
12+
python.version: '36'
1513
suffix: '-min'
1614
Python36:
1715
python.version: '36'

‎ci/azure/conda_windows.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ jobs:
88
vmImage: ${{ parameters.vmImage }}
99
strategy:
1010
matrix:
11-
Python35-windows:
12-
python.version: '35'
1311
Python36-windows:
1412
python.version: '36'
1513
Python37-windows:

‎ci/azure/posix.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ jobs:
88
vmImage: ${{ parameters.vmImage }}
99
strategy:
1010
matrix:
11-
Python35:
12-
python.version: '3.5'
1311
Python36:
1412
python.version: '3.6'
1513
Python37:

‎ci/requirements-py35.yml

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

‎ci/requirements-py35-min.yml renamed to ‎ci/requirements-py36-min.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ dependencies:
99
- pytest-cov
1010
- pytest-mock
1111
- pytest-timeout
12-
- python=3.5
12+
- python=3.6
1313
- pytz
1414
- requests
1515
- pip:
1616
- numpy==1.12.0
1717
- pandas==0.22.0
18+
- scipy==1.2.0
1819
- pytest-rerunfailures # conda version is >3.6
1920
- pytest-remotedata # conda package is 0.3.0, needs > 0.3.1

‎ci/requirements-py36.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ dependencies:
99
- netcdf4
1010
- nose
1111
- numba
12-
- numpy
13-
- pandas
12+
- numpy >= 1.12.0
13+
- pandas >= 0.22.0
1414
- pip
1515
- pytables # tables when using pip+PyPI
1616
- pytest
@@ -22,7 +22,7 @@ dependencies:
2222
- python=3.6
2323
- pytz
2424
- requests
25-
- scipy
25+
- scipy >= 1.2.0
2626
- shapely # pvfactors dependency
2727
- siphon # conda-forge
2828
- statsmodels

‎ci/requirements-py37.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ dependencies:
99
- netcdf4
1010
- nose
1111
- numba
12-
- numpy
13-
- pandas
12+
- numpy >= 1.12.0
13+
- pandas >= 0.22.0
1414
- pip
1515
- pytables # tables when using pip+PyPI
1616
- pytest
@@ -22,7 +22,7 @@ dependencies:
2222
- python=3.7
2323
- pytz
2424
- requests
25-
- scipy
25+
- scipy >= 1.2.0
2626
- shapely # pvfactors dependency
2727
- siphon # conda-forge
2828
- statsmodels

‎ci/requirements-py38.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ dependencies:
99
- netcdf4
1010
- nose
1111
- numba
12-
- numpy
13-
- pandas
12+
- numpy >= 1.12.0
13+
- pandas >= 0.22.0
1414
- pip
1515
- pytables # tables when using pip+PyPI
1616
- pytest
@@ -22,7 +22,7 @@ dependencies:
2222
- python=3.8
2323
- pytz
2424
- requests
25-
- scipy
25+
- scipy >= 1.2.0
2626
- shapely # pvfactors dependency
2727
- siphon # conda-forge
2828
- statsmodels

‎docs/sphinx/source/contributing.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,6 @@ 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 and above.
200-
201199
pvlib python uses a mix of full and abbreviated variable names. See
202200
:ref:`variables_style_rules`. We could be better about consistency.
203201
Prefer full names for new contributions. This is especially important
@@ -475,9 +473,10 @@ PVSystem method is called through ``ModelChain.run_model``.
475473
mc.run_model(times)
476474
477475
# assertion fails if PVSystem.sapm is not called once
478-
# if using returned m, prefer this over m.assert_called_once()
479-
# for compatibility with python < 3.6
480-
assert m.call_count == 1
476+
m.assert_called_once()
477+
478+
# use `assert m.call_count == num` if function should be called
479+
# more than once
481480
482481
# ensure that dc attribute now exists and is correct type
483482
assert isinstance(mc.dc, (pd.Series, pd.DataFrame))

0 commit comments

Comments
 (0)
0