Skip to content

Commit 6119d02

Browse files
CI: conda 4.7.1 (#26595)
CI compat with conda 4.7.x Bump minimum deps for removal of free.
1 parent c9182df commit 6119d02

File tree

6 files changed

+20
-13
lines changed

6 files changed

+20
-13
lines changed

ci/azure/windows.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ jobs:
2121
displayName: 'Add conda to PATH'
2222
- script: conda update -q -n base conda
2323
displayName: Update conda
24-
- script: conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml
24+
- script: |
25+
call activate
26+
conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml
2527
displayName: 'Create anaconda environment'
2628
- script: |
2729
call activate pandas-dev

ci/deps/travis-36-locale.yaml

+5-7
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,22 @@ dependencies:
88
- python-blosc
99
- cython>=0.28.2
1010
- fastparquet=0.2.1
11-
- gcsfs=0.1.0
11+
- gcsfs=0.2.2
1212
- html5lib
1313
- ipython
1414
- jinja2
15-
- lxml=3.7.0
16-
- matplotlib=3.0.0
15+
- lxml=3.8.0
16+
- matplotlib=3.0.*
1717
- nomkl
1818
- numexpr
1919
- numpy
2020
- openpyxl
2121
- pandas-gbq=0.8.0
2222
- psycopg2=2.6.2
23-
- pymysql=0.7.9
23+
- pymysql=0.7.11
2424
- pytables
2525
- python-dateutil
26-
# cannot go past python=3.6.6 for matplotlib=3.0.0 due to
27-
# https://github.com/matplotlib/matplotlib/issues/12626
28-
- python=3.6.6
26+
- python=3.6.*
2927
- pytz
3028
- s3fs=0.0.8
3129
- scipy

doc/source/install.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -276,15 +276,15 @@ SciPy 0.19.0 Miscellaneous statistical functions
276276
XLsxWriter 0.9.8 Excel writing
277277
blosc Compression for msgpack
278278
fastparquet 0.2.1 Parquet reading / writing
279-
gcsfs 0.1.0 Google Cloud Storage access
279+
gcsfs 0.2.2 Google Cloud Storage access
280280
html5lib HTML parser for read_html (see :ref:`note <optional_html>`)
281-
lxml HTML parser for read_html (see :ref:`note <optional_html>`)
281+
lxml 3.8.0 HTML parser for read_html (see :ref:`note <optional_html>`)
282282
matplotlib 2.2.2 Visualization
283283
openpyxl 2.4.8 Reading / writing for xlsx files
284284
pandas-gbq 0.8.0 Google Big Query access
285285
psycopg2 PostgreSQL engine for sqlalchemy
286286
pyarrow 0.9.0 Parquet and feather reading / writing
287-
pymysql MySQL engine for sqlalchemy
287+
pymysql 0.7.11 MySQL engine for sqlalchemy
288288
pyreadstat SPSS files (.sav) reading
289289
pytables 3.4.2 HDF5 reading / writing
290290
qtpy Clipboard I/O

doc/source/whatsnew/v0.25.0.rst

+6
Original file line numberDiff line numberDiff line change
@@ -455,12 +455,18 @@ Optional libraries below the lowest tested version may still work, but are not c
455455
+-----------------+-----------------+
456456
| fastparquet | 0.2.1 |
457457
+-----------------+-----------------+
458+
| gcsfs | 0.2.2 |
459+
+-----------------+-----------------+
460+
| lxml | 3.8.0 |
461+
+-----------------+-----------------+
458462
| matplotlib | 2.2.2 |
459463
+-----------------+-----------------+
460464
| openpyxl | 2.4.8 |
461465
+-----------------+-----------------+
462466
| pyarrow | 0.9.0 |
463467
+-----------------+-----------------+
468+
| pymysql | 0.7.1 |
469+
+-----------------+-----------------+
464470
| pytables | 3.4.2 |
465471
+-----------------+-----------------+
466472
| scipy | 0.19.0 |

pandas/compat/_optional.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"bs4": "4.6.0",
1010
"bottleneck": "1.2.1",
1111
"fastparquet": "0.2.1",
12-
"gcsfs": "0.1.0",
12+
"gcsfs": "0.2.2",
13+
"lxml.etree": "3.8.0",
1314
"matplotlib": "2.2.2",
1415
"numexpr": "2.6.2",
1516
"openpyxl": "2.4.8",

pandas/io/html.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def _importers():
4040
on_version="ignore")
4141
_HAS_BS4 = bs4 is not None
4242

43-
lxml = import_optional_dependency("lxml", raise_on_missing=False,
43+
lxml = import_optional_dependency("lxml.etree", raise_on_missing=False,
4444
on_version="ignore")
4545
_HAS_LXML = lxml is not None
4646

0 commit comments

Comments
 (0)