Skip to content

Mnt drop py36 #17662

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
merged 5 commits into from
Jul 6, 2020
Merged

Mnt drop py36 #17662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd61ed1
MNT: bump minimum python-dateutil version to 2.7
tacaswell Jun 17, 2020
cfccfb8
MNT: bump minimum pyparsing to 2.2.1
tacaswell Jun 17, 2020
60b03f1
MNT: bump minimum numpy version to 1.16
tacaswell Jun 18, 2020
0828a91
DOC/TST: correctly document the minimum kiwisolver and test
tacaswell Jun 17, 2020
2295a0e
API: bump minimum version of Python to 3.7 for mpl 3.4
tacaswell Jun 17, 2020
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
17 changes: 7 additions & 10 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ environment:
# In theory we could use a single CONDA_INSTALL_LOCN because we construct
# the envs anyway. But using one for the right python version hopefully
# making things faster due to package caching.
- PYTHON_VERSION: "3.6"
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
- PYTHON_VERSION: "3.7"
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
TEST_ALL: "no"
EXTRAREQS: "-r requirements/testing/travis_extra.txt"
- PYTHON_VERSION: "3.7"
- PYTHON_VERSION: "3.8"
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
CONDA_INSTALL_LOCN: "C:\\Miniconda38-x64"

Copy link
Member Author

Choose a reason for hiding this comment

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

This doesn't work unless we update the windows image we are using.

TEST_ALL: "no"
EXTRAREQS: "-r requirements/testing/travis_extra.txt"

# We always use a 64-bit machine, but can build x86 distributions
# with the PYTHON_ARCH variable
Expand All @@ -55,19 +56,15 @@ install:
# For building, use a new environment
- conda create -q -n test-environment python=%PYTHON_VERSION% tk
- activate test-environment
# pull pywin32 from conda because on py38 there is something wrong with finding
Copy link
Member

Choose a reason for hiding this comment

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

Is that because of wrong conda above?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think so, we are still ending up with a py38 env and it should be de-coupled from Python version of the "base" conda enivorment. I think this has to do with Python tightening up its rules about how dlls are discovered. There are a bunch of related issues on the pywin32 issues tracker.

# the dlls when insalled from pip
- conda install -c conda-forge pywin32
- echo %PYTHON_VERSION% %TARGET_ARCH%
# Install dependencies from PyPI.
- python -mpip install --upgrade -r requirements/testing/travis_all.txt %EXTRAREQS% %PINNEDVERS%
# Install optional dependencies from PyPI.
# Sphinx is needed to run sphinxext tests
- python -mpip install --upgrade sphinx

# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
# https://github.com/matplotlib/matplotlib/issues/9176
- python -c "import sys; sys.exit(not (3,) < sys.version_info < (3,6,3))" && (
curl -sL https://github.com/python/cpython/pull/1224.patch |
patch -fsup 1 -d %CONDA_PREFIX% ) || cmd /c "exit /b 0"

# Show the installed packages + versions
- conda list

Expand Down
17 changes: 9 additions & 8 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,17 @@ commands:
#

jobs:
docs-python36:
docs-python37:
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
steps:
- checkout

- apt-install
- fonts-install
- pip-install
- deps-install:
numpy_version: "==1.13.0"

- deps-install
- mpl-install

- doc-build
Expand All @@ -130,17 +130,18 @@ jobs:
- store_artifacts:
path: doc/build/html

docs-python37:
docs-python38-min:
docker:
- image: circleci/python:3.7
- image: circleci/python:3.8
steps:
- checkout

- apt-install
- fonts-install
- pip-install

- deps-install
- deps-install:
numpy_version: "==1.16.0"
- mpl-install

- doc-build
Expand Down Expand Up @@ -185,6 +186,6 @@ workflows:
version: 2
build:
jobs:
- docs-python36
- docs-python37
- docs-python38
- docs-python38-min
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ env:

matrix:
include:
- python: 3.6
- python: 3.7
env:
- PINNEDVERS='-c requirements/testing/travis36minver.txt'
- PINNEDVERS='-c requirements/testing/minver.txt'
- DELETE_FONT_CACHE=1
- python: 3.7
env:
Expand Down
10 changes: 5 additions & 5 deletions INSTALL.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,14 @@ Matplotlib will automatically install dependencies when you install with

Matplotlib requires the following dependencies:

* `Python <https://www.python.org/downloads/>`_ (>= 3.6)
* `NumPy <https://numpy.org>`_ (>= 1.15)
* `Python <https://www.python.org/downloads/>`_ (>= 3.7)
* `NumPy <https://numpy.org>`_ (>= 1.16)
* `setuptools <https://setuptools.readthedocs.io/en/latest/>`_
* `cycler <https://matplotlib.org/cycler/>`_ (>= 0.10.0)
* `dateutil <https://pypi.org/project/python-dateutil>`_ (>= 2.1)
* `kiwisolver <https://github.com/nucleic/kiwi>`_ (>= 1.0.0)
* `dateutil <https://pypi.org/project/python-dateutil>`_ (>= 2.7)
* `kiwisolver <https://github.com/nucleic/kiwi>`_ (>= 1.0.1)
* `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>= 6.2)
* `pyparsing <https://pypi.org/project/pyparsing/>`_ (>=2.0.3)
* `pyparsing <https://pypi.org/project/pyparsing/>`_ (>=2.2.1)

Optionally, you can also install a number of packages to enable better user
interface toolkits. See :ref:`what-is-a-backend` for more details on the
Expand Down
9 changes: 0 additions & 9 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,18 @@

strategy:
matrix:
Linux_py36:
vmImage: 'ubuntu-16.04'
python.version: '3.6'
Linux_py37:
vmImage: 'ubuntu-16.04'
python.version: '3.7'
Linux_py38:
vmImage: 'ubuntu-16.04'
python.version: '3.8'
macOS_py36:
vmImage: 'macOS-10.14'
python.version: '3.6'
macOS_py37:
vmImage: 'macOS-10.15'
python.version: '3.7'
macOS_py38:
vmImage: 'macOS-latest'
python.version: '3.8'
Windows_py36:
vmImage: 'vs2017-win2016'
python.version: '3.6'
Windows_py37:
vmImage: 'vs2017-win2016'
python.version: '3.7'
Expand Down
22 changes: 22 additions & 0 deletions doc/api/next_api_changes/deprecations/17662-TAC.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Increase minimum supported versions of Python and dependencies
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


For Maptlotlib 3.4 the :ref:`minimum supported versions
<install_requirements>` are being bumped

+------------+-----------------+---------------+
| Dependency | min in mpl3.3 | min in mpl3.4 |
+============+=================+===============+
| Python | 3.6 | 3.7 |
+------------+-----------------+---------------+
| dateutil | 2.1 | 2.2.1 |
+------------+-----------------+---------------+
| numpy | 1.15 | 1.16 |
+------------+-----------------+---------------+
| pyparsing | 2.0.3 | 2.2.1 |
+------------+-----------------+---------------+


This consistent with our :ref:`min_deps_policy` and `NEP29
<https://numpy.org/neps/nep-0029-deprecation_policy.html>`__
2 changes: 1 addition & 1 deletion doc/devel/coding_guide.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ The current active branches are

*master*
The current development version. Future minor releases (*v3.N.0*) will be
branched from this. Supports Python 3.6+.
branched from this. Supports Python 3.7+.

*v3.N.x*
Maintenance branch for Matplotlib 3.N. Future patch releases will be
Expand Down
4 changes: 3 additions & 1 deletion doc/devel/min_dep_policy.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ specification of the dependencies.
========== ======== ======
Matplotlib Python NumPy
========== ======== ======
3.3 3.6 1.15.0
3.4 3.7 1.16.0
`3.3`_ 3.6 1.15.0
`3.2`_ 3.6 1.11.0
`3.1`_ 3.6 1.11.0
`3.0`_ 3.5 1.10.0
Expand All @@ -98,6 +99,7 @@ Matplotlib Python NumPy
1.0 2.4 1.1
========== ======== ======

.. _`3.3`: https://matplotlib.org/3.3.0/users/installing.html#dependencies
.. _`3.2`: https://matplotlib.org/3.2.0/users/installing.html#dependencies
.. _`3.1`: https://matplotlib.org/3.1.0/users/installing.html#dependencies
.. _`3.0`: https://matplotlib.org/3.0.0/users/installing.html#dependencies
Expand Down
2 changes: 1 addition & 1 deletion doc/devel/testing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ You can also run tox on a subset of environments:

.. code-block:: bash

$ tox -e py36,py37
$ tox -e py37,py38

Tox processes everything serially so it can take a long time to test
several environments. To speed it up, you might try using a new,
Expand Down
2 changes: 1 addition & 1 deletion doc/faq/installing_faq.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ the form of wheels.
pip is installed by default with python.org and Homebrew Python, but needs to
be manually installed on Macports with ::

sudo port install py36-pip
sudo port install py38-pip

Once pip is installed, you can install Matplotlib and all its dependencies with
from the Terminal.app command line::
Expand Down
7 changes: 7 additions & 0 deletions requirements/testing/minver.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Extra pip requirements for the minimum-version travis run

cycler==0.10
python-dateutil==2.7
numpy==1.16.0
pyparsing==2.2.1
kiwisolver==1.0.1
6 changes: 0 additions & 6 deletions requirements/testing/travis36minver.txt
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# and/or pip.
import sys

min_version = (3, 6)
min_version = (3, 7)

if sys.version_info < min_version:
error = """
Expand Down Expand Up @@ -280,10 +280,10 @@ def build_extensions(self):
install_requires=[
"cycler>=0.10",
"kiwisolver>=1.0.1",
"numpy>=1.15",
"numpy>=1.16",
"pillow>=6.2.0",
"pyparsing>=2.0.3,!=2.0.4,!=2.1.2,!=2.1.6",
"python-dateutil>=2.1",
"pyparsing>=2.2.1",
"python-dateutil>=2.7",
],

cmdclass=cmdclass,
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py36, py37, py38
envlist = py37, py38

[testenv]
changedir = /tmp
Expand Down