Skip to content

Commit becb0e3

Browse files
authored
Merge pull request #1333 from tpaviot/review/pytest
Review/pytest
2 parents 41300e2 + 5f76eca commit becb0e3

15 files changed

+9
-58
lines changed

INSTALL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ test
115115
In order to check that everything is ok, run the pythonocc unittest suite:
116116

117117
```bash
118-
cd ../test
119-
python run_tests.py
118+
pip install pytest
119+
pytest
120120
```
121121

122122
demos

ci/conda/meta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ test:
4343
requires:
4444
- pyqt >=5
4545
- mypy
46+
- pytest
4647
- svgwrite
4748
- wxpython >=4
4849
- pyside2 >=5

ci/conda/run_test.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cd ..\work\test
2-
python run_tests.py
2+
pytest
33
mypy test_mypy_classic_occ_bottle.py
44
python core_display_tkinter_unittest.py
55
python core_display_pyqt5_unittest.py

ci/conda/run_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
if [ "$(uname)" == "Linux" ]; then
33
cd ../work/test
4-
python run_tests.py
4+
pytest
55
mypy test_mypy_classic_occ_bottle.py
66
fi

conda-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,16 @@ jobs:
4343
displayName: 'Set Windows environment'
4444
env:
4545
CXX: "cl.exe"
46+
4647
- ${{ if eq(parameters.vmImage, 'windows-2022') }}:
4748
- script: |
4849
call "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
4950
displayName: 'Set Windows environment'
5051
env:
5152
CXX: "cl.exe"
53+
5254
- bash: conda create --yes --quiet --name build_env conda-build conda-verify libarchive python=${{ parameters.py_maj }}.${{ parameters.py_min }} anaconda-client
53-
displayName: Create Anaconda environment
55+
displayName: 'Create Anaconda environment'
5456

5557
- bash: |
5658
source activate build_env && \

test/run_tests.py

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)