8000 MAINT Bump min dependencies for 1.2 (#24650) · scikit-learn/scikit-learn@6697de3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6697de3

Browse files
jeremiedbbjjerphan
jeremiedbb
and
jjerphan
authored
MAINT Bump min dependencies for 1.2 (#24650)
 Co-authored-by: Julien Jerphanion <git@jjerphan.xyz>
1 parent 04d0e4a commit 6697de3

19 files changed

+81
-87
lines changed

‎README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
.. |SciPyMinVersion| replace:: 1.3.2
3838
.. |JoblibMinVersion| replace:: 1.1.1
3939
.. |ThreadpoolctlMinVersion| replace:: 2.0.0
40-
.. |MatplotlibMinVersion| replace:: 3.1.2
40+
.. |MatplotlibMinVersion| replace:: 3.1.3
4141
.. |Scikit-ImageMinVersion| replace:: 0.16.2
4242
.. |PandasMinVersion| replace:: 1.0.5
4343
.. |SeabornMinVersion| replace:: 0.9.0
44-
.. |PytestMinVersion| replace:: 5.0.1
44+
.. |PytestMinVersion| replace:: 5.3.1
4545
.. |PlotlyMinVersion| replace:: 5.10.0
4646

4747
.. image:: https://raw.githubusercontent.com/scikit-learn/scikit-learn/main/doc/logos/scikit-learn-logo.png

‎build_tools/azure/debian_atlas_32bit_lock.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@
44
#
55
# pip-compile --output-file=build_tools/azure/debian_atlas_32bit_lock.txt build_tools/azure/debian_atlas_32bit_requirements.txt
66
#
7-
atomicwrites==1.4.1
8-
# via pytest
97
attrs==22.1.0
108
# via pytest
119
cython==0.29.32
1210
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
13-
importlib-metadata==5.0.0
14-
# via pytest
1511
joblib==1.1.1
1612
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
1713
more-itertools==8.14.0
@@ -24,11 +20,9 @@ py==1.11.0
2420
# via pytest
2521
pyparsing==3.0.9
2622
# via packaging
27-
pytest==5.0.1
23+
pytest==5.3.1
2824
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
2925
threadpoolctl==2.2.0
3026
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
3127
wcwidth==0.2.5
3228
# via pytest
33-
zipp==3.9.0
34-
# via importlib-metadata

‎build_tools/azure/debian_atlas_32bit_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
cython
55
joblib==1.1.1 # min
66
threadpoolctl==2.2.0
7-
pytest==5.0.1 # min
7+
pytest==5.3.1 # min

‎build_tools/azure/py38_conda_defaults_openblas_environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- cython
1212
- joblib
1313
- threadpoolctl=2.2.0
14-
- matplotlib=3.1.2 # min
14+
- matplotlib=3.1.3 # min
1515
- pandas
1616
- pyamg
1717
- pytest

‎build_tools/azure/py38_conda_defaults_openblas_linux-64_conda.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 521d4593b3631c5664aab0f4ee9bf373d01f23eb259523d25b091e922b650277
3+
# input_hash: 7184185b2f602d32d800163b557c1de30079960d91e3889058752aed7a4dba88
44
@EXPLICIT
55
https://repo.anaconda.com/pkgs/main/linux-64/_libgcc_mutex-0.1-main.conda#c3473ff8bdb3d124ed5ff11ec380d6f9
66
https://repo.anaconda.com/pkgs/main/linux-64/blas-1.0-openblas.conda#9ddfcaef10d79366c90128f5dc444be8
@@ -90,20 +90,20 @@ https://repo.anaconda.com/pkgs/main/linux-64/qt-webengine-5.15.9-hd2b0992_4.cond
9090
https://repo.anaconda.com/pkgs/main/linux-64/setuptools-63.4.1-py38h06a4308_0.conda#307186073689cfd6ece38172333659e8
9191
https://repo.anaconda.com/pkgs/main/linux-64/brotlipy-0.7.0-py38h27cfd23_1003.conda#e881c8ee8a4048f29da5d20f0330fe37
9292
https://repo.anaconda.com/pkgs/main/linux-64/cryptography-37.0.1-py38h9ce1e76_0.conda#16d301ed789096eb9881a25ed7a1155e
93-
https://repo.anaconda.com/pkgs/main/linux-64/matplotlib-base-3.1.2-py38hef1b27d_1.conda#5e99f974f4c2757791aa10a27596230a
93+
https://repo.anaconda.com/pkgs/main/linux-64/matplotlib-base-3.1.3-py38hef1b27d_0.conda#a7ad7d097c25b7beeb76f370d51687a1
9494
https://repo.anaconda.com/pkgs/main/linux-64/pandas-1.2.4-py38ha9443f7_0.conda#5bd3fd807a294f387feabc65821b75d0
9595
https://repo.anaconda.com/pkgs/main/linux-64/pytest-7.1.2-py38h06a4308_0.conda#8d7f526a3d29273e06957d302f515755
9696
https://repo.anaconda.com/pkgs/main/linux-64/qtwebkit-5.212-h4eab89a_4.conda#7317bbf3f3e66a0a02b07b860783ecff
9797
https://repo.anaconda.com/pkgs/main/linux-64/scipy-1.3.2-py38he2b7bc3_0.conda#a9df91d5a41c1f39524fc8a53c56bc29
9898
https://repo.anaconda.com/pkgs/main/linux-64/sip-6.6.2-py38h6a678d5_0.conda#cb3f0d10f7f79870945f4dbbe0000f92
99-
https://repo.anaconda.com/pkgs/main/linux-64/pyamg-4.1.0-py38h9a67853_0.conda#9b0bffd5f67e0c5ee3c226e5518991fb
99+
https://repo.anaconda.com/pkgs/main/linux-64/pyamg-4.2.3-py38h79cecc1_0.conda#6e7f4f94000b244396de8bf4e6ae8dc4
100100
https://repo.anaconda.com/pkgs/main/noarch/pyopenssl-22.0.0-pyhd3eb1b0_0.conda#1dbbf9422269cd62c7094960d9b43f36
101101
https://repo.anaconda.com/pkgs/main/linux-64/pyqt5-sip-12.11.0-py38h6a678d5_1.conda#7bc403c7d55f1465e922964d293d2186
102102
https://repo.anaconda.com/pkgs/main/noarch/pytest-cov-3.0.0-pyhd3eb1b0_0.conda#bbdaac2947f507399816d509107945c2
103103
https://repo.anaconda.com/pkgs/main/noarch/pytest-forked-1.3.0-pyhd3eb1b0_0.tar.bz2#07970bffdc78f417d7f8f1c7e620f5c4
104104
https://repo.anaconda.com/pkgs/main/linux-64/pyqt-5.15.7-py38h6a678d5_1.conda#62232dc285be8e7e85ae9596d89b3b95
105105
https://repo.anaconda.com/pkgs/main/noarch/pytest-xdist-2.5.0-pyhd3eb1b0_0.conda#d15cdc4207bcf8ca920822597f1d138d
106106
https://repo.anaconda.com/pkgs/main/linux-64/urllib3-1.26.11-py38h06a4308_0.conda#b16ef1a57c169d8211e058e91debb20f
107-
https://repo.anaconda.com/pkgs/main/linux-64/matplotlib-3.1.2-py38_1.conda#1781036a02c5def820ea2923074d158a
107+
https://repo.anaconda.com/pkgs/main/linux-64/matplotlib-3.1.3-py38_0.conda#70d5f6df438d469dc78f082389ada23d
108108
https://repo.anaconda.com/pkgs/main/linux-64/requests-2.28.1-py38h06a4308_0.conda#04d482ea4a1e190d688dee2e4048e49f
109109
https://repo.anaconda.com/pkgs/main/noarch/codecov-2.1.11-pyhd3eb1b0_0.conda#83a743cc928162d53d4066c43468b2c7

‎build_tools/azure/py38_conda_forge_mkl_win-64_conda.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ https://conda.anaconda.org/conda-forge/win-64/openssl-1.1.1q-h8ffe710_0.tar.bz2#
2929
https://conda.anaconda.org/conda-forge/win-64/tbb-2021.6.0-h91493d7_0.tar.bz2#d77a85d975cd7bc00e8514771320e7e2
3030
https://conda.anaconda.org/conda-forge/win-64/tk-8.6.12-h8ffe710_0.tar.bz2#c69a5047cc9291ae40afd4a1ad6f0c0f
3131
https://conda.anaconda.org/conda-forge/win-64/xz-5.2.6-h8d14728_0.tar.bz2#515d77642eaa3639413c6b1bc3f94219
32-
https://conda.anaconda.org/conda-forge/win-64/gettext-0.19.8.1-h5728263_1009.tar.bz2#7f0ab82b5225b4a8450f2cd972dd6322
32+
https://conda.anaconda.org/conda-forge/win-64/gettext-0.21.1-h5728263_0.tar.bz2#299d4fd6798a45337042ff5a48219e5f
3333
https://conda.anaconda.org/conda-forge/win-64/krb5-1.19.3-h1176d77_0.tar.bz2#2e0d447ab95d58d3ea1222121ec57f9f
3434
https://conda.anaconda.org/conda-forge/win-64/libbrotlidec-1.0.9-h8ffe710_7.tar.bz2#ca57bf17ba92eed4ca2667a4c5df9343
3535
https://conda.anaconda.org/conda-forge/win-64/libbrotlienc-1.0.9-h8ffe710_7.tar.bz2#75c0a84c7f22d57cda6aaf7205b4a27c
@@ -98,24 +98,24 @@ https://conda.anaconda.org/conda-forge/win-64/win_inet_pton-1.1.0-py38haa244fe_4
9898
https://conda.anaconda.org/conda-forge/win-64/blas-devel-3.9.0-16_win64_mkl.tar.bz2#dc89c75a7dd26c88ac77d64bf313973e
9999
https://conda.anaconda.org/conda-forge/win-64/brotlipy-0.7.0-py38h294d835_1004.tar.bz2#f12a527d29a252cef0abbfd752d3ab01
100100
https://conda.anaconda.org/conda-forge/win-64/contourpy-1.0.5-py38hb1fd069_0.tar.bz2#f2b3988071a676e4f7a9ab0651aedc67
101-
https://conda.anaconda.org/conda-forge/win-64/cryptography-38.0.1-py38h086c683_0.tar.bz2#51d479f7ada36844d335554433a4156c
101+
https://conda.anaconda.org/conda-forge/win-64/cryptography-38.0.2-py38h086c683_0.tar.bz2#476c35bf1ad83cd649876496fc87c1ff
102102
https://conda.anaconda.org/conda-forge/win-64/fonttools-4.37.4-py38h91455d4_0.tar.bz2#fca948ff9c68652778aa87533b28f600
103103
https://conda.anaconda.org/conda-forge/win-64/gstreamer-1.20.3-h6b5321d_2.tar.bz2#bf1954820a81fe4a47ed0ddf884923b5
104104
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyh0701188_6.tar.bz2#56cd9fe388baac0e90c7149cfac95b60
105105
https://conda.anaconda.org/conda-forge/win-64/pytest-7.1.3-py38haa244fe_0.tar.bz2#5fcc7923228bf6bc63729c8fd29a3e22
106106
https://conda.anaconda.org/conda-forge/win-64/scipy-1.9.1-py38h91810f7_0.tar.bz2#1d5949cdfaad5668613da93e6f0a80d0
107-
https://conda.anaconda.org/conda-forge/win-64/sip-6.6.2-py38h885f38d_0.tar.bz2#e7ded925411fbd38c929e869adc341b6
107+
https://conda.anaconda.org/conda-forge/win-64/sip-6.7.2-py38hd3f51b4_0.tar.bz2#7876ebe67316395ea7696daad0892e46
108108
https://conda.anaconda.org/conda-forge/win-64/blas-2.116-mkl.tar.bz2#7529860b43278247a278c6f56a191d2e
109109
https://conda.anaconda.org/conda-forge/win-64/gst-plugins-base-1.20.3-h001b923_2.tar.bz2#86d27bed1422db2e98540a9945079b36
110-
https://conda.anaconda.org/conda-forge/win-64/matplotlib-base-3.6.0-py38h528a6c7_0.tar.bz2#0a501e1e721d4c4bbf5239adbf30018f
110+
https://conda.anaconda.org/conda-forge/win-64/matplotlib-base-3.6.1-py38h528a6c7_0.tar.bz2#ce4fc80ef9866586879fc17d8a4fc3ae
111111
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
112-
https://conda.anaconda.org/conda-forge/win-64/pyqt5-sip-12.11.0-py38h885f38d_0.tar.bz2#fcee1a2fdbb5a879fc7f80be5dd9351c
112+
https://conda.anaconda.org/conda-forge/win-64/pyqt5-sip-12.11.0-py38hd3f51b4_1.tar.bz2#551addc92297428c1b5a4ec216fc1053
113113
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
114114
https://conda.anaconda.org/conda-forge/noarch/pytest-forked-1.4.0-pyhd8ed1ab_0.tar.bz2#95286e05a617de9ebfe3246cecbfb72f
115115
https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-2.5.0-pyhd8ed1ab_0.tar.bz2#1fdd1f3baccf0deb647385c677a1a48e
116116
https://conda.anaconda.org/conda-forge/win-64/qt-main-5.15.6-hf0cf448_0.tar.bz2#b66383422c11418148d7dc1341b83a97
117117
https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.11-pyhd8ed1ab_0.tar.bz2#0738978569b10669bdef41c671252dd1
118-
https://conda.anaconda.org/conda-forge/win-64/pyqt-5.15.7-py38h75e37d8_0.tar.bz2#f0e72b93887a28d4c406c2ac393b924d
118+
https://conda.anaconda.org/conda-forge/win-64/pyqt-5.15.7-py38hd6c051e_1.tar.bz2#fd2dca769a15c1b8b746db2126a70adb
119119
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.1-pyhd8ed1ab_1.tar.bz2#089382ee0e2dc2eae33a04cc3c2bddb0
120120
https://conda.anaconda.org/conda-forge/noarch/codecov-2.1.11-pyhd3deb0d_0.tar.bz2#9c661c2c14b4667827218402e6624ad5
121-
https://conda.anaconda.org/conda-forge/win-64/matplotlib-3.6.0-py38haa244fe_0.tar.bz2#bc866fe6862b43cf9ed97ab5aa5ba9a0
121+
https://conda.anaconda.org/conda-forge/win-64/matplotlib-3.6.1-py38haa244fe_0.tar.bz2#bcbbd80924c1691ddc43c64c8d872d6a

‎build_tools/azure/py38_conda_forge_openblas_ubuntu_2204_linux-64_conda.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-12.1.0-h8d9b700_16.tar
1919
https://conda.anaconda.org/conda-forge/linux-64/alsa-lib-1.2.3.2-h166bdaf_0.tar.bz2#b7607b7b62dce55c194ad84f99464e5f
2020
https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h7f98852_4.tar.bz2#a1fd65c7ccbf10880423d82bca54eb54
2121
https://conda.anaconda.org/conda-forge/linux-64/expat-2.4.9-h27087fc_0.tar.bz2#493ac8b2503a949aebe33d99ea0c284f
22-
https://conda.anaconda.org/conda-forge/linux-64/gettext-0.19.8.1-h27087fc_1009.tar.bz2#17f91dc8bb7a259b02be5bfb2cd2395f
22+
https://conda.anaconda.org/conda-forge/linux-64/gettext-0.21.1-h27087fc_0.tar.bz2#14947d8770185e5153fdd04d4673ed37
2323
https://conda.anaconda.org/conda-forge/linux-64/icu-69.1-h9c3ff4c_0.tar.bz2#e0773c9556d588b062a4e1424a6a02fa
2424
https://conda.anaconda.org/conda-forge/linux-64/jpeg-9e-h166bdaf_2.tar.bz2#ee8b844357a0946870901c7c6f418268
2525
https://conda.anaconda.org/conda-forge/linux-64/keyutils-1.6.1-h166bdaf_0.tar.bz2#30186d27e2c9fa62b45fb1476b7200e3
@@ -54,7 +54,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.39.4-h753d276_0.tar.
5454
https://conda.anaconda.org/conda-forge/linux-64/libvorbis-1.3.7-h9c3ff4c_0.tar.bz2#309dec04b70a3cc0f1e84a4013683bc0
5555
https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.13-h7f98852_1004.tar.bz2#b3653fdc58d03face9724f602218a904
5656
https://conda.anaconda.org/conda-forge/linux-64/llvm-openmp-14.0.4-he0ac6c6_0.tar.bz2#cecc6e3cb66570ffcfb820c637890f54
57-
https://conda.anaconda.org/conda-forge/linux-64/mysql-common-8.0.30-h26416b9_1.tar.bz2#536a89431b8f61f08b56979793b07735
57+
https://conda.anaconda.org/conda-forge/linux-64/mysql-common-8.0.31-h26416b9_0.tar.bz2#6c531bc30d49ae75b9c7c7f65bd62e3c
5858
https://conda.anaconda.org/conda-forge/linux-64/openblas-0.3.21-pthreads_h320a7e8_3.tar.bz2#29155b9196b9d78022f11d86733e25a7
5959
https://conda.anaconda.org/conda-forge/linux-64/pcre2-10.37-hc3806b6_1.tar.bz2#dfd26f27a9d5de96cec1d007b9aeb964
6060
https://conda.anaconda.org/conda-forge/linux-64/readline-8.1.2-h0f457ee_0.tar.bz2#db2ebbe2943aae81ed051a6a9af8e0fa
@@ -71,7 +71,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libglib-2.74.0-h7a41b64_0.tar.bz
7171
https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-16_linux64_openblas.tar.bz2#955d993f41f9354bf753d29864ea20ad
7272
https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.4.0-h55922b4_4.tar.bz2#901791f0ec7cddc8714e76e273013a91
7373
https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.9.12-h885dcf4_1.tar.bz2#d1355eaa48f465782f228275a0a69771
74-
https://conda.anaconda.org/conda-forge/linux-64/mysql-libs-8.0.30-hbc51c84_1.tar.bz2#0113585f1ba3aecdcde9715f7a674628
74+
https://conda.anaconda.org/conda-forge/linux-64/mysql-libs-8.0.31-hbc51c84_0.tar.bz2#da9633eee814d4e910fe42643a356315
7575
https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.39.4-h4ff8645_0.tar.bz2#643c271de2dd23ecbd107284426cebc2
7676
https://conda.anaconda.org/conda-forge/linux-64/brotli-1.0.9-h166bdaf_7.tar.bz2#3889dec08a472eb0f423e5609c76bde1
7777
https://conda.anaconda.org/conda-forge/linux-64/dbus-1.13.6-h5008d03_3.tar.bz2#ecfff944ba3960ecb334b9a2663d708d
@@ -119,7 +119,7 @@ https://conda.anaconda.org/conda-forge/linux-64/gst-plugins-base-1.20.2-hcf0ee16
119119
https://conda.anaconda.org/conda-forge/linux-64/pandas-1.5.0-py38h8f669ce_0.tar.bz2#f91da48c62c91659da28bd95559c75ff
120120
https://conda.anaconda.org/conda-forge/linux-64/pytest-7.1.3-py38h578d9bd_0.tar.bz2#1fdabff56623511910fef3b418ff07a2
121121
https://conda.anaconda.org/conda-forge/linux-64/scipy-1.9.1-py38hea3f02b_0.tar.bz2#b232edb409c6a79e5921b3591c56b716
122-
https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.6.0-py38hb021067_0.tar.bz2#315ee5c0fbee508e739ddfac2bf8f600
122+
https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.6.1-py38hb021067_0.tar.bz2#1226af4c6a26df15456ff07d0c3d2329
123123
https://conda.anaconda.org/conda-forge/linux-64/pyamg-4.2.3-py38h514daf8_1.tar.bz2#467a1279aaf475bacad655b585d2ac7b
124124
https://conda.anaconda.org/conda-forge/noarch/pytest-forked-1.4.0-pyhd8ed1ab_0.tar.bz2#95286e05a617de9ebfe3246cecbfb72f
125125
https://conda.anaconda.org/conda-forge/linux-64/qt-5.12.9-h1304e3e_6.tar.bz2#f2985d160b8c43dd427923c04cd732fe
@@ -128,4 +128,4 @@ https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-2.5.0-pyhd8ed1ab_0.ta
128128
https://conda.anaconda.org/conda-forge/linux-64/pyqtchart-5.12-py38h7400c14_8.tar.bz2#78a2a6cb4ef31f997c1bee8223a9e579
129129
https://conda.anaconda.org/conda-forge/linux-64/pyqtwebengine-5.12.1-py38h7400c14_8.tar.bz2#857894ea9c5e53c962c3a0932efa71ea
130130
https://conda.anaconda.org/conda-forge/linux-64/pyqt-5.12.3-py38h578d9bd_8.tar.bz2#88368a5889f31dff922a2d57bbfc3f5b
131-
https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.6.0-py38h578d9bd_0.tar.bz2#602eb908e81892115c1405c9d99abd56
131+
https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.6.1-py38h578d9bd_0.tar.bz2#b2d6012764e0ccb9e2f7f7c9aab261a5

0 commit comments

Comments
 (0)
0