Skip to content

Commit 3ed98d4

Browse files
committed
Fix build for blender and win ci
* Blender use a specific version of numpy. * ci failed to compiled fcl while it was correctyl compiled locally with the same build script. Use precompiled binaries until we found out why. * upload wheels to release
1 parent 43c0278 commit 3ed98d4

5 files changed

Lines changed: 42 additions & 4 deletions

File tree

.github/workflows/wheels.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,11 @@ jobs:
1515
uses: pypa/cibuildwheel@v2.0.0
1616
- uses: actions/upload-artifact@v2
1717
with:
18-
path: ./wheelhouse/*.whl
18+
path: ./wheelhouse/*.whl
19+
- uses: xresloader/upload-to-github-release@v1
20+
env:
21+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22+
with:
23+
file: ./wheelhouse/*.whl
24+
overwrite: true
25+
update_latest_release: true

blender_requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
numpy==1.19.5
2+
Cython

build_dependencies/install_windows.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ but with many modification in order to use fcl 0.6.1 and install dependencies wi
44
55
This script builds fcl and it's dependencies for python-fcl on Windows.
66
7-
It downloads, builds, installs, and then deletes:
7+
It downloads, builds, installs:
88
* fcl
99
* libccd
1010
* eigen
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<#
2+
This script install precompiled dependencies to build python-fcl on Windows:
3+
* fcl
4+
* libccd
5+
* eigen
6+
* octomap
7+
#>
8+
9+
# Remember starting location for future usage
10+
$base_dir = Get-Location
11+
# Binaries folder
12+
$install_dir = "$base_dir\deps\install"
13+
14+
15+
$file_name = "PrecompiledDependenciesWindows.zip"
16+
Invoke-WebRequest -Uri "https://github.com/CyrilWaechter/python-fcl/releases/download/v0.6.1/$file_name" -Outfile $file_name
17+
Expand-Archive $file_name -DestinationPath deps
18+
19+
20+
# ------------------------------------------------------------------------------
21+
# Python-FCL
22+
23+
Write-Host "Copying dependent DLLs"
24+
Copy-Item $install_dir\bin\octomap.dll $base_dir\src\fcl
25+
Copy-Item $install_dir\bin\octomath.dll $base_dir\src\fcl
26+
Copy-Item $install_dir\bin\ccd.dll $base_dir\src\fcl
27+
28+
Set-Location $base_dir
29+
Write-Host "All done!"

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[tool.cibuildwheel]
66
skip = "pp*"
7-
before-build = "pip install numpy Cython"
7+
before-build = "pip install -r blender_requirements.txt"
88
manylinux-x86_64-image = "manylinux_2_24"
99

1010
[tool.cibuildwheel.linux]
@@ -17,7 +17,7 @@ test-requires = "pytest"
1717
test-command = "pytest {package}/test"
1818

1919
[tool.cibuildwheel.windows]
20-
before-all = "powershell build_dependencies\\install_windows.ps1"
20+
before-all = "powershell build_dependencies\\install_windows_ci.ps1"
2121
archs = ["AMD64"]
2222
test-requires = "pytest"
2323
test-command = "pytest {package}\\test"

0 commit comments

Comments
 (0)