Merge branch 'main' into vbq

bamler-lab · Dec 23, 2023 · 8dcc071 · 8dcc071
2 parents cef2094 + 1d9cb41
commit 8dcc071
Show file tree

Hide file tree

Showing 14 changed files with 1,478 additions and 1,424 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -226,7 +226,8 @@ jobs:
 
       - name: generate license file
         run: |
-          cargo install cargo-about
+          cargo install cargo-quickinstall
+          cargo quickinstall cargo-about
           cargo about generate --features=pybindings about.hbs > website/license.html
           wc -l website/license.html
 
@@ -322,6 +323,16 @@ jobs:
         with:
           python-version: "3.12"
 
+      - name: generate license file
+        shell: bash
+        run: |
+          rm LICENSE.*
+          cargo install cargo-quickinstall
+          cargo quickinstall cargo-about
+          cargo about generate --features=pybindings about.hbs > LICENSE.html
+          ls -l LICENSE*
+          wc -l LICENSE*
+
       - name: Build wheels (unix)
         if: matrix.os != 'windows-latest'
         uses: messense/maturin-action@v1
@@ -337,12 +348,6 @@ jobs:
           command: build
           args: --release --strip --features pybindings -i C:\hostedtoolcache\windows\Python\${{ steps.setup-python-3-7.outputs.python-version }}\x64\python3.exe C:\hostedtoolcache\windows\Python\${{ steps.setup-python-3-8.outputs.python-version }}\x64\python3.exe C:\hostedtoolcache\windows\Python\${{ steps.setup-python-3-9.outputs.python-version }}\x64\python3.exe C:\hostedtoolcache\windows\Python\${{ steps.setup-python-3-10.outputs.python-version }}\x64\python3.exe C:\hostedtoolcache\windows\Python\${{ steps.setup-python-3-11.outputs.python-version }}\x64\python3.exe C:\hostedtoolcache\windows\Python\${{ steps.setup-python-3-12.outputs.python-version }}\x64\python3.exe
 
-      # For some reason, manylinux builds create wheels owned by the root user,
-      # which breaks our attempts to add the license file below.
-      - name: Fix wheel ownership on linux
-        if: matrix.os == 'ubuntu-latest'
-        run: sudo chown -R runner:docker target
-
       - name: Cross-build wheels for Apple Silicon
         if: matrix.os == 'macos-latest'
         uses: messense/maturin-action@v1
@@ -366,32 +371,6 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: dir target\wheels\
 
-      - name: generate license file
-        run: |
-          cargo install cargo-about
-          cargo about generate --features=pybindings about.hbs > LICENSE.html
-          ls -l LICENSE.html
-          wc -l LICENSE.html
-
-      - name: Add LICENSE.html to all wheels (unix)
-        if: matrix.os != 'windows-latest'
-        run: |
-          for wheel in target/wheels/*.whl; do
-            zip -ur $wheel LICENSE.html
-          done
-
-      - name: Add LICENSE.html to all wheels (windows)
-        if: matrix.os == 'windows-latest'
-        run: |
-          [Reflection.Assembly]::LoadWithPartialName('System.IO.Compression.FileSystem') | Out-Null
-          Get-ChildItem "target\wheels\" -Filter *.whl |
-          Foreach-Object {
-            $zip = [System.IO.Compression.ZipFile]::Open($_.FullName, "Update")
-            $licenseFile = [System.IO.Path]::GetFileName("LICENSE.html")
-            [System.IO.Compression.ZipFileExtensions]::CreateEntryFromFile($zip, "LICENSE.html", $licenseFile, "Optimal") | Out-Null
-            $zip.Dispose()
-          }
-
       - name: Save artifact with wheels for ${{ matrix.os }}
         uses: actions/upload-artifact@v2
         with: