diff --git a/.github/workflows/python_cibuildwheel.yml b/.github/workflows/python_cibuildwheel.yml index 78d463a57..2874be3bb 100644 --- a/.github/workflows/python_cibuildwheel.yml +++ b/.github/workflows/python_cibuildwheel.yml @@ -48,12 +48,6 @@ jobs: with: platforms: all - - name: Force expansion of boost headers - run: | - mkdir b - cd b - cmake .. - - name: Build and test wheels uses: pypa/cibuildwheel@v2.21.3 env: diff --git a/wrappers/Python/setup.py b/wrappers/Python/setup.py index 48bf71f1d..60665bd23 100644 --- a/wrappers/Python/setup.py +++ b/wrappers/Python/setup.py @@ -5,6 +5,7 @@ from sysconfig import get_config_var from setuptools.command.build_ext import build_ext from multiprocessing import cpu_count +import shutil def copy_files(): def copytree(old, new): @@ -24,6 +25,13 @@ def copy2(old, new): copytree(os.path.join(CProot, 'externals/fmtlib/include/fmt'), os.path.join('CoolProp', 'include', 'fmt')) # Should be deprecated #copytree(os.path.join(CProot, 'externals/fmtlib/include/fmt'), os.path.join('CoolProp','include','fmt')) copy2(os.path.join(CProot, 'CoolPropBibTeXLibrary.bib'), os.path.join('CoolProp', 'CoolPropBibTeXLibrary.bib')) + + here = os.path.dirname(__file__) + root = os.path.abspath(here + '/../..') + if not os.path.exists(root+'/boost_CoolProp/boost/version.hpp'): + print('expanding boost sources') + shutil.unpack_archive(root+'/dev/docker/boost_bcp_docker/boost_CoolProp.tar.xz', root) + assert(os.path.exists(root+'/boost_CoolProp/boost/version.hpp')) print('files copied.')