Skip to content
This repository was archived by the owner on Feb 14, 2023. It is now read-only.

BLD Uses pyproject.toml build dependencies in posix #58

Closed
wants to merge 9 commits into from
Closed

BLD Uses pyproject.toml build dependencies in posix #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aadb3fc
BLD Test build dependencies
thomasjpfan May 9, 2020
2632e85
TST Use verbose
thomasjpfan May 9, 2020
c7bfd85
TSTT Quick testt
thomasjpfan May 9, 2020
8d449a9
TST Just build
thomasjpfan May 9, 2020
7855274
REV
thomasjpfan May 9, 2020
4d11900
REV Just build
thomasjpfan May 9, 2020
9d9cd2b
REV Less diffs
thomasjpfan May 9, 2020
f566dbd
REV Less diffs
thomasjpfan May 9, 2020
9bfce1b
REV Less diffs
thomasjpfan May 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,16 @@ jobs:
py_3.7_32:
MB_PYTHON_VERSION: "3.7"
PLAT: "i686"
NP_BUILD_DEP: "numpy==1.14.5"
NIGHTLY_BUILD: "true"
py_3.7_64:
MB_PYTHON_VERSION: "3.7"
NP_BUILD_DEP: "numpy==1.14.5"
NIGHTLY_BUILD: "true"
py_3.8_32:
MB_PYTHON_VERSION: "3.8"
PLAT: "i686"
NP_BUILD_DEP: "numpy==1.17.3"
NIGHTLY_BUILD: "true"
py_3.8_64:
MB_PYTHON_VERSION: "3.8"
NP_BUILD_DEP: "numpy==1.17.3"
NIGHTLY_BUILD: "true"

- template: azure/posix.yml
Expand All @@ -78,12 +74,9 @@ jobs:
matrix:
py_3.6_64:
MB_PYTHON_VERSION: "3.6"
NP_BUILD_DEP: "numpy==1.13.3"
py_3.7_64:
MB_PYTHON_VERSION: "3.7"
NP_BUILD_DEP: "numpy==1.14.5"
NIGHTLY_BUILD: "true"
py_3.8_64:
MB_PYTHON_VERSION: "3.8"
NP_BUILD_DEP: "numpy==1.17.3"
NIGHTLY_BUILD: "true"
5 changes: 1 addition & 4 deletions azure/posix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ jobs:
REPO_DIR: "scikit-learn"
BUILD_COMMIT: "0.23.0rc1"
PLAT: "x86_64"
NP_BUILD_DEP: "numpy==1.13.3"
CYTHON_BUILD_DEP: "cython==0.29.14"
SCIPY_BUILD_DEP: "scipy"
JOBLIB_BUILD_DEP: "joblib==0.11"
NIGHTLY_BUILD_COMMIT: "master"
NIGHTLY_BUILD: "false"
TEST_DEPENDS: "pytest"
Expand Down Expand Up @@ -64,7 +61,7 @@ jobs:
- bash: |
set -e
pip install virtualenv
BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP"
BUILD_DEPENDS="$CYTHON_BUILD_DEP"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if multibuild is calling pip wheel, then do we need to specify a build depend here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Particularly that if it uses PEP517, this would have no effect. Maybe we should change pin the cython version in pyproject.toml to "Cython>=0.28.5,<3.0.0" ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if multibuild is calling pip wheel, then do we need to specify a build depend here?

Wheel is already specified in pyproject.toml.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should change pin the cython version in pyproject.toml to "Cython>=0.28.5,<3.0.0" ?

This was my concern as well.

multibuild does something equivalent to this:

pip install $BUILD_DEPENDS
pip wheel --no-deps .


source multibuild/common_utils.sh
source multibuild/travis_steps.sh
Expand Down