Merge pull request #7 from paulsengroup/devel

Prepare for release

.github/workflows/wheels.yml

@@ -109,22 +109,40 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install build dependencies
+      - name: Generate cache key
+        id: cache-key
         run: |
-          pip3 install 'conan>=2' delocate
-          sudo conan profile detect --force
-          cd devel/cibw/macos/
-          sudo ./cibw_setup_deps.sh
+          hash="${{ hashFiles('conanfile.txt') }}"
+
+          echo "conan-key=conan-macos-$hash" >> $GITHUB_OUTPUT
+
+      - name: Restore Conan cache
+        id: cache-conan
+        uses: actions/cache/restore@v3
+        with:
+          key: ${{ steps.cache-key.outputs.conan-key }}
+          path: ${{ env.CONAN_HOME }}
 
       - name: Build wheels
         env:
-          HICTKPY_SETUP_SKIP_CONAN: '1'
-          CMAKE_ARGS: '-DCMAKE_PREFIX_PATH=/usr/local/share'
           MACOSX_DEPLOYMENT_TARGET: '10.15'
         run: pip wheel . -vv --no-deps
 
+      - name: Save Conan cache
+        uses: actions/cache/save@v3
+        if: steps.cache-conan.outputs.cache-hit != 'true'
+        with:
+          key: ${{ steps.cache-key.outputs.conan-key }}
+          path: ${{ env.CONAN_HOME }}
+
       - name: Fix wheels
         run: |
+          pip install delocate
+
+          mkdir lib/
+          find "$CONAN_HOME/p/" -name '*.dylib' -exec cp '{}' lib/ \;
+
+          DYLD_LIBRARY_PATH="$PWD/lib/:/usr/local/lib:/usr/lib" \
           delocate-wheel --check-archs -v hictkpy*.whl
 
       - name: Test wheels
@@ -157,7 +175,7 @@ jobs:
       - name: Generate cache key
         id: cache-key
         run: |
-          hash="${{ hashFiles('conanfile.txt') }}" #, '.github/workflows/wheels.yml') }}"
+          hash="${{ hashFiles('conanfile.txt') }}"
 
           echo "conan-key=conan-windows-$hash" >> $GITHUB_OUTPUT
 
@@ -183,9 +201,7 @@ jobs:
           pip install delvewheel
 
           mkdir dlls/
-          find "$CONAN_HOME/p/" -type f -name deflate.dll -exec cp '{}' dlls/ \;
-          find "$CONAN_HOME/p/" -type f -name hdf5.dll -exec cp '{}' dlls/ \;
-          find "$CONAN_HOME/p/" -type f -name zlib.dll -exec cp '{}' dlls/ \;
+          find "$CONAN_HOME/p/" -type f -name '*.dll' -exec cp '{}' dlls/ \;
 
           delvewheel repair --add-path ./dlls/ hictkpy*.whl
 
@@ -200,3 +216,32 @@ jobs:
         with:
           name: wheels-windows-py${{ matrix.python-version }}
           path: wheelhouse/*.whl
+
+  package-artifacts:
+    name: Package artifacts
+    runs-on: ubuntu-latest
+    needs:
+      - build-sdist
+      - build-wheels-linux
+      - build-wheels-macos
+      - build-wheels-windows
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: artifacts
+
+      - name: Archive artifacts
+        run: |
+          mkdir dist/
+          find artifacts -type f -name "hictkpy*.whl" -exec cp '{}' dist/ \;
+          find artifacts -type f -name "hictkpy*.tar.gz" -exec cp '{}' dist/ \;
+
+          tar -cf dist.tar dist/
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: dist
+          path: dist.tar

CMakeLists.txt

@@ -21,13 +21,13 @@ project(
   hictkpy
   LANGUAGES C CXX
   HOMEPAGE_URL https://github.com/paulsengroup/hictkpy
-  DESCRIPTION "High-performance C++ library to read and write .cool files.")
+  DESCRIPTION "Python bindings for hictk.")
 
 include(FetchContent)
 FetchContent_Declare(
   hictk
-  GIT_REPOSITORY "https://github.com/paulsengroup/hictk.git"
-  GIT_TAG        "5a27e5c4a071c3384bfc521747c0fe5c329b221f"
+  URL       "${CMAKE_CURRENT_SOURCE_DIR}/external/hictk-v0.0.1.tar.xz"
+  URL_HASH  "SHA256=bd87511fc75e336b1a85fe6e06a97f8035cd2e1f8cd1cf18c1d835508e4fe262"
   SYSTEM)
 
 set(BUILD_SHARED_LIBS ON)