Skip to content

API/TST: minimum versions #16536

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
dstansby merged 5 commits into from
Feb 20, 2020
Merged

API/TST: minimum versions #16536

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
5721ec0
API: bump minimum version of pyparsing to 2.0.3
tacaswell Feb 16, 2020
78f16ff
TST: test the "extra" dependencies on py37 and py38
tacaswell Feb 16, 2020
3a655b3
CI: don't install tox on travis
tacaswell Feb 16, 2020
e6a3fdd
CI: rely on setup.py to install dependencies
tacaswell Feb 16, 2020
410df49
CI: fix travis syntax
tacaswell Feb 18, 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
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,12 @@ matrix:
env:
- PINNEDVERS='-c requirements/testing/travis36minver.txt'
- DELETE_FONT_CACHE=1
- EXTRAREQS='-r requirements/testing/travis36.txt'
- 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:
- PRE=--pre
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Matplotlib requires the following dependencies:
* `dateutil <https://pypi.org/project/python-dateutil>`_ (>= 2.1)
* `kiwisolver <https://github.com/nucleic/kiwi>`_ (>= 1.0.0)
* `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>= 6.2)
* `pyparsing <https://pyparsing.wikispaces.com/>`_
* `pyparsing <https://pyparsing.wikispaces.com/>`_ (>=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
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion requirements/testing/travis36minver.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
cycler==0.10
python-dateutil==2.1
numpy==1.15.0
pyparsing==2.0.1
pyparsing==2.0.3
5 changes: 0 additions & 5 deletions requirements/testing/travis_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
# pip requirements for all the travis builds

coverage
cycler
numpy
Copy link
Member

@timhoffm timhoffm Feb 19, 2020

Choose a reason for hiding this comment

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

Why don't we need these anymore?

Copy link
Member

@Kojoley Kojoley Feb 19, 2020

Choose a reason for hiding this comment

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

They are matplotlib dependencies and will be installed anyway, the same change was proposed by @anntzer #16117 (comment)

Copy link
Member Author

@tacaswell tacaswell Feb 20, 2020

Choose a reason for hiding this comment

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

Correct, we should only specify these if we want to actively pin the back to an old version.

pillow
pyparsing
pytest!=4.6.0
pytest-cov
pytest-rerunfailures
pytest-timeout
pytest-xdist
python-dateutil
tornado
tox
2 changes: 1 addition & 1 deletion requirements/testing/travis36.txt → requirements/testing/travis_extra.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],

Expand Down