Skip to content

Commit 131c76a

Browse files
committed
fixing setup
1 parent 1fb28ad commit 131c76a

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

.github/workflows/temp.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,6 @@ jobs:
8989
if (-not (Test-Path wheelhouse/*.whl)) { throw "Wheel was not created" }
9090
working-directory: ./quaddtype
9191

92-
- name: Run tests explicitly
93-
shell: pwsh
94-
run: |
95-
$wheel = Get-ChildItem wheelhouse/*.whl | Select-Object -First 1
96-
pip install $wheel[test]
97-
python -m pytest -v ./test
98-
working-directory: ./quaddtype
99-
10092
- uses: actions/upload-artifact@v4
10193
with:
10294
path: ./quaddtype/wheelhouse/*.whl

quaddtype/meson.build

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,13 @@ is_windows = build_machine.system() == 'windows'
1111

1212
if is_windows
1313
add_project_arguments('-DWIN32', '-D_WINDOWS', language : ['c', 'cpp'])
14-
15-
conda_prefix = run_command('cmd', '/c', 'echo %CONDA_PREFIX%', check: true).stdout().strip()
16-
sleef_lib_dir = conda_prefix + '\\Library\\lib'
17-
sleef_include_dir = conda_prefix + '\\Library\\include'
18-
19-
add_project_arguments('-I' + sleef_include_dir, language: ['c', 'cpp'])
20-
21-
sleef_dep = [
22-
c.find_library('sleef', dirs : [sleef_lib_dir], required : true),
23-
c.find_library('sleefquad', dirs : [sleef_lib_dir], required : true)
24-
]
25-
else
26-
sleef_dep = [
27-
c.find_library('sleef', required : true),
28-
c.find_library('sleefquad', required : true)
29-
]
3014
endif
3115

16+
sleef_dep = [
17+
c.find_library('sleef', required : true),
18+
c.find_library('sleefquad', required : true)
19+
]
20+
3221
incdir_numpy = run_command(py,
3322
['-c', 'import numpy; print(numpy.get_include())'],
3423
check : true

0 commit comments

Comments
 (0)