Skip to content

Test conda 4.7.1 #26595

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
merged 17 commits into from
Jun 26, 2019
Merged

Test conda 4.7.1 #26595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0390a31
try conda canary
TomAugspurger May 31, 2019
be4d0af
(test) try adding back free for compat
TomAugspurger May 31, 2019
418351d
call activate
TomAugspurger May 31, 2019
6c88a0b
Merge remote-tracking branch 'upstream/master' into conda-4.7.1
TomAugspurger Jun 13, 2019
ef73b53
remove free
TomAugspurger Jun 13, 2019
6b548c3
activate
TomAugspurger Jun 13, 2019
5a13d14
Bump pymysql
TomAugspurger Jun 13, 2019
1ac03a4
Python and MPL
TomAugspurger Jun 14, 2019
9407039
Merge remote-tracking branch 'upstream/master' into conda-4.7.1
TomAugspurger Jun 17, 2019
deea532
Bump lxml
TomAugspurger Jun 17, 2019
426a7a5
Merge remote-tracking branch 'upstream/master' into conda-4.7.1
TomAugspurger Jun 20, 2019
f77bda4
Merge remote-tracking branch 'upstream/master' into conda-4.7.1
TomAugspurger Jun 24, 2019
e5a8312
bump gcsfs
TomAugspurger Jun 24, 2019
c758704
cleanup
TomAugspurger Jun 24, 2019
ccade79
debug
TomAugspurger Jun 24, 2019
9e27784
Merge remote-tracking branch 'upstream/master' into conda-4.7.1
TomAugspurger Jun 25, 2019
869dab6
update gcsfs; remove canary
TomAugspurger Jun 25, 2019
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
4 changes: 3 additions & 1 deletion ci/azure/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ jobs:
displayName: 'Add conda to PATH'
- script: conda update -q -n base conda
displayName: Update conda
- script: conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml
- script: |
call activate
conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml
displayName: 'Create anaconda environment'
- script: |
call activate pandas-dev
Expand Down
12 changes: 5 additions & 7 deletions ci/deps/travis-36-locale.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,22 @@ dependencies:
- python-blosc
- cython>=0.28.2
- fastparquet=0.2.1
- gcsfs=0.1.0
- gcsfs=0.2.2
- html5lib
- ipython
- jinja2
- lxml=3.7.0
- matplotlib=3.0.0
- lxml=3.8.0
- matplotlib=3.0.*
- nomkl
- numexpr
- numpy
- openpyxl
- pandas-gbq=0.8.0
- psycopg2=2.6.2
- pymysql=0.7.9
- pymysql=0.7.11
- pytables
- python-dateutil
# cannot go past python=3.6.6 for matplotlib=3.0.0 due to
# https://github.com/matplotlib/matplotlib/issues/12626
- python=3.6.6
- python=3.6.*
- pytz
- s3fs=0.0.8
- scipy
Expand Down
6 changes: 3 additions & 3 deletions doc/source/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,15 +276,15 @@ SciPy 0.19.0 Miscellaneous statistical functions
XLsxWriter 0.9.8 Excel writing
blosc Compression for msgpack
fastparquet 0.2.1 Parquet reading / writing
gcsfs 0.1.0 Google Cloud Storage access
gcsfs 0.2.2 Google Cloud Storage access
html5lib HTML parser for read_html (see :ref:`note <optional_html>`)
lxml HTML parser for read_html (see :ref:`note <optional_html>`)
lxml 3.8.0 HTML parser for read_html (see :ref:`note <optional_html>`)
matplotlib 2.2.2 Visualization
openpyxl 2.4.8 Reading / writing for xlsx files
pandas-gbq 0.8.0 Google Big Query access
psycopg2 PostgreSQL engine for sqlalchemy
pyarrow 0.9.0 Parquet and feather reading / writing
pymysql MySQL engine for sqlalchemy
pymysql 0.7.11 MySQL engine for sqlalchemy
pyreadstat SPSS files (.sav) reading
pytables 3.4.2 HDF5 reading / writing
qtpy Clipboard I/O
Expand Down
6 changes: 6 additions & 0 deletions doc/source/whatsnew/v0.25.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,12 +455,18 @@ Optional libraries below the lowest tested version may still work, but are not c
+-----------------+-----------------+
| fastparquet | 0.2.1 |
+-----------------+-----------------+
| gcsfs | 0.2.2 |
+-----------------+-----------------+
| lxml | 3.8.0 |
+-----------------+-----------------+
| matplotlib | 2.2.2 |
+-----------------+-----------------+
| openpyxl | 2.4.8 |
+-----------------+-----------------+
| pyarrow | 0.9.0 |
+-----------------+-----------------+
| pymysql | 0.7.1 |
+-----------------+-----------------+
| pytables | 3.4.2 |
+-----------------+-----------------+
| scipy | 0.19.0 |
Expand Down
3 changes: 2 additions & 1 deletion pandas/compat/_optional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"bs4": "4.6.0",
"bottleneck": "1.2.1",
"fastparquet": "0.2.1",
"gcsfs": "0.1.0",
"gcsfs": "0.2.2",
"lxml.etree": "3.8.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

prob should add pymysql here as well

"matplotlib": "2.2.2",
"numexpr": "2.6.2",
"openpyxl": "2.4.8",
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def _importers():
on_version="ignore")
_HAS_BS4 = bs4 is not None

lxml = import_optional_dependency("lxml", raise_on_missing=False,
lxml = import_optional_dependency("lxml.etree", raise_on_missing=False,
on_version="ignore")
_HAS_LXML = lxml is not None

Expand Down