From d0a51f78d4705c2496c42a02c49b0bc70e931cf7 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Mon, 6 Apr 2020 09:12:47 +0100 Subject: Astropy now depending on the Expat library to fix internal conflict Until now, Astropy was instructed to build its own internal copy of the Expat library. However, with the recent commits before, Maneage now includes an installation of Expat and Astropy can't keep the two (its internal version and the project's version) separate, so they conflict and don't let Astropy get built. With this commit, the problem is fixed by setting the Expat library as an explicit dependency of Astropy and asking Astropy to ignore its internal copy. While doing this, I recognized that it is much easier and elegant to add steps in various stages of the `pybuild' function through hooks instead of variables. So the fifth argument of the `pybuild' function was removed and now it actually checks if hooks are defined as functions and if so, they will be called. The `pyhook_after' function was also implemented in the installation of `pybind11' (which needed it, given that the 5th argument of `pybuild' was removed) and after doing a test-build, I noticed that two lines were not ending with a `\' in `boost' (a dependency of `pybind11'). Commit written originally by Mohammad Akghlaghi --- .file-metadata | Bin 7946 -> 7874 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to '.file-metadata') diff --git a/.file-metadata b/.file-metadata index 0559dea..1cea790 100644 Binary files a/.file-metadata and b/.file-metadata differ -- cgit v1.2.1