Skip to content
Merged
Show file tree
Hide file tree
Changes from 92 commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
914d47b
Update as_data_frame()
hsteptoe Mar 29, 2022
26be4a5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 29, 2022
5c2fe98
Minor typo fixes
hsteptoe Jul 27, 2022
3bf85b2
Matching data raveling with dimension meshgrid
hsteptoe Jul 29, 2022
a0e280c
Revise test_simple to check long-syle dataframe
hsteptoe Jul 29, 2022
d41cbb6
Revise NaN and 1D dataframe tests
hsteptoe Jul 29, 2022
d8c5b40
Better pandas.MultiIndex solution
hsteptoe Aug 2, 2022
03ded10
Add 3D test case
hsteptoe Aug 2, 2022
a46c08a
Fixes for cube with partially defined dims
hsteptoe Aug 2, 2022
2df0af3
Update tests for partially defined dims
hsteptoe Aug 2, 2022
1e0a5c8
Update time tests
hsteptoe Aug 2, 2022
26cbcdf
Reuse _as_pandas_coord()
hsteptoe Aug 2, 2022
a7ce983
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 2, 2022
61b801a
Remove Series conversion
hsteptoe Aug 2, 2022
071d07f
Remove option for copy
hsteptoe Aug 2, 2022
2c20e87
Merge branch 'main' into better-pandas-conversion-issue-4526
hsteptoe Aug 2, 2022
9bbada5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 2, 2022
e9d5d53
Merge branch 'SciTools:main' into better-pandas-conversion-issue-4526
hsteptoe Aug 4, 2022
1df3072
First go at adding aux coords
hsteptoe Aug 9, 2022
2c2ce69
First go at adding global attributes
hsteptoe Aug 9, 2022
1c9fbff
Update doc string
hsteptoe Aug 9, 2022
ef55874
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 9, 2022
4f5ed98
Fix for time based AuxCoords
hsteptoe Aug 11, 2022
4fb7631
Minor misc fixes
hsteptoe Aug 11, 2022
332e260
Fix copy issue
hsteptoe Aug 12, 2022
eba020b
Fix black weirdness and add copy tests
hsteptoe Aug 12, 2022
04d11a6
Fix conflicts
hsteptoe Aug 12, 2022
ce03290
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 12, 2022
abc8437
Add attributes test
hsteptoe Aug 12, 2022
5785977
Name fixes
hsteptoe Aug 12, 2022
3afe27f
Add AuxCoord test
hsteptoe Aug 16, 2022
a608e47
Improved aux coord indexing
hsteptoe Aug 16, 2022
553417b
Blacking
hsteptoe Aug 16, 2022
81d60ca
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 16, 2022
a8efb0f
Preserve index on aux coord merge
hsteptoe Aug 17, 2022
f6e0f48
Simplify adding AuxCoords
hsteptoe Aug 17, 2022
07d6d9b
Add assertRaises test for attributes
hsteptoe Aug 17, 2022
8301caa
Better dim coord making logic
hsteptoe Aug 17, 2022
03c3ee9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 17, 2022
2afbe32
Updates to docstring
hsteptoe Aug 17, 2022
08b61b5
Merge branch 'better-pandas-conversion-issue-4526' of github.com:hste…
hsteptoe Aug 17, 2022
54c7300
Handle multidim AuxCoords
hsteptoe Sep 9, 2022
0740273
Add handling for AuxCoords + scalar coord info
hsteptoe Sep 12, 2022
329c2b1
Fix STASH attribute handling
hsteptoe Sep 12, 2022
958ed28
Merge branch 'pandas_ndim' into better-pandas-conversion-issue-4526
hsteptoe Sep 22, 2022
c7a941f
Merge branch 'better-pandas-conversion-issue-4526' of github.com:hste…
hsteptoe Sep 22, 2022
4551343
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 22, 2022
27b8419
Improve and simplify dim extraction
hsteptoe Sep 23, 2022
6ea4970
Re-fix copy behaviour
hsteptoe Sep 23, 2022
01b983d
Doc updates
hsteptoe Sep 23, 2022
c4470a7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 23, 2022
a927388
Add Series example
hsteptoe Sep 23, 2022
6f5cc5c
Merge branch 'better-pandas-conversion-issue-4526' of github.com:hste…
hsteptoe Sep 23, 2022
4c2b46c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 23, 2022
7e48ee1
What's New update
hsteptoe Sep 26, 2022
b929f86
Add `as_series` depreciation warning
hsteptoe Sep 26, 2022
3ac9072
Fix indent
hsteptoe Sep 26, 2022
43c1846
flake8 fixes
hsteptoe Sep 26, 2022
bff3e3a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 26, 2022
c46192d
Fix deprecation warning
hsteptoe Oct 24, 2022
8789478
Fix pytest styles
hsteptoe Oct 24, 2022
38efc6b
Fix pytest styles
hsteptoe Oct 24, 2022
dcf1b7a
Minor syntax change to list
hsteptoe Oct 24, 2022
df7d24f
Update error style
hsteptoe Oct 24, 2022
32917ed
Fix error type
hsteptoe Oct 26, 2022
582ff69
Reinstate copy warning behaviour
hsteptoe Oct 26, 2022
eab743a
Add author link
hsteptoe Oct 26, 2022
3b94276
Remove add_global_attribute code
hsteptoe Oct 27, 2022
bfe9b77
Further global attribute code removal
hsteptoe Oct 27, 2022
f85e284
Add instance checking test
hsteptoe Oct 27, 2022
a10449d
Improve _make_dim_coord_list efficiency
hsteptoe Oct 27, 2022
11f324f
Correct list ouput
hsteptoe Oct 27, 2022
31cc25b
Make tests more efficient
hsteptoe Oct 27, 2022
3d1e2f5
Add scalar coordinate test
hsteptoe Oct 27, 2022
78c1bc4
Docstring fixes
hsteptoe Oct 27, 2022
09ed019
Refactor making of aux_coord_list
hsteptoe Oct 27, 2022
a544486
Fix type error
hsteptoe Oct 27, 2022
99cb8c5
Add masked array -> nan warning in doc
hsteptoe Nov 2, 2022
afcfbef
Consolidate use of `_as_pandas_coord`
hsteptoe Nov 2, 2022
5f995b0
Roll back breaking _make_dim_coord_list changes
hsteptoe Nov 2, 2022
a1d30bc
Raise error for Ancillary variables without dims
hsteptoe Nov 2, 2022
5fff6a3
Ancillary variables tweaks
hsteptoe Nov 2, 2022
2fcb9bb
Ancillary variables tests
hsteptoe Nov 2, 2022
4e65380
Split out metadata for consistency with `as_cubes`
hsteptoe Nov 2, 2022
ea4502c
Add cell_measure tests
hsteptoe Nov 2, 2022
dcf8f63
Docstring fixes
hsteptoe Nov 4, 2022
f337c2d
Test kwarg fixes
hsteptoe Nov 4, 2022
897973f
`_make_aux_coord_list` optimisation
hsteptoe Nov 4, 2022
b25648e
Refactor metadata merging
hsteptoe Nov 4, 2022
213afb6
Roundabout :issue: fix (remove)
hsteptoe Nov 4, 2022
d39b052
Roundabout :issue: fix (re-add)
hsteptoe Nov 4, 2022
be4fee8
Docstring typo fixes
hsteptoe Nov 4, 2022
eca08e9
Fix doctests
hsteptoe Nov 4, 2022
9432890
origin vs remote fixes
hsteptoe Nov 4, 2022
6b1625d
Update docs/src/whatsnew/latest.rst
hsteptoe Nov 4, 2022
3d5acc4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 4, 2022
64447f8
Further doctest fixes
hsteptoe Nov 4, 2022
9eff2a5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 4, 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
15 changes: 12 additions & 3 deletions docs/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This document explains the changes made to Iris for this release
📢 Announcements
================

#. Welcome to `@ESadek-MO`_ who made their first contribution to Iris 🎉
#. Welcome to `@ESadek-MO`_ and `@hsteptoe`_ who made their first contribution to Iris 🎉


✨ Features
Expand All @@ -35,6 +35,12 @@ This document explains the changes made to Iris for this release
non-existing paths, and added expansion functionality to :func:`~iris.io.save`.
(:issue:`4772`, :pull:`4913`)

#. `@hsteptoe`_ and `@trexfeathers`_ (reviewer) added :func:`iris.pandas.as_data_frame`,
which provides improved conversion of :class:`~iris.cube.Cube`\s to
:class:`~pandas.DataFrame`\s. This includes better handling of multiple
:class:`~iris.cube.Cube`dimensions, auxiliary coordinates and attribute information.
(:issue:`4526`, :pull:`4669`)


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

#. N/A
#. `@hsteptoe`_ and `@trexfeathers`_ (reviewer) deprecated
:func:`iris.pandas.as_series` in favour of the new
:func:`iris.pandas.as_data_frame` - see `✨ Features`_ for more details.
(:pull:`4669`)


🔗 Dependencies
Expand All @@ -92,7 +101,7 @@ This document explains the changes made to Iris for this release
Whatsnew author names (@github name) in alphabetical order. Note that,
core dev names are automatically included by the common_links.inc:


.. _@hsteptoe: https://github.com/hsteptoe


.. comment
Expand Down
Loading