From b714a954c34d3adf485f05d51753931933084c36 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 15 Jul 2019 08:42:36 +0100 Subject: [PATCH 1/2] Add a pyproject.toml declaring build dependencies. --- MANIFEST.in | 1 + pyproject.toml | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 pyproject.toml diff --git a/MANIFEST.in b/MANIFEST.in index 327a7bb97..2a6900bc4 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -12,3 +12,4 @@ include CHANGES.txt include LICENSE.txt include image_LICENSE.txt include dev_requirements.txt +include pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..fd2c633eb --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,2 @@ +[build-system] +requires = ["Cython", "numpy", "setuptools", "wheel"] From 4257f0bfd89f0c37c3ce01db59fd8cb99f84c525 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 15 Jul 2019 10:05:46 +0100 Subject: [PATCH 2/2] Use --no-build-isolation to avoid NumPy ABI mismatches. --- ci/edmtool.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/edmtool.py b/ci/edmtool.py index f42d2d982..4ec22b928 100644 --- a/ci/edmtool.py +++ b/ci/edmtool.py @@ -130,7 +130,10 @@ def install(runtime, toolkit, environment): # Note that enable dependencies will be installed implicitly using pip ("edm run -e {environment} -- " "pip install git+https://git@github.com/enthought/enable.git"), - "edm run -e {environment} -- pip install . --no-deps", + # Use --no-build-isolation to avoid trying to build using a different + # NumPy version from the one currently installed. + ("edm run -e {environment} -- " + "pip install . --no-build-isolation --no-dependencies"), ] click.echo("Creating environment '{environment}'".format(**parameters)) execute(commands, parameters)