From b55f9269ec5d9674bc76fe652f54a62322ee9577 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Sun, 11 Aug 2013 15:09:21 +0200 Subject: use py.test for testing correct cffi dependency to setup_requires ignore cffi, pycparser and pytest egg directories add myself to AUTHORS.rst --- .gitignore | 3 +++ AUTHORS.rst | 2 ++ setup.py | 27 +++++++++++++++++++++------ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2bf40e7c..886683e3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ _build/ .tox/ *.egg-info/ .coverage +cffi-*.egg/ +pycparser-*.egg/ +pytest-*.egg/ diff --git a/AUTHORS.rst b/AUTHORS.rst index 06e23d1f..3438aa04 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -5,3 +5,5 @@ AUTHORS * Hynek Schlawack * Donald Stufft * Laurens Van Houtven <_@lvh.io> +* Christian Heimes + diff --git a/setup.py b/setup.py index d162958b..2b935340 100644 --- a/setup.py +++ b/setup.py @@ -11,18 +11,33 @@ # See the License for the specific language governing permissions and # limitations under the License. +import sys from setuptools import setup +from setuptools.command.test import test as TestCommand + + +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="cryptography", - license="Apache License, Version 2.0", - install_requires=["cffi>=0.6"], - setup_requires=["nose>=1.0"], - test_suite="nose.collector", - url="https://github.com/alex/cryptography", description="cryptography is a package designed to expose cryptographic " "primitives and recipes to Python developers.", + license="Apache License, Version 2.0", + url="https://github.com/alex/cryptography", + zip_safe=False, # for cffi + setup_requires=["cffi>=0.6"], + tests_require=["pytest"], + cmdclass = {"test": PyTest}, classifiers=[ "Development Status :: 2 - Pre-Alpha", "Intended Audience :: Developers", @@ -33,7 +48,7 @@ setup( "Operating System :: POSIX :: BSD", "Operating System :: POSIX :: Linux", "Operating System :: Microsoft :: Windows", - "Programming Language :: C", + #"Programming Language :: cffi", "Programming Language :: Python", "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.6", -- cgit v1.2.3