Skip to content

Commit

Permalink
#23 Changed test runner from nose to pytest.
Browse files Browse the repository at this point in the history
  • Loading branch information
roskakori committed Jun 23, 2019
1 parent 7a40e06 commit 6ce6950
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 20 deletions.
21 changes: 5 additions & 16 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,14 @@
<tstamp/>
</target>

<target name="pep8" depends="init" description="check for PEP8 conformance">
<exec executable="${python}" failonerror="true">
<arg value="-m"/>
<arg value="pep8"/>
<arg value="--exclude=.temp"/>
<arg value="--max-line-length=120"/>
<arg file="setup.py"/>
<arg file="pygount"/>
<arg file="tests"/>
</exec>
</target>

<target name="bdist_wheel" depends="pep8" description="build wheel archive">
<target name="bdist_wheel" description="build wheel archive">
<exec executable="${python}" failonerror="true">
<arg value="setup.py"/>
<arg value="bdist_wheel"/>
</exec>
</target>

<target name="test" depends="pep8" description="run test suite">
<target name="test" description="run test suite">
<exec executable="tox" failonerror="true">
<arg value="--skip-missing-interpreters"/>
</exec>
Expand All @@ -46,8 +34,9 @@
<delete dir="${build}"/>
<delete dir="${dist}"/>
<delete dir="${temp}"/>
<delete file="coverage.xml" />
<delete file="nosetests.xml" />
<delete file=".coverage" />
<delete file=".pytest_cache" />
<delete file="cloc.xml" />
</target>

<target name="jenkins" depends="dist, clean, test" description="build everything needed for Jenkins">
Expand Down
10 changes: 6 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ envlist = py33, py34, py35, py36, py37

[testenv]
deps =
coveralls>=1.7.0
coveralls>=1.8.1
coverage>=4.5.3
nose>=1.3.7
wheel>=0.33.1
commands = nosetests --cover-erase --cover-package=pygount --cover-xml --with-coverage --with-xunit
pygments>=2.0
pytest>=4.6.3
pytest-cov>=2.7.1
wheel>=0.33.4
commands = pytest

0 comments on commit 6ce6950

Please sign in to comment.