Skip to content
Snippets Groups Projects
Commit 0226cf2d authored by Donald Stufft's avatar Donald Stufft
Browse files

Clean up the setup.py from some of the cruft

parent 50047cdd
No related branches found
No related tags found
No related merge requests found
...@@ -11,7 +11,6 @@ import tempfile ...@@ -11,7 +11,6 @@ import tempfile
from distutils.command.build_clib import build_clib as _build_clib from distutils.command.build_clib import build_clib as _build_clib
from setuptools import setup from setuptools import setup
from setuptools.command.test import test as TestCommand
import nacl import nacl
...@@ -39,9 +38,6 @@ def which(name, flags=os.X_OK): # Taken from twisted ...@@ -39,9 +38,6 @@ def which(name, flags=os.X_OK): # Taken from twisted
result.append(pext) result.append(pext)
return result return result
try: try:
import nacl.nacl import nacl.nacl
except ImportError: except ImportError:
...@@ -172,18 +168,6 @@ class build_clib(_build_clib): ...@@ -172,18 +168,6 @@ class build_clib(_build_clib):
return _build_clib.build_libraries(self, libraries) return _build_clib.build_libraries(self, libraries)
class PyTest(TestCommand):
def finalize_options(self):
TestCommand.finalize_options(self)
self.test_args = []
self.test_suite = True
def run_tests(self):
import pytest
errno = pytest.main(self.test_args)
sys.exit(errno)
setup( setup(
name=nacl.__title__, name=nacl.__title__,
version=nacl.__version__, version=nacl.__version__,
...@@ -351,7 +335,6 @@ setup( ...@@ -351,7 +335,6 @@ setup(
zip_safe=False, zip_safe=False,
cmdclass={ cmdclass={
"build_clib": build_clib, "build_clib": build_clib,
"test": PyTest,
}, },
classifiers=[ classifiers=[
......
from invoke import Collection, task, run
from nacl.invoke import sodium
ns = Collection()
ns.add_collection(sodium)
@ns.add_task
@task
def tests():
run("py.test")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment