Skip to content

Commit aacd322

Browse files
committed
Rewrite tests with pytest
1 parent b0b74a1 commit aacd322

File tree

4 files changed

+285
-158
lines changed

4 files changed

+285
-158
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
with:
3737
build-type: ${{ matrix.build-type }}
3838
ubuntu: |
39-
apt: cython cython3 python-nose python3-nose python-numpy python3-numpy python-coverage python3-coverage python-setuptools python3-setuptools python-pytest python3-pytest libeigen3-dev
39+
apt: cython cython3 python-numpy python3-numpy python-coverage python3-coverage python-setuptools python3-setuptools python-pytest python3-pytest libeigen3-dev
4040
macos: |
4141
brew: eigen
4242
pip: Cython coverage nose numpy pytest

conanfile.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ def system_requirements(self):
5656
installer = SystemPackageTool()
5757
packages = ''
5858
if self.default_options['python2_version'] is not None:
59-
packages = 'cython python-coverage python-nose python-numpy '
59+
packages = 'cython python-coverage python-numpy python-pytest '
6060
if self.default_options['python3_version'] is not None:
61-
packages += 'cython3 python3-coverage python3-nose python3-numpy'
61+
packages += 'cython3 python3-coverage python3-numpy python3-pytest '
6262
if len(packages):
6363
installer.install(packages)
6464
else:
6565
if enable_python2_and_python3(self.default_options):
66-
subprocess.run("pip2 install --user Cython>=0.2 coverage nose numpy>=1.8.2".split())
67-
subprocess.run("pip3 install --user Cython>=0.2 coverage nose numpy>=1.8.2".split())
66+
subprocess.run("pip2 install --user Cython>=0.2 coverage numpy>=1.8.2 pytest".split())
67+
subprocess.run("pip3 install --user Cython>=0.2 coverage numpy>=1.8.2 pytest".split())
6868
else:
69-
subprocess.run("pip install --user Cython>=0.2 coverage nose numpy>=1.8.2".split())
69+
subprocess.run("pip install --user Cython>=0.2 coverage numpy>=1.8.2 pytest".split())
7070

7171
def source(self):
7272
# Wrap the original CMake file to call conan_basic_setup

debian/control

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@ Build-Depends: debhelper (>=9),
77
python-all,
88
python-coverage,
99
python-dev,
10-
python-nose,
1110
python-numpy,
1211
python-pytest,
1312
python-setuptools,
1413
cython,
1514
python3-all,
1615
python3-coverage,
1716
python3-dev,
18-
python3-nose,
1917
python3-numpy,
2018
python3-pytest,
2119
python3-setuptools,

0 commit comments

Comments
 (0)