8000 do it in CI · jeremiedbb/scikit-learn@019105e · GitHub
[go: up one dir, main page]
Skip to content

Commit 019105e

Browse files
jeremiedbbjeremiedbb
committed
do it in CI
1 parent f4c6f3c commit 019105e

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

‎MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ recursive-include sklearn *.c *.h *.pyx *.pxd *.pxi *.tp
55
recursive-include sklearn/datasets *.csv *.csv.gz *.rst *.jpg *.txt *.arff.gz *.json.gz
66
include COPYING
77
include README.rst
8+
include pyproject.toml

‎build_tools/azure/install.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ elif [[ "$DISTRIB" == "conda-pip-latest" ]]; then
8888
# we use pypi to test against the latest releases of the dependencies.
8989
# conda is still used as a convenient way to install Python and pip.
9090
make_conda "python=$PYTHON_VERSION"
91-
python -m pip install -U pip
92-
python -m pip install numpy scipy cython joblib
91+
# python -m pip install -U pip
9392
python -m pip install pytest==$PYTEST_VERSION pytest-cov pytest-xdist
9493
python -m pip install pandas matplotlib pyamg
9594
# do not install dependencies for lightgbm since it requires scikit-learn
@@ -120,7 +119,15 @@ except ImportError:
120119
"
121120
python -m pip list
122121

123-
# Use setup.py instead of `pip install -e .` to be able to pass the -j flag
124-
# to speed-up the building multicore CI machines.
125-
python setup.py build_ext --inplace -j 3
126-
python setup.py develop
122+
if [[ "$DISTRIB" == "conda-pip-latest" ]]; then
123+
# Check that pip can automatically install the build dependencies from
124+
# pyproject.toml using an isolated build environment:
125+
pip install --verbose --editable .
126+
else
127+
# Use the pre-installed build dependencies and build directly in the
128+
# current environment.
129+
# Use setup.py instead of `pip install -e .` to be able to pass the -j flag
130+
# to speed-up the building multicore CI machines.
131+
python setup.py build_ext --inplace -j 3
132+
python setup.py develop
133+
fi

‎pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ requires = [
66
"Cython>=0.28.5",
77
"numpy>=1.11.0",
88
"scipy>=0.17.0",
9-
"joblib>=0.11",
109
]

0 commit comments

Comments
 (0)
0