Skip to content

Commit efcc87a

Browse files
committed
test159
Signed-off-by: Cary Phillips <cary@ilm.com>
1 parent 68b44f5 commit efcc87a

7 files changed

Lines changed: 64 additions & 68 deletions

File tree

.github/workflows/ci_steps.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ on:
3131
type: string
3232
build-type:
3333
type: string
34+
msystem:
35+
type: string
3436
python:
3537
type: string
3638
pybind11:
@@ -95,7 +97,7 @@ jobs:
9597
run: |
9698
CONAN_ROOT="${{ github.workspace }}/_conan"
9799
conan profile detect
98-
conan install . --output-folder="${CONAN_ROOT}" --build=missing --settings build_type=${{ inputs.build-type }}
100+
conan install . --output-folder="${CONAN_ROOT}" --build=missing
99101
echo "CONAN_ROOT=${CONAN_ROOT}" >> $GITHUB_ENV
100102
echo "CMAKE_TOOLCHAIN_FILE=${CONAN_ROOT}/conan_toolchain.cmake" >> $GITHUB_ENV
101103
shell: bash
@@ -197,12 +199,14 @@ jobs:
197199

198200
- name: Test Pybind11
199201
if: inputs.pybind11 == 'ON'
200-
run: python -v src/pybind11/PyBindImathTest/test_import.py
202+
run: python -v src/pybind11/PyBindImathTest/test_import_pybindimath.py
201203
shell: bash
202204

203205
- name: Test Python
204206
if: inputs.python == 'ON'
205-
run: python -v src/python/PyImathTest/test_import.py
207+
run: |
208+
python -v src/python/PyImathTest/test_import_imath.py
209+
python -v src/python/PyImathNumpyTest/test_import_imathnumpy.py
206210
shell: bash
207211

208212
- name: Prepare install_manifest

.github/workflows/ci_workflow.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,18 @@ jobs:
156156
BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}
157157
IMATH_INSTALL_PKG_CONFIG: ${{ matrix.IMATH_INSTALL_PKG_CONFIG || 'ON' }}
158158
BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
159+
msystem: ${{ matrix.msystem }}
159160
validate_install: ${{ matrix.validate_install || 'ON' }}
160161
strategy:
161162
matrix:
162163
include:
163164
- build: 1
164165
label: Release
165166

166-
- build: 2
167-
label: Debug
168-
build-type: Debug
169-
if: false # TODO: build fails
167+
# TODO: build fails
168+
# - build: 2
169+
# label: Debug
170+
# build-type: Debug
170171

171172
- build: 3
172173
label: static
@@ -186,13 +187,13 @@ jobs:
186187
- build: 6
187188
label: msys2-mingw32
188189
msystem: MINGW32
189-
# BUILD_TESTING: 'OFF'
190+
BUILD_TESTING: 'OFF'
190191

191192
- build: 7
192193
label: msys2-mingw32, static
193194
msystem: MINGW32
194195
BUILD_SHARED_LIBS: 'OFF'
195-
# BUILD_TESTING: 'OFF'
196+
BUILD_TESTING: 'OFF'
196197

197198
- build: 8
198199
label: msys2-ucrt64

src/pybind11/PyBindImathTest/test_import.py

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env python3
2+
3+
import os, sys, site, glob
4+
5+
def test_import():
6+
7+
try:
8+
import pybindimath
9+
print()
10+
print(f"pybindimath imported from {pybindimath.__file__}")
11+
print("ok")
12+
except Exception as e:
13+
print(f"test_import_pybindimath.py failed. Can't import pybindimath: {e}")
14+
print("meh")
15+
16+
test_import()
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/usr/bin/env python3
2+
3+
import os, site, sys, glob
4+
5+
6+
def test_import():
7+
8+
try:
9+
import imathnumpy
10+
print()
11+
print(f"imathnumpy imported from {imathnumpy.__file__}")
12+
print("ok")
13+
except Exception as e:
14+
print(f"test_import_imathnumpy.py failed. Can't import imathnumpy: {e}")
15+
print("meh")
16+
17+
test_import()

src/python/PyImathTest/test_import.py

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/usr/bin/env python3
2+
3+
import os, site, sys, glob
4+
5+
6+
def test_import():
7+
8+
try:
9+
import imath
10+
print()
11+
print(f"imath imported from {imath.__file__}")
12+
print("ok")
13+
except Exception as e:
14+
print(f"test_import_imath.py failed. Can't import imath: {e}")
15+
print("meh")
16+
17+
test_import()

0 commit comments

Comments
 (0)