From 0226cf2d3f3975942997bbb26d6a32c4527f0d68 Mon Sep 17 00:00:00 2001 From: Donald Stufft <donald@stufft.io> Date: Tue, 24 Sep 2013 21:34:36 -0400 Subject: [PATCH] Clean up the setup.py from some of the cruft --- setup.py | 17 ----------------- tasks.py | 12 ------------ 2 files changed, 29 deletions(-) delete mode 100644 tasks.py diff --git a/setup.py b/setup.py index 8a8202e6..aadf8a71 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,6 @@ import tempfile from distutils.command.build_clib import build_clib as _build_clib from setuptools import setup -from setuptools.command.test import test as TestCommand import nacl @@ -39,9 +38,6 @@ def which(name, flags=os.X_OK): # Taken from twisted result.append(pext) return result - - - try: import nacl.nacl except ImportError: @@ -172,18 +168,6 @@ class build_clib(_build_clib): 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( name=nacl.__title__, version=nacl.__version__, @@ -351,7 +335,6 @@ setup( zip_safe=False, cmdclass={ "build_clib": build_clib, - "test": PyTest, }, classifiers=[ diff --git a/tasks.py b/tasks.py deleted file mode 100644 index 1e42d4b9..00000000 --- a/tasks.py +++ /dev/null @@ -1,12 +0,0 @@ -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") -- GitLab