diff --git a/conda/Makefile b/conda/Makefile index 3264931339..c4cb211f1f 100644 --- a/conda/Makefile +++ b/conda/Makefile @@ -1,11 +1,8 @@ compile: - conda activate conda-build && conda-build -c conda-forge . --keep-old-work --python 3.10.4 + conda activate conda-build && conda-build -c conda-forge . --keep-old-work --python 3.10.5 debug: conda activate conda-build && conda-debug -c conda-forge . --python 3.10.4 -install: - conda env create -f environment.yml - -update: - conda env update -n conda-build --file environment.yml --prune \ No newline at end of file +env: + conda env update --f environment.yml --prune \ No newline at end of file diff --git a/conda/bld.bat b/conda/bld.bat index 0cdccf2367..b25f46c9d6 100644 --- a/conda/bld.bat +++ b/conda/bld.bat @@ -11,6 +11,7 @@ cmake -G "Ninja" ^ -D OCC_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include\opencascade" ^ -D OCC_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^ -D CGAL_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^ + -D GMP_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^ -D GMP_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^ -D MPFR_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^ -D COLLADA_SUPPORT=OFF ^ @@ -30,10 +31,11 @@ cmake -G "Ninja" ^ -D BUILD_CONVERT:BOOL=ON ^ -D BUILD_IFCMAX:BOOL=OFF ^ -D IFCXML_SUPPORT:BOOL=ON ^ - -D BOOST_LIBRARYDIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^ - -D BOOST_INCLUDEDIR:FILEPATH="%LIBRARY_PREFIX%\include" ^ - -D BOOST_USE_STATIC_LIBS:BOOL=OFF ^ + -D Boost_LIBRARYDIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^ + -D Boost_INCLUDEDIR:FILEPATH="%LIBRARY_PREFIX%\include" ^ + -D Boost_USE_STATIC_LIBS:BOOL=OFF ^ %SRC_DIR%/cmake + if errorlevel 1 exit 1 :: Build and install diff --git a/conda/meta.yaml b/conda/meta.yaml index 6142a14bb2..942a7c675a 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -24,46 +24,31 @@ requirements: host: - python - - occt >={{ occt_version }} - - hdf5 >={{ hdf5_version }} - - cgal-cpp >={{ cgal_cpp_version }} - - nlohmann_json + - boost-cpp <=1.74.0 + - occt - libxml2 + - cgal-cpp + - hdf5 + - mpfr + - gmp # [unix] + - mpir # [win] + - nlohmann_json run: - python - - occt >={{ occt_version }} - - cgal-cpp >={{ cgal_cpp_version }} - - hdf5 >={{ hdf5_version }} - - lark-parser - - deepdiff - - requests + - boost-cpp <=1.74.0 + - occt + - libxml2 + - cgal-cpp + - hdf5 + - mpfr + - gmp # [unix] + - mpir # [win] - nlohmann_json - - isodate - - numpy >=1.17 test: imports: - ifcopenshell - requires: - - pytest - - pytest-cov - - numpy - - lxml - - isodate - - lark - - networkx - - xmlschema - #source_files: - # - src/ifcopenshell-python/test/api - # - src/ifcopenshell-python/test/util - # - src/ifcopenshell-python/test/bootstrap.py - # - src/ifcopenshell-python/test/test_file.py - # - src/ifcopenshell-python/test/test_wall_opening.py - # - src/ifcopenshell-python/test/__init__.py - #commands: - # #- pip install bcf-client - # - cd ../src/ifcopenshell-python/test && pytest -p no:pytest-blender about: home: http://ifcopenshell.org