From 5721ec0789220d7bced4a5e2d81b138d67862e80 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 16 Feb 2020 14:29:17 -0500 Subject: [PATCH 1/5] API: bump minimum version of pyparsing to 2.0.3 This prevents an inconsistent test environment because packaging 20.1 requires pyparsing >=2.0.2 Picked 2.0.3 as the change log noted that 2.0.3 fixes a major regression from 2.0.2. --- INSTALL.rst | 2 +- requirements/testing/travis36minver.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL.rst b/INSTALL.rst index 01de5172abb5..46c282052284 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -114,7 +114,7 @@ Matplotlib requires the following dependencies: * `dateutil `_ (>= 2.1) * `kiwisolver `_ (>= 1.0.0) * `Pillow `_ (>= 6.2) -* `pyparsing `_ +* `pyparsing `_ (>=2.0.3) 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 diff --git a/requirements/testing/travis36minver.txt b/requirements/testing/travis36minver.txt index 2cc084fbce19..2b012c01a6ce 100644 --- a/requirements/testing/travis36minver.txt +++ b/requirements/testing/travis36minver.txt @@ -3,4 +3,4 @@ cycler==0.10 python-dateutil==2.1 numpy==1.15.0 -pyparsing==2.0.1 +pyparsing==2.0.3 diff --git a/setup.py b/setup.py index b821d0d384d9..454727bd2394 100644 --- a/setup.py +++ b/setup.py @@ -262,7 +262,7 @@ def run(self): "kiwisolver>=1.0.1", "numpy>=1.15", "pillow>=6.2.0", - "pyparsing>=2.0.1,!=2.0.4,!=2.1.2,!=2.1.6", + "pyparsing>=2.0.3,!=2.0.4,!=2.1.2,!=2.1.6", "python-dateutil>=2.1", ], From 78f16ff59c7b823cab2797dc55275c27ccbb3ff4 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 16 Feb 2020 14:31:42 -0500 Subject: [PATCH 2/5] TST: test the "extra" dependencies on py37 and py38 When we set this up py36 was the newest (not the oldest) python we supported. --- .appveyor.yml | 2 +- .travis.yml | 3 ++- azure-pipelines.yml | 2 +- requirements/testing/{travis36.txt => travis_extra.txt} | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) rename requirements/testing/{travis36.txt => travis_extra.txt} (55%) diff --git a/.appveyor.yml b/.appveyor.yml index 0bf6a04d9773..668c5391de65 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -26,7 +26,7 @@ environment: - PYTHON_VERSION: "3.6" CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" TEST_ALL: "no" - EXTRAREQS: "-r requirements/testing/travis36.txt" + EXTRAREQS: "-r requirements/testing/travis_extra.txt" - PYTHON_VERSION: "3.7" CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64" TEST_ALL: "no" diff --git a/.travis.yml b/.travis.yml index 1a0e5f1d859c..c0e93ee730fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,9 +77,10 @@ matrix: env: - PINNEDVERS='-c requirements/testing/travis36minver.txt' - DELETE_FONT_CACHE=1 - - EXTRAREQS='-r requirements/testing/travis36.txt' - python: 3.7 + - EXTRAREQS='-r requirements/testing/travis_extra.txt' - python: 3.8 + - EXTRAREQS='-r requirements/testing/travis_extra.txt' - python: "nightly" env: - PRE=--pre diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ff8bebce434b..ec55329d462e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -93,7 +93,7 @@ steps: - bash: | python -m pip install --upgrade pip - python -m pip install -r requirements/testing/travis_all.txt -r requirements/testing/travis36.txt || + python -m pip install -r requirements/testing/travis_all.txt -r requirements/testing/travis_extra.txt || [[ "$PYTHON_VERSION" = 'Pre' ]] displayName: 'Install dependencies with pip' diff --git a/requirements/testing/travis36.txt b/requirements/testing/travis_extra.txt similarity index 55% rename from requirements/testing/travis36.txt rename to requirements/testing/travis_extra.txt index e3197a4d4ac4..19b6eb279272 100644 --- a/requirements/testing/travis36.txt +++ b/requirements/testing/travis_extra.txt @@ -1,4 +1,4 @@ -# Extra pip requirements for the travis python 3.6 build +# Extra pip requirements for the travis python 3.7+ builds ipykernel nbconvert[execute] From 3a655b3e1e9f6a0bdbd416c6668661a09c5e16e3 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 16 Feb 2020 14:35:09 -0500 Subject: [PATCH 3/5] CI: don't install tox on travis Should have been removed in 695e729f6e4673bc3c2ef9ab79530aea0f25ad14 --- requirements/testing/travis_all.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/testing/travis_all.txt b/requirements/testing/travis_all.txt index b8983c397f69..89406cebe116 100644 --- a/requirements/testing/travis_all.txt +++ b/requirements/testing/travis_all.txt @@ -12,4 +12,3 @@ pytest-timeout pytest-xdist python-dateutil tornado -tox From e6a3fdd192b762767e46de42e391751a9527492b Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 16 Feb 2020 14:35:27 -0500 Subject: [PATCH 4/5] CI: rely on setup.py to install dependencies --- requirements/testing/travis_all.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/requirements/testing/travis_all.txt b/requirements/testing/travis_all.txt index 89406cebe116..f7e15ed7f996 100644 --- a/requirements/testing/travis_all.txt +++ b/requirements/testing/travis_all.txt @@ -1,10 +1,6 @@ # pip requirements for all the travis builds coverage -cycler -numpy -pillow -pyparsing pytest!=4.6.0 pytest-cov pytest-rerunfailures From 410df491dead733061168b347f3d489aebb8d10e Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Tue, 18 Feb 2020 11:44:37 -0500 Subject: [PATCH 5/5] CI: fix travis syntax --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index c0e93ee730fb..7122d4b12764 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,8 +78,10 @@ matrix: - PINNEDVERS='-c requirements/testing/travis36minver.txt' - DELETE_FONT_CACHE=1 - python: 3.7 + env: - EXTRAREQS='-r requirements/testing/travis_extra.txt' - python: 3.8 + env: - EXTRAREQS='-r requirements/testing/travis_extra.txt' - python: "nightly" env: