Update casacore to 3.1.1 and make less version needy #19

gijzelaerr · 2018-12-12T14:19:04Z

unfortunately this still can't find the new boost python.

a minimal CMakeLists.txt like:

cmake_minimum_required(VERSION 3.13)
find_package(Boost REQUIRED COMPONENTS python)

still gives:

$  cmake ..
CMake Error at /usr/local/Cellar/cmake/3.13.1/share/cmake/Modules/FindBoost.cmake:2100 (message):
  Unable to find the requested Boost libraries.

  Boost version: 1.68.0

  Boost include path: /usr/local/include

  Could not find the following Boost libraries:

          boost_python

  No Boost libraries were found.  You may need to set BOOST_LIBRARYDIR to the
  directory containing Boost libraries or BOOST_ROOT to the location of
  Boost.
Call Stack (most recent call first):
  CMakeLists.txt:2 (find_package)


-- Configuring incomplete, errors occurred!
See also "/Users/gijs/bla/build/CMakeFiles/CMakeOutput.log".

with cmake 3.13.1 and boost 1.68.0 while it looks like this bug has been fixed since cmake 3.11.0

https://gitlab.kitware.com/cmake/cmake/commit/1673923c303c6a4184904c4c5849911feddb87e7

gijzelaerr · 2018-12-13T09:14:34Z

bingo!

https://cmake.org/cmake/help/v3.13/module/FindBoost.html

Note that Boost Python components require a Python version suffix (Boost 1.67 and later), e.g. python36 or python27 for the versions built against Python 3.6 and 2.7, respectively. This also applies to additional components using Python including mpi_python and numpy. Earlier Boost releases may use distribution-specific suffixes such as 2, 3 or 2.7. These may also be used as suffixes, but note that they are not portable.

gijzelaerr · 2018-12-13T10:15:20Z

i've issued a PR with a fix upstream casacore/casacore#846

Boost 1.67 Python components require a Python version suffix. The logic for this was added to the CMake machinery of the upstream library in casacore/casacore#846, but this won't make it into a release for a while. Add a patch in the meantime, to be removed on the next release.

gijzelaerr · 2018-12-13T10:46:35Z

we also need to make sure PYTHON2_LIBRARIES is correctly set, since by default something goes wrong:

-- PYTHON2_EXECUTABLE ......... = /usr/local/bin/python2
-- PYTHON2_LIBRARIES........... = /usr/lib/libpython2.7.dylib
-- PYTHON2_NUMPY_INCLUDE_DIRS . = /usr/local/lib/python2.7/site-packages/numpy/core/include
-- PYTHON2_Boost_LIBRARIES .... = /usr/local/lib/libboost_python27-mt.dylib
-- PYTHON2_Boost_INCLUDE_DIRS . = /usr/local/include
-- PYTHON3_EXECUTABLE ......... = /usr/local/bin/python3.7
-- PYTHON3_LIBRARIES .......... = /usr/local/Frameworks/Python.framework/Versions/3.7/lib/libpython3.7m.dylib
-- PYTHON3_NUMPY_INCLUDE_DIRS . = /usr/local/lib/python3.7/site-packages/numpy/core/include
-- PYTHON3_Boost_LIBRARIES .... = /usr/local/lib/libboost_python37-mt.dylib
-- PYTHON3_Boost_INCLUDE_DIRS . = /usr/local/include

gijzelaerr · 2018-12-13T10:51:11Z

ah you already do that. @ludwigschwardt you are my hero.

ludwigschwardt · 2018-12-13T11:12:26Z

I aim to please!

ludwigschwardt · 2019-01-14T12:37:23Z

Anything more here? What about PYTHON2_LIBRARIES?

I guess it's picking up the system Python (associated with the default command python) instead of the brew-provided python2.

gijzelaerr · 2019-01-14T12:40:01Z

yes, we need to make sure that is overwritten in the recipe

ludwigschwardt · 2019-05-15T11:47:01Z

I'm busy extending this branch to catch up with the latest changes...

The wcslib formula moved back to homebrew/core in July 2018 after brewsci grew stale. The boost-python library for Python 3 has a separate formula since 1.66.0 (Feb 2018). Restore gcc dependency since casacore looks for a Fortran compiler during cmake configure. Since casacore 3.0 it is now mandatory to use C++11 features (see casacore/casacore#580). Also ensure that undefined symbols are ignored until runtime in the Python shared library.

Only apply the patch to current releases (3.0 and 3.1). The HEAD and future 3.2 release already has it (due to casacore/casacore#846).

These provide more robust detection of Python versions on macOS and replace the functionality of casacore's FindPython.cmake and FindNUMPY.cmake. Previously the Homebrew Python 3 include dirs were confused with those of Homebrew Python 2. There is also no need to hardcode the Python executable and library (always a bad idea). While these modules are available since cmake 3.12, they could be copied to casacore and still run on cmake 3.7, in case the bigger project has need of them.

The stable patch turns v3.0.0 into c349f27, effectively applying #846. The original patch only included the first commit of this PR (d'oh). The cmake patch now applies on top of #846 and also works on the latest HEAD.

The boost-python3 formula has no --with-python option (that sounds tautological anyway).

Use latest stable version from GitHub.

Follow the "Python for Formula Authors" document, which states that 'Python 2 libraries do not need a depends_on "python@2" declaration; they will be built with the system Python, but should still be usable with any other Python 2.7.' Thereby make the optional python@2 support mandatory, since system Python 2.7 is always available.

ludwigschwardt · 2019-05-22T21:03:53Z

This currently does v3.1.0 fine but I suspect HEAD is broken. Should we merge this so long and open another PR once 3.1.1 comes out? That would probably allow me to get rid of the patches in that PR.

The HEAD no longer needs a patch (although it is currently running off a feature branch to be merged as casacore/casacore#922). Now use a single patch that turns v3.1.0 into HEAD (at least as far as the Python build scripts are concerned).

ludwigschwardt · 2019-05-28T15:06:23Z

The HEAD support now works again (based off casacore/casacore#922).

ludwigschwardt · 2019-06-05T12:46:26Z

@gijzelaerr, if we can get casacore/casacore#922 merged in time for the 3.1.1 release, I can remove all the patches in this formula... 😉

Thanks to casacore/casacore#922 we can also drop all the patches.

ludwigschwardt · 2019-06-05T14:34:54Z

This works on my laptop with no patches now... Happy to merge if you are.

Update casacore to 3.0 and make less version needy

8003fd2

gijzelaerr requested a review from ludwigschwardt December 12, 2018 14:19

gijzelaerr mentioned this pull request Dec 13, 2018

Boost 1.67 Python components require a Python version suffix casacore/casacore#844

Closed

ludwigschwardt added 9 commits May 17, 2019 10:28

Move boost-python patch to GitHub gist

f72c661

Only apply the patch to current releases (3.0 and 3.1). The HEAD and future 3.2 release already has it (due to casacore/casacore#846).

casacore: simplify conditional build flags

462adc5

casacore: add sha256 to patches

f02155d

Redo patches to work with latest HEAD

c2ec22f

The stable patch turns v3.0.0 into c349f27, effectively applying #846. The original patch only included the first commit of this PR (d'oh). The cmake patch now applies on top of #846 and also works on the latest HEAD.

Remove a non-existent option for dependency

17ec2fb

The boost-python3 formula has no --with-python option (that sounds tautological anyway).

casacore 3.1.0

da867b7

Use latest stable version from GitHub.

ludwigschwardt approved these changes May 22, 2019

View reviewed changes

ludwigschwardt changed the title ~~Update casacore to 3.0 and make less version needy~~ Update casacore to 3.1 and make less version needy May 22, 2019

casacore: Fix HEAD and unify patch for v3.1.0

13426d2

The HEAD no longer needs a patch (although it is currently running off a feature branch to be merged as casacore/casacore#922). Now use a single patch that turns v3.1.0 into HEAD (at least as far as the Python build scripts are concerned).

casacore 3.1.1

4d13249

Thanks to casacore/casacore#922 we can also drop all the patches.

ludwigschwardt changed the title ~~Update casacore to 3.1 and make less version needy~~ Update casacore to 3.1.1 and make less version needy Jun 5, 2019

ludwigschwardt merged commit ca26a14 into master Jun 12, 2019

ludwigschwardt deleted the casacore30 branch June 12, 2019 08:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update casacore to 3.1.1 and make less version needy #19

Update casacore to 3.1.1 and make less version needy #19

gijzelaerr commented Dec 12, 2018

gijzelaerr commented Dec 13, 2018 •

edited

gijzelaerr commented Dec 13, 2018

gijzelaerr commented Dec 13, 2018

gijzelaerr commented Dec 13, 2018

ludwigschwardt commented Dec 13, 2018

ludwigschwardt commented Jan 14, 2019

gijzelaerr commented Jan 14, 2019

ludwigschwardt commented May 15, 2019

ludwigschwardt commented May 22, 2019

ludwigschwardt commented May 28, 2019

ludwigschwardt commented Jun 5, 2019

ludwigschwardt commented Jun 5, 2019

Update casacore to 3.1.1 and make less version needy #19

Update casacore to 3.1.1 and make less version needy #19

Conversation

gijzelaerr commented Dec 12, 2018

gijzelaerr commented Dec 13, 2018 • edited

gijzelaerr commented Dec 13, 2018

gijzelaerr commented Dec 13, 2018

gijzelaerr commented Dec 13, 2018

ludwigschwardt commented Dec 13, 2018

ludwigschwardt commented Jan 14, 2019

gijzelaerr commented Jan 14, 2019

ludwigschwardt commented May 15, 2019

ludwigschwardt commented May 22, 2019

ludwigschwardt commented May 28, 2019

ludwigschwardt commented Jun 5, 2019

ludwigschwardt commented Jun 5, 2019

gijzelaerr commented Dec 13, 2018 •

edited