tset all

oqc-community · Mar 15, 2024 · 5174235 · 5174235
1 parent 2a06ef8
commit 5174235
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 24 deletions.
diff --git a/.github/workflows/deploy-wheels.yml b/.github/workflows/deploy-wheels.yml
@@ -12,22 +12,22 @@ jobs:
       fail-fast: false
       matrix:
         config:
-#          - {
-#            os: "ubuntu-20.04",
-#            arch: "amd64",
-#            target: "default",
-#            env: { },
-#          }
-#          - {
-#            os: "windows-2019",
-#            arch: "amd64",
-#            target: "default",
-#            env: { },
-#          }
+          - {
+            os: "ubuntu-20.04",
+            arch: "amd64",
+            target: "pypi-build",
+            env: { },
+          }
+          - {
+            os: "windows-2019",
+            arch: "amd64",
+            target: "pypi-build",
+            env: { },
+          }
           - {
             os: "macos-14",
             arch: "arm64",
-            target: "default",
+            target: "pypi-build",
             env: { },
           }
     steps:

diff --git a/src/rasqal/pyproject.toml b/src/rasqal/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "rasqal"
-version = "0.1.4"
+version = "0.1.5"
 requires-python = ">=3.9"
 description = "A dynamically executed quantum-classical hybrid optimizing runtime."
 license = { file = "LICENSE" }

diff --git a/src/scripts/psakefile.ps1 b/src/scripts/psakefile.ps1
@@ -21,6 +21,7 @@ task default -depends build
 task build -depends build-llvm, build-rasqal, test-rasqal
 task check -depends check-licenses
 task format -depends format-rust
+task pypi-build -depends build, audit-rasqal, check
 
 task format-rust {
     Invoke-LoggedCommand -workingDirectory $Root {
@@ -38,23 +39,20 @@ task build-rasqal -depends init {
     Copy-Item -Path (Join-Path $ProjectRoot README.md) -Destination $Rasqal -force
     Copy-Item -Path (Join-Path $ProjectRoot LICENSE) -Destination $Rasqal -force
 
-    $cargoArgs = (Get-CargoArgs)
-    if ($env:RSQL_MANYLINUX -eq $true) {
-        $cargoArgs += "--manylinux"
-    }
-
     $env:MATURIN_PEP517_ARGS = (Get-CargoArgs) -Join " "
     Get-Wheels rasqal | Remove-Item -Verbose
     Invoke-LoggedCommand { pip --verbose wheel --no-deps --wheel-dir $Wheels $Rasqal }
+}
 
+task audit-rasqal -depends build-rasqal {
     if ($IsLinux) {
         Invoke-LoggedCommand { & $Python -m pip install auditwheel patchelf }
     }
-     if (Test-CommandExists auditwheel) {
-        $unauditedWheels = Get-Wheels rasqal
-        Invoke-LoggedCommand { auditwheel show $unauditedWheels }
-        Invoke-LoggedCommand { auditwheel repair --wheel-dir $Wheels --plat $AuditWheelTag $unauditedWheels }
-        $unauditedWheels | Remove-Item
+    if (Test-CommandExists auditwheel) {
+       $unauditedWheels = Get-Wheels rasqal
+       Invoke-LoggedCommand { auditwheel show $unauditedWheels }
+       Invoke-LoggedCommand { auditwheel repair --wheel-dir $Wheels --plat $AuditWheelTag $unauditedWheels }
+       $unauditedWheels | Remove-Item
     }
 }