Skip to content

Commit bc68bd7

Browse files
committed
dev
1 parent e07bf2d commit bc68bd7

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

cf/field.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@
166166
"sum",
167167
"var",
168168
"variance",
169-
"sum",
170169
"sum_of_weights",
171170
"sum_of_weights2",
172171
"integral",
@@ -3772,7 +3771,7 @@ def weights(
37723771
if not measure:
37733772
w.override_units("1", inplace=True)
37743773

3775-
mn = w.minimum()
3774+
mn = w.min()
37763775
if mn <= 0:
37773776
raise ValueError(
37783777
"All weights must be positive. "

cf/test/create_test_files.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77

88
faulthandler.enable() # to debug seg faults and timeouts
99

10-
import cfdm
1110
import netCDF4
1211

12+
import cfdm
13+
1314
VN = cfdm.CF()
1415

1516

cf/test/test_aggregate.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -614,35 +614,35 @@ def test_aggregate_ugrid(self):
614614
"""Test ugrid aggregation"""
615615
f = cf.example_field(8)
616616

617-
# Test that aggregation over a non-ugrid (time, in this case )
618-
# axis works.
617+
# Test that aggregation over a non-ugrid axis (time, in this
618+
# case) works.
619619
g = f.copy()
620620
t = g.dim("T")
621-
_ = cf.bounds_combination_mode("OR")
621+
cf.bounds_combination_mode("OR")
622622
t += 72000
623623
a = cf.aggregate([f, g])
624624
self.assertEqual(len(a), 1)
625625
a = a[0]
626626
self.assertEqual(len(a.domain_topologies()), 1)
627627
self.assertEqual(len(a.cell_connectivities()), 1)
628628

629-
# Test that aggregation over non-ugrid axis doesn't work when
630-
# the domain topology constructs are different
629+
# Test that aggregation over a non-ugrid axis doesn't work
630+
# when the domain topology constructs are different
631631
h = g.copy()
632632
d = h.domain_topology()
633633
d = d.data
634634
d += 1
635635
self.assertEqual(len(cf.aggregate([f, h])), 2)
636636

637-
# Test that aggregation over non-ugrid axis doesn't work when
638-
# the cell connnectivty constructs are different
637+
# Test that aggregation over a non-ugrid axis doesn't work
638+
# when the cell connnectivty constructs are different
639639
h = g.copy()
640640
c = h.cell_connectivity()
641641
d = c.data
642642
d += 1
643643
self.assertEqual(len(cf.aggregate([f, h])), 2)
644644

645-
# Test that aggregation over ugrid axis doesn't work
645+
# Test that aggregation over a ugrid axis doesn't work
646646
g = f.copy()
647647
x = g.aux("X")
648648
d = x.data

0 commit comments

Comments
 (0)