Skip to content

Commit 6fdfe91

Browse files
committed
Changes in azure-pipelines.yml and tox.ini inspired by pandas-dev#25217
1 parent e9f7619 commit 6fdfe91

File tree

2 files changed

+3
-32
lines changed

2 files changed

+3
-32
lines changed

azure-pipelines.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ jobs:
1010
name: Linux
1111
vmImage: ubuntu-16.04
1212

13-
# Windows Python 2.7 needs VC 9.0 installed, handled in the template
1413
- template: ci/azure/windows.yml
1514
parameters:
1615
name: Windows

tox.ini

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py27, py35, py36
7+
envlist = py35, py36, py37
88

99
[testenv]
1010
deps =
1111
cython
1212
nose
1313
pytest
14-
pytz>=2011k
14+
pytz>=2015.4
1515
python-dateutil
1616
beautifulsoup4
1717
lxml
@@ -43,40 +43,12 @@ commands =
4343
# tox should provide a preinstall-commands hook.
4444
pip uninstall pandas -qy
4545

46-
[testenv:py27]
47-
deps =
48-
numpy==1.8.1
49-
boto
50-
bigquery
51-
{[testenv]deps}
52-
5346
[testenv:py35]
5447
deps =
55-
numpy==1.10.0
48+
numpy==1.12.0
5649
{[testenv]deps}
5750

5851
[testenv:py36]
5952
deps =
6053
numpy
6154
{[testenv]deps}
62-
63-
[testenv:openpyxl1]
64-
usedevelop = True
65-
deps =
66-
{[testenv]deps}
67-
openpyxl<2.0.0
68-
commands = {envbindir}/pytest {toxinidir}/pandas/io/tests/test_excel.py
69-
70-
[testenv:openpyxl20]
71-
usedevelop = True
72-
deps =
73-
{[testenv]deps}
74-
openpyxl<2.2.0
75-
commands = {envbindir}/pytest {posargs} {toxinidir}/pandas/io/tests/test_excel.py
76-
77-
[testenv:openpyxl22]
78-
usedevelop = True
79-
deps =
80-
{[testenv]deps}
81-
openpyxl>=2.2.0
82-
commands = {envbindir}/pytest {posargs} {toxinidir}/pandas/io/tests/test_excel.py

0 commit comments

Comments
 (0)