Skip to content

Commit ec1be32

Browse files
authored
BLD: use more modern way to specify license metadata (scikit-learn#31560)
1 parent 91ffbff commit ec1be32

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

build_tools/azure/pymin_conda_forge_openblas_min_dependencies_environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
- pillow
2020
- pip
2121
- ninja
22-
- meson-python=0.16.0 # min
22+
- meson-python=0.17.1 # min
2323
- pytest-cov
2424
- coverage
2525
- ccache

build_tools/azure/pymin_conda_forge_openblas_min_dependencies_linux-64_conda.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libclang13-20.1.7-default_he06ed
166166
https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-20_linux64_openblas.conda#6fabc51f5e647d09cc010c40061557e0
167167
https://conda.anaconda.org/conda-forge/linux-64/libpq-17.5-h27ae623_0.conda#6458be24f09e1b034902ab44fe9de908
168168
https://conda.anaconda.org/conda-forge/linux-64/libsndfile-1.2.2-hc60ed4a_1.conda#ef1910918dd895516a769ed36b5b3a4e
169-
https://conda.anaconda.org/conda-forge/noarch/meson-python-0.16.0-pyh0c530f3_0.conda#e16f0dbf502da873be9f9adb0dc52547
169+
https://conda.anaconda.org/conda-forge/noarch/meson-python-0.17.1-pyh70fd9c4_0.conda#722b649da38842068d83b6e6770f11a1
170170
https://conda.anaconda.org/conda-forge/linux-64/pyqt5-sip-12.17.0-py310hf71b8c6_1.conda#696c7414297907d7647a5176031c8c69
171171
https://conda.anaconda.org/conda-forge/noarch/pytest-8.4.0-pyhd8ed1ab_0.conda#516d31f063ce7e49ced17f105b63a1f1
172172
https://conda.anaconda.org/conda-forge/linux-64/cairo-1.18.4-h3394656_0.conda#09262e66b19567aff4f592fb53b28760

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ dependencies = [
1313
"threadpoolctl>=3.1.0",
1414
]
1515
requires-python = ">=3.10"
16-
license = {file = "COPYING"}
16+
license = "BSD-3-Clause"
17+
license-files = ["COPYING"]
1718
classifiers=[
1819
"Intended Audience :: Science/Research",
1920
"Intended Audience :: Developers",
20-
"License :: OSI Approved :: BSD License",
2121
"Programming Language :: C",
2222
"Programming Language :: Python",
2323
"Topic :: Software Development",
@@ -43,7 +43,7 @@ tracker = "https://github.com/scikit-learn/scikit-learn/issues"
4343
"release notes" = "https://scikit-learn.org/stable/whats_new"
4444

4545
[project.optional-dependencies]
46-
build = ["numpy>=1.22.0", "scipy>=1.8.0", "cython>=3.0.10", "meson-python>=0.16.0"]
46+
build = ["numpy>=1.22.0", "scipy>=1.8.0", "cython>=3.0.10", "meson-python>=0.17.1"]
4747
install = ["numpy>=1.22.0", "scipy>=1.8.0", "joblib>=1.2.0", "threadpoolctl>=3.1.0"]
4848
benchmark = ["matplotlib>=3.5.0", "pandas>=1.4.0", "memory_profiler>=0.57.0"]
4949
docs = [

sklearn/_min_dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"joblib": (JOBLIB_MIN_VERSION, "install"),
2525
"threadpoolctl": (THREADPOOLCTL_MIN_VERSION, "install"),
2626
"cython": (CYTHON_MIN_VERSION, "build"),
27-
"meson-python": ("0.16.0", "build"),
27+
"meson-python": ("0.17.1", "build"),
2828
"matplotlib": ("3.5.0", "benchmark, docs, examples, tests"),
2929
"scikit-image": ("0.19.0", "docs, examples, tests"),
3030
"pandas": ("1.4.0", "benchmark, docs, examples, tests"),

0 commit comments

Comments
 (0)