Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
5af1d6b
First pass using merge to parse ndim Pandas DataFrame.
trexfeathers Aug 1, 2022
0913e44
Second pass actually doing array manipulation this time.
trexfeathers Aug 2, 2022
573fd22
Tidying for public consumption.
trexfeathers Aug 4, 2022
0561f1f
Improved index handling.
trexfeathers Aug 4, 2022
fef990d
Pytest conversion.
trexfeathers Aug 4, 2022
f56ee7e
Minor re-factoring.
trexfeathers Aug 5, 2022
7d4c911
Support for copy argument.
trexfeathers Aug 5, 2022
4e74b67
Calendar handling.
trexfeathers Aug 5, 2022
e833427
Correct coord reshaping.
trexfeathers Aug 5, 2022
bf5e05e
Correct array indexing.
trexfeathers Aug 11, 2022
b251c2f
DataFrame Series agnosticism.
trexfeathers Aug 11, 2022
79c79d5
Docstrings and structure.
trexfeathers Aug 11, 2022
75524eb
Merge remote-tracking branch 'upstream/pandas_ndim' into new_pandas
trexfeathers Aug 15, 2022
cc5ccd4
Error as_cube if FUTURE behaviour is set.
trexfeathers Aug 15, 2022
a7ef7a7
Tests WIP.
trexfeathers Aug 15, 2022
d894161
More tests.
trexfeathers Aug 16, 2022
b25ed2e
Completed tests.
trexfeathers Aug 16, 2022
6b3b61c
Suppress deprecation warning in TestSeriesAsCube.
trexfeathers Aug 16, 2022
bd8c544
Docstring corrections.
trexfeathers Aug 16, 2022
89b357b
Another docstring fix.
trexfeathers Aug 16, 2022
b2182d8
Another docstring fix.
trexfeathers Aug 16, 2022
16a9864
Another docstring fix.
trexfeathers Aug 16, 2022
cba02a8
Doctests.
trexfeathers Aug 16, 2022
075a90d
Doctests.
trexfeathers Aug 16, 2022
dfabf35
Strict expectation of one Cube in tests.
trexfeathers Aug 17, 2022
a39581f
format_dimensional_metadata typo.
trexfeathers Aug 17, 2022
5aa5af8
Rename pandas_array to pandas_structure.
trexfeathers Aug 17, 2022
7e8ff41
Leaner warnings for Series with column arguments.
trexfeathers Aug 17, 2022
e59f869
Fix date tests.
trexfeathers Aug 17, 2022
84fdd5a
Back out pandas_ndim FUTURE flag.
trexfeathers Aug 17, 2022
e33456f
Uncomment code, whoops.
trexfeathers Aug 17, 2022
f85dae8
What's new entry.
trexfeathers Aug 17, 2022
9391f43
Remove erroneous pass.
trexfeathers Aug 17, 2022
5f9531f
Doctest typo.
trexfeathers Aug 17, 2022
9619fd0
Handle an empty Pandas structure.
trexfeathers Aug 17, 2022
6423aae
Merge remote-tracking branch 'upstream/main' into new_pandas
trexfeathers Aug 17, 2022
7bac741
Test showing that dimension order is preserved.
trexfeathers Aug 17, 2022
85dd82b
Merge remote-tracking branch 'upstream/main' into new_pandas
trexfeathers Aug 17, 2022
b7d842c
Informative error for ragged indexes.
trexfeathers Aug 17, 2022
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
1 change: 1 addition & 0 deletions docs/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ def _dotv(version):
"numpy": ("https://numpy.org/doc/stable/", None),
"python": ("https://docs.python.org/3/", None),
"scipy": ("https://docs.scipy.org/doc/scipy/", None),
"pandas": ("https://pandas.pydata.org/docs/", None),
}

# The name of the Pygments (syntax highlighting) style to use.
Expand Down
13 changes: 12 additions & 1 deletion docs/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ This document explains the changes made to Iris for this release
#. `@stephenworsley`_ updated to the latest CF Standard Names Table ``v79``
(19 March 2022). (:pull:`4910`)

#. `@trexfeathers`_ and `@lbdreyer`_ (reviewer) added
:func:`iris.pandas.as_cubes`, which provides richer conversion from
Pandas :class:`~pandas.Series` / :class:`~pandas.DataFrame`\s to one or more
:class:`~iris.cube.Cube`\s. This includes: n-dimensional datasets,
:class:`~iris.coords.AuxCoord`\s, :class:`~iris.coords.CellMeasure`\s,
:class:`~iris.coords.AncillaryVariable`\s, and multi-dimensional
coordinates. (:pull:`4890`)


🐛 Bugs Fixed
=============
Expand Down Expand Up @@ -190,7 +198,10 @@ This document explains the changes made to Iris for this release
🔥 Deprecations
===============

#. N/A
#. `@trexfeathers`_ and `@lbdreyer`_ (reviewer) deprecated
:func:`iris.pandas.as_cube` in favour of the new
:func:`iris.pandas.as_cubes` - see `✨ Features`_ for more details.
(:pull:`4890`)


🔗 Dependencies
Expand Down
Loading