Merge 900adb6 into 865f0f2

scikit-hep · Oct 24, 2018 · 83228bf · 83228bf
2 parents 865f0f2 + 900adb6
commit 83228bf
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ addons:
 
 install:
   - pip install --upgrade pip
-  - pip install coveralls
+  - pip install coveralls pytest
 
 script:
   coverage run --source=numpythia setup.py test

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 
 PYTHON := $(shell which python)
 CYTHON := $(shell which cython)
-NOSETESTS := $(shell which nosetests)
+NOSETESTS := $(shell which pytest)
 
 CYTHON_PYX := numpythia/src/_libnumpythia.pyx
 CYTHON_CPP := $(CYTHON_PYX:.pyx=.cpp)
@@ -35,7 +35,7 @@ inplace:
 	@CC="ccache gcc" $(PYTHON) setup.py build_ext -i
 
 test: inplace
-	@$(NOSETESTS) -s -v numpythia
+	@$(PYTESTS) -s -v numpythia
 
 sdist: clean
 	@$(PYTHON) setup.py sdist

diff --git a/setup.py b/setup.py
@@ -190,7 +190,6 @@ def finalize_options(self):
     packages=[
         'numpythia',
         'numpythia.extern',
-        'numpythia.tests',
         'numpythia.testcmnd',
     ],
     package_data={

diff --git a/numpythia/tests/__init__.py → tests/__init__.py b/numpythia/tests/__init__.py → tests/__init__.py