Merge pull request #4041 from Krande/v0.7.0-conda/update

V0.7.0 conda/daily-builds-update

.github/workflows/ci-ifcopenshell-conda-daily.yml

@@ -1,6 +1,7 @@
 name: ci-ifcopenshell-conda-daily
 
 on:
+  workflow_dispatch:
   push:
       paths:
         - .github/workflows/ci-ifcopenshell-conda-daily.yml
@@ -18,13 +19,13 @@ jobs:
   activate:
     runs-on: ubuntu-latest
     if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
+      github.repository == 'Krande/IfcOpenShell'
     steps:
       - name: Set env
         run: echo ok go
 
   test:
-    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}
+    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}-${{ matrix.variant }}
     needs: activate
     runs-on: ${{ matrix.platform.distver }}
     defaults:
@@ -42,10 +43,15 @@ jobs:
           { name: Linux, distver: ubuntu-22.04,  upload: 'true' },
           { name: macOS, distver: macos-12, upload: 'true' }
         ]
+        variant: [
+          'novtk',
+#          'all'
+        ]
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
+
       - name: Download MacOSX SDK
         if: ${{ matrix.platform.name == 'macOS' }}
         run: |
@@ -53,21 +59,21 @@ jobs:
           tar xf MacOSX10.13.sdk.tar.xz && \
           sudo mv -v MacOSX10.13.sdk /opt/ && \
           ls /opt/
+
       - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
         with:
+          environment-name: build-env
           cache-environment: true
-          environment-file: conda/environment.yml
           condarc: |
+            channels:
+              - conda-forge
             channel_priority: strict
           create-args: >-
-            python=${{ matrix.pyver.distver }}
+            python=3.11
+            boa
+
       - name: build, test and upload ifcopenshell
         if: ${{ matrix.platform.upload == 'true' }}
         run: |
-          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell
+          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge --variants "{variant: ${{ matrix.variant }}}" --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell
-        working-directory: ./conda
-      - name: build & test ifcopenshell
-        if: ${{ matrix.platform.upload == 'false' }}
-        run: |
-          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge
         working-directory: ./conda

cmake/CMakeLists.txt

@@ -585,23 +585,31 @@ if(HDF5_SUPPORT)
 
             if(WIN32)
                 # Windows
-                set(zlib_post zlib)
+                set(HDF5_LIBRARIES)
-                set(lib_ext lib)
+                find_package(HDF5 COMPONENTS CXX)
-            elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+                if (HDF5_FOUND)
-                # macOS
+                    set(HDF5_LIBRARIES ${HDF5_CXX_LIBRARIES})
-                set(zlib_post libz)
+                endif()
-                set(lib_ext dylib)
+                list(APPEND HDF5_LIBRARIES
+                    "${HDF5_LIBRARY_DIR}/zlib.lib"
+                )
             else()
-                # linux
+                if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-                set(zlib_post libz)
+                    # macOS
-                set(lib_ext so)
+                    set(zlib_post libz)
-            endif()
+                    set(lib_ext dylib)
+                else()
+                    # linux
+                    set(zlib_post libz)
+                    set(lib_ext so)
+                endif()
 
-            set(HDF5_LIBRARIES
+                set(HDF5_LIBRARIES
-                "${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
-                "${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
-                "${HDF5_LIBRARY_DIR}/${zlib_post}.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/${zlib_post}.${lib_ext}"
-            )
+                )
+            endif()
         endif()
     endif()
 

conda/Makefile

@@ -1,8 +0,0 @@
-compile:
-	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
-
-env:
-	conda env update --f environment.yml --prune

conda/conda_build_config.yaml

@@ -1,2 +1,6 @@
 CONDA_BUILD_SYSROOT:
-  - /opt/MacOSX10.13.sdk       # [osx]
+  - /opt/MacOSX10.13.sdk       # [osx]
+
+variant:
+  - novtk
+  - all

conda/environment.yml

@@ -1,13 +0,0 @@
-name: conda-build
-channels:
-  - conda-forge
-dependencies:
-  - conda-build
-  - conda-verify
-  - anaconda-client
-  - ninja
-  - doxygen
-  - ripgrep
-  - pip
-  - pip:
-      - lief==0.13

conda/meta.yaml

@@ -1,6 +1,10 @@
 {% set name = "ifcopenshell" %}
 {% set version = "0.7.0" %}
+{% set build = 1 %}
 
+# Higher number -> Always prioritize "novtk" variant over "all" variant
+{% set build = build + 200 %}   # [variant == "novtk"]
+{% set build = build + 100 %}   # [variant == "all"]
 
 package:
   name: {{ name }}
@@ -10,8 +14,9 @@ source:
   path: ..
 
 build:
+  string: {{ variant }}_h{{ PKG_HASH }}_{{ build }}
   binary_relocation: false [osx]
-  number: 1
+  number: {{ build }}
 
 requirements:
   build:
@@ -24,7 +29,7 @@ requirements:
   host:
     - python
     - boost-cpp
-    - occt ==7.7.0
+    - occt 7.7.2 *{{ variant }}*
     - libxml2
     - cgal-cpp
     - hdf5
@@ -36,16 +41,18 @@ requirements:
 
   run:
     - python
-    - {{ pin_compatible('occt', max_pin='x.x.x') }}
+    - occt 7.7.2 *{{ variant }}*
     - {{ pin_compatible('cgal-cpp', max_pin='x.x.x') }}
     - {{ pin_compatible('boost-cpp', max_pin='x.x.x') }}
+    - {{ pin_compatible('hdf5', max_pin='x.x.x') }}
     - libxml2
-    - hdf5
     - mpfr
     - gmp  # [unix]
     - mpir  # [win]
     - nlohmann_json
     - zlib
+  run_constrained:
+    - occt 7.7.2 *{{ variant }}*
 
 test:
   imports: