Drop support for conda packages.

* The user can simply set -DCMAKE_PREFIX_PATH=$ENV{CONDA_PREFIX} or similar to point find_package to the conda installation or set <PackageName>_ROOT variables to point directly to the desired packages
DavidAce · Jun 7, 2021 · 87e9823 · 87e9823
1 parent 57127ce
commit 87e9823
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 164 deletions.
diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml
@@ -10,56 +10,44 @@ on:
 
 jobs:
   ci:
-    name: ${{ matrix.compiler }}-conda-[${{ matrix.conda }}]-shared-[${{ matrix.shared }}]-${{ matrix.source }}
+    name: ${{ matrix.compiler }}-shared-[${{ matrix.shared }}]-${{ matrix.manager }}
     runs-on: macos-10.15
     env:
-      cache-name: cache-${{ matrix.compiler }}-conda-[${{ matrix.conda }}]-shared-[${{ matrix.shared }}]-${{ matrix.source }}
+      cache-name: cache-${{ matrix.compiler }}-shared-[${{ matrix.shared }}]-${{ matrix.manager }}
     strategy:
       fail-fast: false # True stops all on first error. Stick to false when debugging
       matrix:
         include:
-          - { compiler: cl, shared: OFF, conda: OFF, source: conan }
-          - { compiler: cl, shared: OFF, conda: OFF, source: cmake }
-          - { compiler: cl, shared: OFF, conda: OFF, source: fetch }
-          - { compiler: cl, shared: OFF, conda: OFF, source: find-or-cmake }
-          - { compiler: cl, shared: OFF, conda: ON , source: find-or-cmake }
-          - { compiler: cl, shared: ON,  conda: OFF, source: conan }
-          - { compiler: cl, shared: ON,  conda: OFF, source: cmake }
-          - { compiler: cl, shared: ON,  conda: OFF, source: fetch }
-          - { compiler: cl, shared: ON,  conda: OFF, source: find-or-cmake }
-          - { compiler: cl, shared: ON,  conda: ON , source: find-or-cmake }
+          - { compiler: cl, shared: OFF, manager: conan }
+          - { compiler: cl, shared: OFF, manager: cmake }
+          - { compiler: cl, shared: OFF, manager: fetch }
+          - { compiler: cl, shared: OFF, manager: find-or-cmake }
+          - { compiler: cl, shared: ON,  manager: conan }
+          - { compiler: cl, shared: ON,  manager: cmake }
+          - { compiler: cl, shared: ON,  manager: fetch }
+          - { compiler: cl, shared: ON,  manager: find-or-cmake }
 
     steps:
       - uses: actions/checkout@v2
-      - uses: ilammy/msvc-dev-cmd@v1
       - uses: actions/setup-python@v1
-        if: contains(matrix.source, 'conan')
+        if: contains(matrix.manager, 'conan')
         with:
           python-version: '3.x'
 
-      - uses: s-weigand/setup-conda@v1
-        if: contains(matrix.source,'conda')
-        with:
-          update-conda: false
-          conda-channels: conda-forge
-
       - uses: actions/cache@v2
         with:
           path: |
             ~/.conan/data
+            ~/h5pp-install
 #            build/Debug/h5pp-deps-install
           key: ${{ runner.os }}-${{ env.cache-name }}
 
       - name: Setup conan
-        if: matrix.source == 'conan'
+        if: matrix.manager == 'conan'
         run: |
           pip install conan
           conan user
 
-      - name: Setup conda
-        if: matrix.source == 'conda'
-        run: conda install spdlog hdf5 hdf5-static eigen
-
       - name: Configure
         shell: bash
         run: |
@@ -69,13 +57,12 @@ jobs:
           -DCMAKE_BUILD_TYPE=Debug                                 \
           -DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}            \
           -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON                         \
-          -DCMAKE_INSTALL_PREFIX:PATH=~/h5pp                       \
+          -DCMAKE_INSTALL_PREFIX:PATH=~/h5pp-install               \
           -DH5PP_ENABLE_EIGEN3:BOOL=ON                             \
           -DH5PP_ENABLE_SPDLOG:BOOL=ON                             \
           -DH5PP_ENABLE_ASAN:BOOL=OFF                              \
           -DH5PP_ENABLE_TESTS:BOOL=ON                              \
-          -DH5PP_PACKAGE_MANAGER:STRING=${{ matrix.source }}       \
-          -DH5PP_PREFER_CONDA_LIBS:BOOL=${{ matrix.conda }}        \
+          -DH5PP_PACKAGE_MANAGER:STRING=${{ matrix.manager }}      \
           -DH5PP_PRINT_INFO:BOOL=ON                                \
           -DH5PP_BUILD_EXAMPLES:BOOL=ON                            \
            -G "Unix Makefiles"                                     \

diff --git a/.github/workflows/ubuntu16.yml b/.github/workflows/ubuntu16.yml
@@ -10,51 +10,42 @@ on:
 
 jobs:
   ci:
-    name: ${{ matrix.compiler }}-conda-[${{ matrix.conda }}]-shared-[${{ matrix.shared }}]-${{ matrix.source }}
+    name: ${{ matrix.compiler }}-shared-[${{ matrix.shared }}]-${{ matrix.manager }}
     runs-on: ubuntu-16.04
     env:
-      cache-name: cache-${{ matrix.compiler }}-conda-[${{ matrix.conda }}]-shared-[${{ matrix.shared }}]-${{ matrix.source }}
+      cache-name: cache-${{ matrix.compiler }}-shared-[${{ matrix.shared }}]-${{ matrix.manager }}
     strategy:
       fail-fast: true # True stops all on first error. Stick to false when debugging
       matrix:
         include:
-          - { compiler: gcc,   shared: OFF,  conda: OFF, source: cmake }
-          - { compiler: gcc,   shared: OFF,  conda: OFF, source: conan }
-          - { compiler: gcc,   shared: OFF,  conda: OFF, source: fetch }
-          - { compiler: gcc,   shared: OFF,  conda: OFF, source: find  }
-          - { compiler: gcc,   shared: OFF,  conda: ON,  source: find  }
-          - { compiler: gcc,   shared: ON,   conda: OFF, source: cmake }
-          - { compiler: gcc,   shared: ON,   conda: OFF, source: conan }
-          - { compiler: gcc,   shared: ON,   conda: OFF, source: fetch }
-          - { compiler: gcc,   shared: ON,   conda: OFF, source: find  }
-          - { compiler: gcc,   shared: ON,   conda: ON , source: find  }
-          - { compiler: clang, shared: OFF,  conda: OFF, source: cmake }
-          - { compiler: clang, shared: OFF,  conda: OFF, source: conan }
-          - { compiler: clang, shared: OFF,  conda: OFF, source: fetch }
-          - { compiler: clang, shared: OFF,  conda: OFF, source: find  }
-          - { compiler: clang, shared: OFF,  conda: ON,  source: find  }
-          - { compiler: clang, shared: ON,   conda: OFF, source: cmake }
-          - { compiler: clang, shared: ON,   conda: OFF, source: conan }
-          - { compiler: clang, shared: ON,   conda: OFF, source: fetch }
-          - { compiler: clang, shared: ON,   conda: OFF, source: find  }
-          - { compiler: clang, shared: ON,   conda: ON , source: find  }
+          - { compiler: gcc,   shared: OFF, manager: cmake }
+          - { compiler: gcc,   shared: OFF, manager: conan }
+          - { compiler: gcc,   shared: OFF, manager: fetch }
+          - { compiler: gcc,   shared: OFF, manager: find  }
+          - { compiler: gcc,   shared: ON,  manager: cmake }
+          - { compiler: gcc,   shared: ON,  manager: conan }
+          - { compiler: gcc,   shared: ON,  manager: fetch }
+          - { compiler: gcc,   shared: ON,  manager: find  }
+          - { compiler: clang, shared: OFF, manager: cmake }
+          - { compiler: clang, shared: OFF, manager: conan }
+          - { compiler: clang, shared: OFF, manager: fetch }
+          - { compiler: clang, shared: OFF, manager: find }
+          - { compiler: clang, shared: ON,  manager: cmake }
+          - { compiler: clang, shared: ON,  manager: conan }
+          - { compiler: clang, shared: ON,  manager: fetch }
+          - { compiler: clang, shared: ON,  manager: find }
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v1
-        if: contains(matrix.source, 'conan')
+        if: contains(matrix.manager, 'conan')
         with:
           python-version: '3.x'
 
-      - uses: s-weigand/setup-conda@v1
-        if: contains(matrix.source,'conda')
-        with:
-          update-conda: false
-          conda-channels: conda-forge
-
       - uses: actions/cache@v2
         with:
           path: |
             ~/.conan/data
+            ~/h5pp-install
 #            build/Debug/h5pp-deps-install
           key: ${{ runner.os }}-${{ env.cache-name }}
 
@@ -75,19 +66,15 @@ jobs:
           echo "CXX=clang++-6.0" >> $GITHUB_ENV
 
       - name: Setup apt packages
-        if: contains(matrix.source,'find')
+        if: contains(matrix.manager,'find')
         run: sudo apt install libhdf5-dev libspdlog-dev libeigen3-dev -y
 
       - name: Setup conan
-        if: matrix.source == 'conan'
+        if: matrix.manager == 'conan'
         run: |
           pip install conan
           conan user
 
-      - name: Setup conda
-        if: matrix.source == 'conda'
-        run: conda install spdlog hdf5 hdf5-static eigen
-
       - name: Configure
         shell: bash
         run: |
@@ -97,13 +84,12 @@ jobs:
           -DCMAKE_BUILD_TYPE=Debug                                 \
           -DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}            \
           -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON                         \
-          -DCMAKE_INSTALL_PREFIX:PATH=~/h5pp                       \
+          -DCMAKE_INSTALL_PREFIX:PATH=~/h5pp-install               \
           -DH5PP_ENABLE_EIGEN3:BOOL=ON                             \
           -DH5PP_ENABLE_SPDLOG:BOOL=ON                             \
           -DH5PP_ENABLE_ASAN:BOOL=ON                               \
           -DH5PP_ENABLE_TESTS:BOOL=ON                              \
-          -DH5PP_PACKAGE_MANAGER:STRING=${{ matrix.source }}       \
-          -DH5PP_PREFER_CONDA_LIBS:BOOL=${{ matrix.conda }}        \
+          -DH5PP_PACKAGE_MANAGER:STRING=${{ matrix.manager }}      \
           -DH5PP_PRINT_INFO:BOOL=ON                                \
           -DH5PP_BUILD_EXAMPLES:BOOL=ON                            \
           -G "Unix Makefiles"                                      \

diff --git a/.github/workflows/ubuntu20.yml b/.github/workflows/ubuntu20.yml
@@ -10,52 +10,43 @@ on:
 
 jobs:
   ci:
-    name: ${{ matrix.compiler }}-conda-[${{ matrix.conda }}]-shared-[${{ matrix.shared }}]-${{ matrix.source }}
+    name: ${{ matrix.compiler }}-shared-[${{ matrix.shared }}]-${{ matrix.manager }}
     runs-on: ubuntu-20.04
     env:
-      cache-name: cache-${{ matrix.compiler }}-conda-[${{ matrix.conda }}]-shared-[${{ matrix.shared }}]-${{ matrix.source }}
+      cache-name: cache-${{ matrix.compiler }}-shared-[${{ matrix.shared }}]-${{ matrix.manager }}
     strategy:
       fail-fast: true # True stops all on first error. Stick to false when debugging
       matrix:
         include:
-          - { compiler: gcc,   shared: OFF,  conda: OFF, source: cmake }
-          - { compiler: gcc,   shared: OFF,  conda: OFF, source: conan }
-          - { compiler: gcc,   shared: OFF,  conda: OFF, source: fetch }
-          - { compiler: gcc,   shared: OFF,  conda: OFF, source: find  }
-          - { compiler: gcc,   shared: OFF,  conda: ON,  source: find  }
-          - { compiler: gcc,   shared: ON,   conda: OFF, source: cmake }
-          - { compiler: gcc,   shared: ON,   conda: OFF, source: conan }
-          - { compiler: gcc,   shared: ON,   conda: OFF, source: fetch }
-          - { compiler: gcc,   shared: ON,   conda: OFF, source: find  }
-          - { compiler: gcc,   shared: ON,   conda: ON , source: find  }
-          - { compiler: clang, shared: OFF,  conda: OFF, source: cmake }
-          - { compiler: clang, shared: OFF,  conda: OFF, source: conan }
-          - { compiler: clang, shared: OFF,  conda: OFF, source: fetch }
-          - { compiler: clang, shared: OFF,  conda: OFF, source: find  }
-          - { compiler: clang, shared: OFF,  conda: ON,  source: find  }
-          - { compiler: clang, shared: ON,   conda: OFF, source: cmake }
-          - { compiler: clang, shared: ON,   conda: OFF, source: conan }
-          - { compiler: clang, shared: ON,   conda: OFF, source: fetch }
-          - { compiler: clang, shared: ON,   conda: OFF, source: find  }
-          - { compiler: clang, shared: ON,   conda: ON , source: find  }
+          - { compiler: gcc,   shared: OFF, manager: cmake }
+          - { compiler: gcc,   shared: OFF, manager: conan }
+          - { compiler: gcc,   shared: OFF, manager: fetch }
+          - { compiler: gcc,   shared: OFF, manager: find  }
+          - { compiler: gcc,   shared: ON,  manager: cmake }
+          - { compiler: gcc,   shared: ON,  manager: conan }
+          - { compiler: gcc,   shared: ON,  manager: fetch }
+          - { compiler: gcc,   shared: ON,  manager: find  }
+          - { compiler: clang, shared: OFF, manager: cmake }
+          - { compiler: clang, shared: OFF, manager: conan }
+          - { compiler: clang, shared: OFF, manager: fetch }
+          - { compiler: clang, shared: OFF, manager: find }
+          - { compiler: clang, shared: ON,  manager: cmake }
+          - { compiler: clang, shared: ON,  manager: conan }
+          - { compiler: clang, shared: ON,  manager: fetch }
+          - { compiler: clang, shared: ON,  manager: find }
 
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v1
-        if: contains(matrix.source, 'conan')
+        if: contains(matrix.manager, 'conan')
         with:
           python-version: '3.x'
 
-      - uses: s-weigand/setup-conda@v1
-        if: contains(matrix.source,'conda')
-        with:
-          update-conda: false
-          conda-channels: conda-forge
-
       - uses: actions/cache@v2
         with:
           path: |
             ~/.conan/data
+            ~/h5pp-install
 #            build/Debug/h5pp-deps-install
           key: ${{ runner.os }}-${{ env.cache-name }}
 
@@ -75,19 +66,15 @@ jobs:
           echo "CXX=clang++-10" >> $GITHUB_ENV
 
       - name: Setup apt packages
-        if: contains(matrix.source,'find')
+        if: contains(matrix.manager,'find')
         run: sudo apt install libhdf5-dev libspdlog-dev libeigen3-dev -y
 
       - name: Setup conan
-        if: matrix.source == 'conan'
+        if: matrix.manager == 'conan'
         run: |
           pip install conan
           conan user
 
-      - name: Setup conda
-        if: matrix.source == 'conda'
-        run: conda install spdlog hdf5 hdf5-static eigen
-
       - name: Configure
         shell: bash
         run: |
@@ -97,13 +84,12 @@ jobs:
           -DCMAKE_BUILD_TYPE=Debug                                 \
           -DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}            \
           -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON                         \
-          -DCMAKE_INSTALL_PREFIX:PATH=~/h5pp                       \
+          -DCMAKE_INSTALL_PREFIX:PATH=~/h5pp-install               \
           -DH5PP_ENABLE_EIGEN3:BOOL=ON                             \
           -DH5PP_ENABLE_SPDLOG:BOOL=ON                             \
           -DH5PP_ENABLE_ASAN:BOOL=ON                               \
           -DH5PP_ENABLE_TESTS:BOOL=ON                              \
-          -DH5PP_PACKAGE_MANAGER:STRING=${{ matrix.source }}       \
-          -DH5PP_PREFER_CONDA_LIBS:BOOL=${{ matrix.conda }}        \
+          -DH5PP_PACKAGE_MANAGER:STRING=${{ matrix.manager }}      \
           -DH5PP_PRINT_INFO:BOOL=ON                                \
           -DH5PP_BUILD_EXAMPLES:BOOL=ON                            \
           -G "Unix Makefiles"                                      \

diff --git a/.github/workflows/windows10.yml b/.github/workflows/windows10.yml
@@ -10,56 +10,45 @@ on:
 
 jobs:
   ci:
-    name: ${{ matrix.compiler }}-conda-[${{ matrix.conda }}]-shared-[${{ matrix.shared }}]-${{ matrix.source }}
+    name: ${{ matrix.compiler }}-shared-[${{ matrix.shared }}]-${{ matrix.manager }}
     runs-on: windows-2019
     env:
-      cache-name: cache-${{ matrix.compiler }}-conda-[${{ matrix.conda }}]-shared-[${{ matrix.shared }}]-${{ matrix.source }}
+      cache-name: cache-${{ matrix.compiler }}-shared-[${{ matrix.shared }}]-${{ matrix.manager }}
     strategy:
       fail-fast: true # True stops all on first error. Stick to false when debugging
       matrix:
         include:
-          - { compiler: cl, shared: OFF, conda: OFF, source: conan }
-          - { compiler: cl, shared: OFF, conda: OFF, source: cmake }
-          - { compiler: cl, shared: OFF, conda: OFF, source: fetch }
-          - { compiler: cl, shared: OFF, conda: OFF, source: find-or-cmake }
-          - { compiler: cl, shared: ON,  conda: OFF, source: conan }
-          - { compiler: cl, shared: ON,  conda: OFF, source: cmake }
-          - { compiler: cl, shared: ON,  conda: OFF, source: fetch }
-          - { compiler: cl, shared: ON,  conda: OFF, source: find-or-cmake }
-          - { compiler: cl, shared: OFF, conda: ON, source: find-or-cmake }
-          - { compiler: cl, shared: ON,  conda: ON, source: find-or-cmake }
+          - { compiler: cl, shared: OFF, manager: conan }
+          - { compiler: cl, shared: OFF, manager: cmake }
+          - { compiler: cl, shared: OFF, manager: fetch }
+          - { compiler: cl, shared: OFF, manager: find-or-cmake }
+          - { compiler: cl, shared: ON,  manager: conan }
+          - { compiler: cl, shared: ON,  manager: cmake }
+          - { compiler: cl, shared: ON,  manager: fetch }
+          - { compiler: cl, shared: ON,  manager: find-or-cmake }
 
     steps:
       - uses: actions/checkout@v2
       - uses: ilammy/msvc-dev-cmd@v1
       - uses: actions/setup-python@v1
-        if: contains(matrix.source, 'conan')
+        if: contains(matrix.manager, 'conan')
         with:
           python-version: '3.x'
 
-      - uses: s-weigand/setup-conda@v1
-        if: contains(matrix.source,'conda')
-        with:
-          update-conda: false
-          conda-channels: conda-forge
-
       - uses: actions/cache@v2
         with:
           path: |
             ~/.conan/data
+            ~/h5pp-install
 #            build/Debug/h5pp-deps-install
           key: ${{ runner.os }}-${{ env.cache-name }}
 
       - name: Setup conan
-        if: matrix.source == 'conan'
+        if: matrix.manager == 'conan'
         run: |
           pip install conan
           conan user
 
-      - name: Setup conda
-        if: matrix.source == 'conda'
-        run: conda install spdlog hdf5 hdf5-static eigen
-
       - name: Configure
         shell: bash
         run: |
@@ -69,13 +58,12 @@ jobs:
           -DCMAKE_BUILD_TYPE=Debug                                 \
           -DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}            \
           -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON                         \
-          -DCMAKE_INSTALL_PREFIX:PATH=~/h5pp                       \
+          -DCMAKE_INSTALL_PREFIX:PATH=~/h5pp-install               \
           -DH5PP_ENABLE_EIGEN3:BOOL=ON                             \
           -DH5PP_ENABLE_SPDLOG:BOOL=ON                             \
           -DH5PP_ENABLE_ASAN:BOOL=OFF                              \
           -DH5PP_ENABLE_TESTS:BOOL=ON                              \
-          -DH5PP_PACKAGE_MANAGER:STRING=${{ matrix.source }}       \
-          -DH5PP_PREFER_CONDA_LIBS:BOOL=${{ matrix.conda }}        \
+          -DH5PP_PACKAGE_MANAGER:STRING=${{ matrix.manager }}      \
           -DH5PP_PRINT_INFO:BOOL=ON                                \
           -DH5PP_BUILD_EXAMPLES:BOOL=ON                            \
            -G "Visual Studio 16 2019" -A x64                       \