Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2e98b39

Browse filesBrowse files
dstansbydstansby
committed
Convert all environment variables to pip requirements files
1 parent 4a7268e commit 2e98b39
Copy full SHA for 2e98b39

File tree

Expand file treeCollapse file tree

4 files changed

+23
-45
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+23
-45
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+2-44Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,6 @@ env:
4848
- secure: RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
4949
- secure: E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
5050
- secure: dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU=
51-
# Variables controlling Python dependencies.
52-
- DATEUTIL=python-dateutil
53-
- NOSE=
54-
- PANDAS=
55-
- JUPYTER=
56-
- PYPARSING=pyparsing
57-
# pytest-timeout master depends on pytest>=3.6. Testing with pytest 3.4 is
58-
# still supported; this is tested by the first matrix entry.
59-
- PYTEST='pytest>=3.6'
60-
- PYTEST_COV=pytest-cov
61-
- PYTEST_PEP8=
62-
- PYTEST_TIMEOUT=pytest-timeout
63-
- SPHINX=sphinx
6451
# Variables controlling the build.
6552
- MPLLOCALFREETYPE=1
6653
# Variables controlling the test run.
@@ -80,27 +67,15 @@ matrix:
8067
- python: 3.5
8168
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
8269
env:
83-
- CYCLER=cycler==0.10
84-
- DATEUTIL=python-dateutil==2.1
85-
- NOSE=nose
86-
- NUMPY=numpy==1.10.0
87-
- PANDAS='pandas<0.21.0'
88-
- PYPARSING=pyparsing==2.0.1
89-
- PYTEST=pytest==3.4
90-
- PYTEST_COV=pytest-cov==2.3.1
91-
- PYTEST_TIMEOUT=pytest-timeout==1.2.1 # Newer pytest-timeouts don't support pytest 3.4.
92-
- SPHINX=sphinx==1.3
9370
- EXTRAREQS='requirements/testing/travis35.txt'
9471
- python: 3.5
9572
env:
9673
# - PYTHONOPTIMIZE=2 # This currently doesn't work.
9774
- python: 3.6
9875
env:
9976
- DELETE_FONT_CACHE=1
100-
- PANDAS='pandas<0.21.0'
101-
- JUPYTER='jupyter'
102-
- PYTEST_PEP8=pytest-pep8
10377
- PYTEST_ADDOPTS="$PYTEST_ADDOPTS --pep8"
78+
- EXTRAREQS='requirements/testing/travis36.txt'
10479
- python: "nightly"
10580
env: PRE=--pre
10681
- os: osx
@@ -145,16 +120,7 @@ install:
145120
- |
146121
# Install dependencies from PyPI.
147122
python -mpip install --upgrade $PRE -r requirements/testing/travis_all.txt
148-
python -mpip install --upgrade -r $EXTRAREQS
149-
python -mpip install --upgrade $PRE \
150-
$CYCLER \
151-
$DATEUTIL \
152-
$NOSE \
153-
$NUMPY \
154-
$PANDAS \
155-
$JUPYTER \
156-
$PYPARSING \
157-
$SPHINX \
123+
python -mpip install --upgrade $PRE -r $EXTRAREQS
158124
# GUI toolkits are pip-installable only for some versions of Python so
159125
# don't fail if we can't install them. Make it easier to check whether the
160126
# install was successful by trying to import the toolkit (sometimes, the
@@ -175,14 +141,6 @@ install:
175141
echo 'wxPython is available' ||
176142
echo 'wxPython is not available'
177143
178-
python -mpip install $PRE \
179-
$PYTEST \
180-
$PYTEST_COV \
181-
pytest-faulthandler \
182-
$PYTEST_PEP8 \
183-
pytest-rerunfailures \
184-
$PYTEST_TIMEOUT \
185-
pytest-xdist
186144
- |
187145
# Install matplotlib
188146
python -mpip install -ve .

‎requirements/testing/travis35.txt

Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Extra pip requirements for the first travis python 3.5 build
2+
13
cycler==0.10
24
python-dateutil==2.1
35
nose
@@ -6,5 +8,5 @@ pandas<0.21.0
68
pyparsing==2.0.1
79
pytest==3.4
810
pytest-cov==2.3.1
9-
pytest-timeout==1.2.1
11+
pytest-timeout==1.2.1 # Newer pytest-timeouts don't support pytest 3.4.
1012
sphinx==1.3

‎requirements/testing/travis36.txt

Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Extra pip requirements for the travis python 3.6 build
2+
3+
pandas<0.21.0
4+
jupyter
5+
pytest-pep8

‎requirements/testing/travis_all.txt

Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
1+
# pip requirements for all the travis builds
2+
13
codecov
24
coverage
35
cycler
46
numpy
57
pillow
8+
pyparsing
9+
# pytest-timeout master depends on pytest>=3.6. Testing with pytest 3.4 is
10+
# still supported; this is tested by the first travis python 3.5 build
11+
pytest>=3.6
12+
pytest-cov
13+
pytest-faulthandler
14+
pytest-rerunfailures
15+
pytest-timeout
16+
pytest-xdist
17+
python-dateutil
18+
sphinx
619
tornado

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.