Skip to content

Commit 1ea9ae2

Browse files
authored
MNT Move min_dependencies up a level (scikit-learn#18610)
1 parent 4d44c95 commit 1ea9ae2

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

build_tools/shared.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ get_dep() {
1111
# use latest
1212
echo "$package"
1313
elif [[ "$version" == "min" ]]; then
14-
echo "$package==$(python sklearn/_build_utils/min_dependencies.py $package)"
14+
echo "$package==$(python sklearn/_min_dependencies.py $package)"
1515
fi
1616
}

conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from sklearn.utils import _IS_32BIT
1515
from sklearn.externals import _pilutil
16-
from sklearn._build_utils.min_dependencies import PYTEST_MIN_VERSION
16+
from sklearn._min_dependencies import PYTEST_MIN_VERSION
1717
from sklearn.utils.fixes import np_version, parse_version
1818

1919

doc/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ def filter_search_index(app, exception):
396396

397397
def generate_min_dependency_table(app):
398398
"""Generate min dependency table for docs."""
399-
from sklearn._build_utils.min_dependencies import dependent_packages
399+
from sklearn._min_dependencies import dependent_packages
400400

401401
# get length of header
402402
package_header_len = max(len(package)
@@ -440,7 +440,7 @@ def generate_min_dependency_table(app):
440440

441441
def generate_min_dependency_substitutions(app):
442442
"""Generate min dependency substitutions for docs."""
443-
from sklearn._build_utils.min_dependencies import dependent_packages
443+
from sklearn._min_dependencies import dependent_packages
444444

445445
output = StringIO()
446446

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
# We can actually import a restricted version of sklearn that
5151
# does not need the compiled code
5252
import sklearn
53-
import sklearn._build_utils.min_dependencies as min_deps # noqa
53+
import sklearn._min_dependencies as min_deps # noqa
5454

5555

5656
VERSION = sklearn.__version__

sklearn/_build_utils/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from .pre_build_helpers import basic_check_build
1515
from .openmp_helpers import check_openmp_support
16-
from .min_dependencies import CYTHON_MIN_VERSION
16+
from .._min_dependencies import CYTHON_MIN_VERSION
1717

1818

1919
DEFAULT_ROOT = 'sklearn'
File renamed without changes.

sklearn/tests/test_min_dependencies_readme.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77

88
import pytest
99
import sklearn
10-
from sklearn._build_utils.min_dependencies import dependent_packages
10+
from sklearn._min_dependencies import dependent_packages
1111
from sklearn.utils.fixes import parse_version
1212

1313

1414
def test_min_dependencies_readme():
1515
# Test that the minimum dependencies in the README.rst file are
1616
# consistent with the minimum dependencies defined at the file:
17-
# sklearn/_build_utils/min_dependencies.py
17+
# sklearn/_min_dependencies.py
1818

1919
pattern = re.compile(r"(\.\. \|)" +
2020
r"(([A-Za-z]+\-?)+)" +

0 commit comments

Comments
 (0)