Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c45581b
dev
davidhassell Mar 13, 2023
d00b07c
dev
davidhassell Mar 14, 2023
22b6157
performance
davidhassell Mar 14, 2023
05d0356
dev
davidhassell Mar 15, 2023
951dfe9
dev
davidhassell Mar 15, 2023
f5e9c12
dev
davidhassell Mar 15, 2023
7a591d3
dev
davidhassell Mar 16, 2023
a5bc53f
dev
davidhassell Mar 16, 2023
ca92eb2
dev
davidhassell Mar 16, 2023
d403c2b
dev
davidhassell Mar 17, 2023
a8b3908
dev
davidhassell Mar 17, 2023
1c16117
dev
davidhassell Mar 24, 2023
fc7e5af
dev
davidhassell Mar 26, 2023
bd6e637
dev
davidhassell Mar 27, 2023
fc6ce65
main merge
davidhassell Mar 28, 2023
e020eba
cfunits dependency
davidhassell Mar 28, 2023
a93b5b1
cfunits dependency
davidhassell Mar 28, 2023
ff7861f
dev
davidhassell Mar 28, 2023
76282a6
note on future performance work
davidhassell Apr 20, 2023
b569959
note on future performance work
davidhassell Apr 20, 2023
d1ed0df
merge of CFA
davidhassell Apr 24, 2023
dfc5b4a
merge of CFA
davidhassell Apr 24, 2023
1503ed5
tidy
davidhassell Apr 25, 2023
c4f7a3e
Merge branch 'main' of github.com:NCAS-CMS/cf-python into equals-perf…
davidhassell Apr 26, 2023
c03be40
dev
davidhassell Apr 26, 2023
eec6dec
dev
davidhassell Apr 26, 2023
d27418f
upstream main merge conflicts
davidhassell May 3, 2023
4be89bc
changes
davidhassell May 3, 2023
326cc2c
dev
davidhassell May 3, 2023
65d5098
Merge branch 'main' into equals-performance-2
davidhassell May 9, 2023
e11b4b2
Merge pull request #1 from davidhassell/equals-performance-2
davidhassell May 10, 2023
85ad52b
Revert "Merge pull request #1 from davidhassell/equals-performance-2"
davidhassell May 10, 2023
dfc5a08
Merge branch 'main' of github.com:NCAS-CMS/cf-python into example-fields
davidhassell May 10, 2023
63ad3f3
example fields
davidhassell May 10, 2023
460767a
example fields
davidhassell May 10, 2023
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
2 changes: 2 additions & 0 deletions Changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ version 3.15.1
(https://github.com/NCAS-CMS/cf-python/issues/577)
* Fix bug when using the ``-d`` option to the `cfa` script
(https://github.com/NCAS-CMS/cf-python/issues/649)
* Fix the return type of `cf.example_fields`
(https://github.com/NCAS-CMS/cf-python/pull/654)

----

Expand Down
3 changes: 2 additions & 1 deletion cf/examplefield.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import cfdm

from .cfimplementation import implementation
from .fieldlist import FieldList

_implementation = implementation()

Expand All @@ -13,7 +14,7 @@ def example_field(n, _implementation=_implementation):


def example_fields(*n, _func=example_field):
return cfdm.example_fields(*n, _func=_func)
return FieldList(cfdm.example_fields(*n, _func=_func))


example_fields.__doc__ = cfdm.example_fields.__doc__.replace("cfdm.", "cf.")
Expand Down
7 changes: 6 additions & 1 deletion cf/test/test_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ def setUp(self):
self.test_only = ()

def test_example_field(self):
for f in cf.example_fields():
"""Test cf.example_field and cf.example_fields"""
fields = cf.example_fields()
self.assertIsInstance(fields, cf.FieldList)

for f in fields:
self.assertIsInstance(f, cf.Field)
f.dump(display=False)

with self.assertRaises(ValueError):
Expand Down