Skip to content

Commit bf17b10

Browse files
authored
Merge pull request #462 from kivy/pytest
switch from nose to pytest
2 parents e685086 + eae4f22 commit bf17b10

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

.github/workflows/push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,21 @@ jobs:
7676
7777
ant all
7878
cd tests
79-
nosetests -v
79+
pytest -v
8080
8181
- name: test
8282
if: matrix.os == 'ubuntu-latest'
8383
run: |
8484
ant all
8585
cd tests
86-
CLASSPATH=../build/test-classes:../build/classes nosetests -v
86+
CLASSPATH=../build/test-classes:../build/classes pytest -v
8787
8888
- name: test
8989
if: matrix.os == 'macOs-latest'
9090
run: |
9191
ant all
9292
cd tests
93-
CLASSPATH=../build/test-classes:../build/classes python -m nose -v
93+
CLASSPATH=../build/test-classes:../build/classes python -m pytest -v
9494
9595
# - name: coveralls
9696
# run: python -m coveralls

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ all: build_ext
33
.PHONY: build_ext tests
44

55
PYTHON=python
6-
NOSETESTS=nosetests
6+
PYTEST=pytest
77

88
JAVA_TARGET ?= $(shell $(PYTHON) -c "import re; print('1.6' if int(re.findall(r'\d+', '$(shell javac -version 2>&1)')[0]) < 12 else '1.7')" )
99
JAVAC_OPTS=-target $(JAVA_TARGET) -source $(JAVA_TARGET)
@@ -13,7 +13,7 @@ ANT=ant -Dant.build.javac.source=$(JAVA_TARGET) -Dant.build.javac.target=$(JAVA_
1313

1414
build_ext:
1515
$(ANT) all
16-
$(PYTHON) setup.py build_ext --inplace -f -g
16+
$(PYTHON) setup.py build_ext --inplace -g
1717

1818
clean:
1919
$(ANT) clean
@@ -25,4 +25,4 @@ html:
2525
# for use in travis; tests whatever you got.
2626
# use PYTHON3=1 to force python3 in other environments.
2727
tests:
28-
(cd tests; env CLASSPATH=../build/test-classes:../build/classes PYTHONPATH=..:$(PYTHONPATH) $(NOSETESTS) -v)
28+
(cd tests; env CLASSPATH=../build/test-classes:../build/classes PYTHONPATH=..:$(PYTHONPATH) $(PYTEST) -v)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def compile_native_invocation_handler(*possible_homes):
120120
)
121121
],
122122
extras_require={
123-
'dev': ['nose', 'wheel', 'pytest-cov', 'pycodestyle'],
123+
'dev': ['pytest', 'wheel', 'pytest-cov', 'pycodestyle'],
124124
'ci': ['coveralls', 'pytest-rerunfailures', 'setuptools>=34.4.0'],
125125
},
126126
**SETUP_KWARGS

tests/test_proxy.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import sys
66

77
from jnius import autoclass, java_method, PythonJavaClass, cast
8-
from nose.tools import *
98

109
print('1: declare a TestImplem that implement Collection')
1110

0 commit comments

Comments
 (0)