8000 MAINT Make utlis.fast_dict private (#15223) · crankycoder/scikit-learn@5e7ff0d · GitHub
[go: up one dir, main page]
Skip to content

Commit 5e7ff0d

Browse files
NicolasHugthomasjpfan
NicolasHug
authored and
thomasjpfan
committed
MAINT Make utlis.fast_dict private (scikit-learn#15223)
1 parent fbfb4da commit 5e7ff0d

File tree

10 files changed

+13
-7
lines changed

10 files changed

+13
-7
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ sklearn/linear_model/sag_fast.pyx
8282
sklearn/utils/mocking.py
8383
sklearn/utils/weight_vector.py
8484
sklearn/utils/seq_dataset.py
85+
sklearn/utils/fast_dict.py

‎sklearn/_build_utils/deprecated_modules.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@
1111

1212
('_weight_vector', 'sklearn.utils.weight_vector', 'sklearn.utils'),
1313
('_seq_dataset', 'sklearn.utils.seq_dataset', 'sklearn.utils'),
14+
('_fast_dict', 'sklearn.utils.fast_dict', 'sklearn.utils'),
1415
}
1516

16-
_FILE_CONTENT_TEMPLATE = """from .{new_module_name} import * # noqa
17+
_FILE_CONTENT_TEMPLATE = """
18+
# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py
19+
20+
from .{new_module_name} import * # noqa
1721
from {relative_dots}utils.deprecation import _raise_dep_warning_if_not_pytest
1822
1923
deprecated_path = '{deprecated_path}'

‎sklearn/cluster/_hierarchical.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ctypedef np.int8_t INT8
1313

1414
np.import_array()
1515

16-
from ..utils.fast_dict cimport IntFloatDict
16+
from ..utils._fast_dict cimport IntFloatDict
1717

1818
# C++
1919
from cython.operator cimport dereference as deref, preincrement as inc

‎sklearn/cluster/hierarchical.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
from . import _hierarchical
2323
from ._feature_agglomeration import AgglomerationTransform
24-
from ..utils.fast_dict import IntFloatDict
24+
from ..utils._fast_dict import IntFloatDict
2525
from ..utils.fixes import _astype_copy_false
2626
from ..utils import deprecated
2727

‎sklearn/cluster/tests/test_hierarchical.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from sklearn.metrics.cluster import normalized_mutual_info_score
3131
from sklearn.neighbors.graph import kneighbors_graph
3232
from sklearn.cluster._hierarchical import average_merge, max_merge
33-
from sklearn.utils.fast_dict import IntFloatDict
33+
from sklearn.utils._fast_dict import IntFloatDict
3434
from sklearn.utils.testing import assert_array_equal
3535
from sklearn.utils.testing import assert_warns
3636
from sklearn.datasets import make_moons, make_circles

‎sklearn/tests/test_import_deprecations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
('sklearn.utils.mocking', 'MockDataFrame'),
1818
('sklearn.utils.weight_vector', 'WeightVector'),
1919
('sklearn.utils.seq_dataset', 'ArrayDataset32'),
20+
('sklearn.utils.fast_dict', 'IntFloatDict'),
2021
))
2122
def test_import_is_deprecated(deprecated_path, importee):
2223
# Make sure that "from deprecated_path import importee" is still possible

‎sklearn/utils/fast_dict.pxd renamed to ‎sklearn/utils/_fast_dict.pxd

File renamed without changes.

‎sklearn/utils/fast_dict.pyx renamed to ‎sklearn/utils/_fast_dict.pyx

File renamed without changes.

‎sklearn/utils/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ def configuration(parent_package='', top_path=None):
3535
sources=['graph_shortest_path.pyx'],
3636
include_dirs=[numpy.get_include()])
3737

38-
config.add_extension('fast_dict',
39-
sources=['fast_dict.pyx'],
38+
config.add_extension('_fast_dict',
39+
sources=['_fast_dict.pyx'],
4040
language="c++",
4141
include_dirs=[numpy.get_include()],
4242
libraries=libraries)

‎sklearn/utils/tests/test_fast_dict.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"""
33
import numpy as np
44

5-
from sklearn.utils.fast_dict import IntFloatDict, argmin
5+
from sklearn.utils._fast_dict import IntFloatDict, argmin
66

77

88
def test_int_float_dict():

0 commit comments

Comments
 (0)
0