8000 TST Fixes test and mis-matched pandas version (#20149) · scikit-learn/scikit-learn@c09be6a · GitHub
[go: up one dir, main page]
Skip to content

Commit c09be6a

Browse files
thomasjpfanthomasjpfan
authored
TST Fixes test and mis-matched pandas version (#20149)
1 parent 777ac15 commit c09be6a

File tree

4 files changed

+7
-5
lines changed
  • < 8000 div class="PRIVATE_VisuallyHidden prc-TreeView-TreeViewVisuallyHidden-4-mPv" aria-hidden="true" id=":RdddabH1:">
    README.rst
  • doc/whats_new
  • sklearn

    • 4 files changed

    +7
    -5
    lines changed

    ‎README.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -27,7 +27,7 @@
    2727
    .. _DOI: https://zenodo.org/badge/latestdoi/21369/scikit-learn/scikit-learn
    2828

    2929
    .. |PythonMinVersion| replace:: 3.7
    30-
    .. |NumPyMinVersion| replace:: 1.14.5
    30+
    .. |NumPyMinVersion| replace:: 1.14.6
    3131
    .. |SciPyMinVersion| replace:: 1.1.0
    3232
    .. |JoblibMinVersion| replace:: 0.11
    3333
    .. |ThreadpoolctlMinVersion| replace:: 2.0.0

    ‎doc/whats_new/v1.0.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -15,7 +15,7 @@ Version 1.0.0
    1515
    Minimal dependencies
    1616
    --------------------
    1717

    18-
    Version 1.0.0 of scikit-learn requires python 3.7+, numpy 1.14.5+ and
    18+
    Version 1.0.0 of scikit-learn requires python 3.7+, numpy 1.14.6+ and
    1919
    scipy 1.1.0+. Optional minimal dependency is matplotlib 2.2.2+.
    2020

    2121
    Enforcing keyword-only arguments

    ‎sklearn/_min_dependencies.py

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@
    77
    if platform.python_implementation() == 'PyPy':
    88
    NUMPY_MIN_VERSION = '1.19.0'
    99
    else:
    10-
    NUMPY_MIN_VERSION = '1.14.5'
    10+
    NUMPY_MIN_VERSION = '1.14.6'
    1111

    1212
    SCIPY_MIN_VERSION = '1.1.0'
    1313
    JOBLIB_MIN_VERSION = '0.11'
    @@ -27,7 +27,7 @@
    2727
    'cython': (CYTHON_MIN_VERSION, 'build'),
    2828
    'matplotlib': ('2.2.2', 'benchmark, docs, examples, tests'),
    2929
    'scikit-image': ('0.14.5', 'docs, examples, tests'),
    30-
    'pandas': ('0.23.4', 'benchmark, docs, examples, tests'),
    30+
    'pandas': ('0.25.0', 'benchmark, docs, examples, tests'),
    3131
    'seaborn': ('0.9.0', 'docs, examples'),
    3232
    'memory_profiler': ('0.57.0', 'benchmark, docs'),
    3333
    'pytest': (PYTEST_MIN_VERSION, 'tests'),

    ‎sklearn/tests/test_min_dependencies_readme.py

    Lines changed: 3 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -37,9 +37,11 @@ def test_min_dependencies_readme():
    3737
    continue
    3838

    3939
    package, version = matched.group(2), matched.group(5)
    40+
    package = package.lower()
    4041

    4142
    if package in dependent_packages:
    4243
    version = parse_version(version)
    4344
    min_version = parse_version(dependent_packages[package][0])
    4445

    45-
    assert version == min_version
    46+
    assert version == min_version, (f"{package} has a mismatched "
    47+
    "version")

    0 commit comments

    Comments
     (0)
    0