X Tutup
Skip to content

Commit 48940bf

Browse files
njsmithnjsmith
committed
Remove uses of now-deprecated attributes in tests. Travis should pass now.
1 parent b279321 commit 48940bf

File tree

5 files changed

+34
-35
lines changed

5 files changed

+34
-35
lines changed

‎patsy/design_info.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212

1313
# XX TMP TODO:
1414
#
15-
# - document dropping term_name_slices= argument
1615
# - update design_matrix_builders and build_design_matrices docs
1716
# - add tests and docs for new design info stuff
1817
# - consider renaming design_matrix_builders (and I guess
19-
# build_design_matrices too)
18+
# build_design_matrices too). Ditto for highlevel dbuilder functions.
2019

2120

2221
from __future__ import print_function

‎patsy/highlevel.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ def iter_maker():
9595
The ``NA_action`` argument.
9696
"""
9797
eval_env = EvalEnvironment.capture(eval_env, reference=1)
98-
builders = _try_incr_builders(formula_like, data_iter_maker, eval_env,
99-
NA_action)
100-
if builders is None:
98+
design_infos = _try_incr_builders(formula_like, data_iter_maker, eval_env,
99+
NA_action)
100+
if design_infos is None:
101101
raise PatsyError("bad formula-like object")
102-
if len(builders[0].design_info.column_names) > 0:
102+
if len(design_infos[0].column_names) > 0:
103103
raise PatsyError("encountered outcome variables for a model "
104-
"that does not expect them")
105-
return builders[1]
104+
"that does not expect them")
105+
return design_infos[1]
106106

107107
def incr_dbuilders(formula_like, data_iter_maker, eval_env=0,
108108
NA_action="drop"):
@@ -113,13 +113,13 @@ def incr_dbuilders(formula_like, data_iter_maker, eval_env=0,
113113
to :func:`dmatrix`. See :func:`incr_dbuilder` for details.
114114
"""
115115
eval_env = EvalEnvironment.capture(eval_env, reference=1)
116-
builders = _try_incr_builders(formula_like, data_iter_maker, eval_env,
117-
NA_action)
118-
if builders is None:
116+
design_infos = _try_incr_builders(formula_like, data_iter_maker, eval_env,
117+
NA_action)
118+
if design_infos is None:
119119
raise PatsyError("bad formula-like object")
120-
if len(builders[0].design_info.column_names) == 0:
120+
if len(design_infos[0].column_names) == 0:
121121
raise PatsyError("model is missing required outcome variables")
122-
return builders
122+
return design_infos
123123

124124
# This always returns a length-two tuple,
125125
# response, predictors
@@ -148,10 +148,10 @@ def _do_highlevel_design(formula_like, data, eval_env,
148148
"'matrix' or 'dataframe'" % (return_type,))
149149
def data_iter_maker():
150150
return iter([data])
151-
builders = _try_incr_builders(formula_like, data_iter_maker, eval_env,
152-
NA_action)
153-
if builders is not None:
154-
return build_design_matrices(builders, data,
151+
design_infos = _try_incr_builders(formula_like, data_iter_maker, eval_env,
152+
NA_action)
153+
if design_infos is not None:
154+
return build_design_matrices(design_infos, data,
155155
NA_action=NA_action,
156156
return_type=return_type)
157157
else:

‎patsy/test_build.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ def make_matrix(data, expected_rank, entries, column_names=None):
6363
termlist = make_termlist(*entries)
6464
def iter_maker():
6565
yield data
66-
builders = design_matrix_builders([termlist], iter_maker, eval_env=0)
67-
matrices = build_design_matrices(builders, data)
66+
design_infos = design_matrix_builders([termlist], iter_maker, eval_env=0)
67+
matrices = build_design_matrices(design_infos, data)
6868
matrix = matrices[0]
69-
assert (builders[0].design_info.term_slices
69+
assert (design_infos[0].term_slices
7070
== matrix.design_info.term_slices)
71-
assert (builders[0].design_info.column_names
71+
assert (design_infos[0].column_names
7272
== matrix.design_info.column_names)
73-
assert matrix.design_info.builder is builders[0]
73+
assert matrix.design_info is design_infos[0]
7474
check_design_matrix(matrix, expected_rank, termlist,
7575
column_names=column_names)
7676
return matrix
@@ -310,11 +310,11 @@ def test_NA_drop_preserves_levels():
310310
data = {"x": [1.0, np.nan, 3.0], "c": ["c1", "c2", "c3"]}
311311
def iter_maker():
312312
yield data
313-
builder = design_matrix_builders([make_termlist("x", "c")], iter_maker, 0)[0]
313+
design_info = design_matrix_builders([make_termlist("x", "c")], iter_maker, 0)[0]
314314

315-
assert builder.design_info.column_names == ["c[c1]", "c[c2]", "c[c3]", "x"]
315+
assert design_info.column_names == ["c[c1]", "c[c2]", "c[c3]", "x"]
316316

317-
mat, = build_design_matrices([builder], data)
317+
mat, = build_design_matrices([design_info], data)
318318

319319
assert mat.shape == (2, 4)
320320
assert np.array_equal(mat, [[1.0, 0.0, 0.0, 1.0],
@@ -683,14 +683,14 @@ def iter_maker():
683683
full_matrix = build_design_matrices([all_builder], all_data)[0]
684684

685685
def t(which_terms, variables, columns):
686-
sub_builder = all_builder.subset(which_terms)
686+
sub_design_info = all_builder.subset(which_terms)
687687
sub_data = {}
688688
for variable in variables:
689689
sub_data[variable] = all_data[variable]
690-
sub_matrix = build_design_matrices([sub_builder], sub_data)[0]
690+
sub_matrix = build_design_matrices([sub_design_info], sub_data)[0]
691691
sub_full_matrix = full_matrix[:, columns]
692692
if not isinstance(which_terms, six.string_types):
693-
assert len(which_terms) == len(sub_builder.design_info.terms)
693+
assert len(which_terms) == len(sub_design_info.terms)
694694
assert np.array_equal(sub_matrix, sub_full_matrix)
695695

696696
t("~ 0 + x + y + z", ["x", "y", "z"], slice(None))

‎patsy/test_highlevel.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ def check_result(expect_full_designs, lhs, rhs, data,
4141

4242
if expect_full_designs:
4343
if lhs is None:
44-
new_rhs, = build_design_matrices([rhs.design_info.builder], data)
44+
new_rhs, = build_design_matrices([rhs.design_info], data)
4545
else:
46-
new_lhs, new_rhs = build_design_matrices([lhs.design_info.builder,
47-
rhs.design_info.builder],
46+
new_lhs, new_rhs = build_design_matrices([lhs.design_info,
47+
rhs.design_info],
4848
data)
4949
assert np.allclose(new_lhs, lhs)
5050
assert new_lhs.design_info.column_names == expected_lhs_names
@@ -695,14 +695,14 @@ def test_0d_data():
695695
mat = dmatrix(formula, data_0d)
696696
assert np.allclose(mat, expected)
697697

698-
assert np.allclose(build_design_matrices([mat.design_info.builder],
698+
assert np.allclose(build_design_matrices([mat.design_info],
699699
data_0d)[0],
700700
expected)
701701
if have_pandas:
702702
data_series = pandas.Series(data_0d)
703703
assert np.allclose(dmatrix(formula, data_series), expected)
704704

705-
assert np.allclose(build_design_matrices([mat.design_info.builder],
705+
assert np.allclose(build_design_matrices([mat.design_info],
706706
data_series)[0],
707707
expected)
708708

@@ -711,7 +711,7 @@ def test_env_not_saved_in_builder():
711711
design_matrix = dmatrix("x_in_env", {})
712712

713713
x_in_env = [10, 20, 30]
714-
design_matrix2 = dmatrix(design_matrix.design_info.builder, {})
714+
design_matrix2 = dmatrix(design_matrix.design_info, {})
715715

716716
assert np.allclose(design_matrix, design_matrix2)
717717

‎patsy/test_regressions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test_issue_11():
1717
new_data = {"X" : [0,0,1,2,3,3,4], "Y" : [1,2,3,4,5,6,7]}
1818
info = dmatrix(formula, data)
1919
try:
20-
build_design_matrices([info.design_info.builder], new_data)
20+
build_design_matrices([info.design_info], new_data)
2121
except PatsyError as e:
2222
assert e.origin == Origin(formula, 0, 4)
2323
else:

0 commit comments

Comments
 (0)
X Tutup