Skip to content

Drop Python 2 and 3.4 #728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wholmgren merged 12 commits into from
May 20, 2019
Merged

Drop Python 2 and 3.4 #728

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
91e1482
Drop Python 2 and 3.4
markcampanelli May 17, 2019
6207754
Fix travis for 3.7 and update azure
markcampanelli May 18, 2019
5dafd6c
Remove six dependency
markcampanelli May 18, 2019
e381237
Add min Travis build with consistent requirements and fixed tests
markcampanelli May 19, 2019
ef4168d
Pin pvfactors also in setup.py
markcampanelli May 19, 2019
554c104
Fix python version comparison for 3.7 patches
markcampanelli May 19, 2019
7406bb1
Revert unneeded test change
markcampanelli May 19, 2019
3854746
Remove Python 2 mock usages
markcampanelli May 19, 2019
990ea4e
Address code review comments
markcampanelli May 19, 2019
507428f
Appease the stickler
markcampanelli May 19, 2019
391cf72
Check for Python version range in setup.py
markcampanelli May 19, 2019
11408e6
Use more succint range syntax
markcampanelli May 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,14 @@ sudo: false # if false, use TravisCI's container based build
# someday add os: osx to specify osx, but python not yet supported on Travis
matrix:
include:
- python: 2.7
env: CONDA_ENV=py27-min
- python: 2.7
env: CONDA_ENV=py27
- python: 3.4
env: CONDA_ENV=py34
- python: 3.5
env: CONDA_ENV=py35
- python: 3.6
env:
- CONDA_ENV=py36
- TASK="coverage"
- DEPLOY_ENV="true"
- python: 3.6
- python: 3.7
Copy link
Contributor Author

@markcampanelli markcampanelli May 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wholmgren Do you know if this is a significant problem in the current builds?

Copy link
Member

@wholmgren wholmgren May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not a problem -- this only specifies the base travis python version. The conda requirements file specifies the python version that's actually used in the test environment. I figured it was better to use the same version for consistency. But Travis did not yet have a base 3.7 available when it came time to add it to build matrix, so I used 3.6.

Copy link
Contributor Author

@markcampanelli markcampanelli May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you check my update in 6207754?

It's based on travis-ci/travis-ci#9815.

Copy link
Contributor Author

@markcampanelli markcampanelli May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I missed the memo on this: Is the plan to retire Travis once the Azure pipelines are deemed stable?

Copy link
Member

@wholmgren wholmgren May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you check my update in 6207754?

I don't know what if any nuance there might be on this, but if it works and it's not noticeably slower then it's ok with me. Is there any benefit to making this change?

Is the plan to retire Travis once the Azure pipelines are deemed stable?

Main purpose of adding azure was that it let us remove appveyor. I want to see the azure pipelines documentation improve before making a plan to retire Travis.

Copy link
Contributor Author

@markcampanelli markcampanelli Sep 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just set up CI using Azure pipelines for Ubuntu 16.04, Windows, and macOS here. It might be nice to maintain only a single CI in pvlib.

Copy link
Member

@wholmgren wholmgren Sep 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the example! #719 tracks this - well, at least the macOS part. Additional work would be required to transition the deploy section of the travis config to azure. #727 also relevant.

env: CONDA_ENV=py37

addons:
Expand All @@ -38,11 +32,7 @@ cache:
# setup miniconda for numpy, scipy, pandas, etc.
before_install:
- echo "before install"
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
export PYVER="2";
else
export PYVER="3";
fi
- export PYVER="3"
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
export OSSTR="MacOSX-x86_64.sh";
else
Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@ Installation
pvlib-python releases may be installed using the ``pip`` and ``conda`` tools.
Please see the [Installation page](http://pvlib-python.readthedocs.io/en/latest/installation.html) of the documentation for complete instructions.

pvlib-python is compatible with Python versions 2.7 and 3.4-3.7.
pvlib-python is compatible with Python 3.5-7.

**Python 2.7 support will end on June 1, 2019**. Releases made after this
date will require Python 3.
**Python 2.7 support ended on June 1, 2019**.


Contributing
Expand Down
10 changes: 0 additions & 10 deletions ci/requirements-py27-min.yml
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions ci/requirements-py27.yml
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions ci/requirements-py34.yml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion docs/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ channels:
- defaults
dependencies:
- python=3.6
- mock # needed for local python 2.7 builds
- numpy=1.14.2
- scipy
- pytables
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/contributing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ pvlib python generally follows the `PEP 8 -- Style Guide for Python Code
<https://www.python.org/dev/peps/pep-0008/>`_. Maximum line length for code
is 79 characters.

Code must be compatible with python 2.7 and 3.4+.
Code must be compatible with Python 3.5-7.

pvlib python uses a mix of full and abbreviated variable names. See
:ref:`variables_style_rules`. We could be better about consistency.
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ environment) when you start a new shell or terminal.
Compatibility
-------------

pvlib-python is compatible with Python versions 2.7 and 3.4-3.7.
pvlib-python is compatible with Python 3.5-7.
Copy link
Member

@wholmgren wholmgren May 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest "3.5 and above".

Copy link
Member

@wholmgren wholmgren May 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also in readme and contributing.


pvlib-python requires Pandas and Numpy. The minimum version requirements
are specified in
Expand Down
1 change: 1 addition & 0 deletions docs/sphinx/source/whatsnew.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ What's New

These are new features and improvements of note in each release.

.. include:: whatsnew/v0.7.0.rst
.. include:: whatsnew/v0.6.3.rst
.. include:: whatsnew/v0.6.2.rst
.. include:: whatsnew/v0.6.1.rst
Expand Down
15 changes: 15 additions & 0 deletions docs/sphinx/source/whatsnew/v0.7.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.. _whatsnew_0700:

v0.7.0 (MONTH DAY, YEAR)
---------------------

This is a major release that drops support for Python 2 and Python 3.4. We
recommend all users of v0.6.3 upgrade to this release.

**Python 2.7 support ended on June 1, 2019**. (:issue:`501`)


Contributors
~~~~~~~~~~~~
* Mark Campanellli (:ghuser:`markcampanelli`)
* Will Holmgren (:ghuser:`wholmgren`)
3 changes: 0 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,7 @@
'Operating System :: OS Independent',
'Intended Audience :: Science/Research',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
Expand Down