use py.test for testing
correct cffi dependency to setup_requires
ignore cffi, pycparser and pytest egg directories
add myself to AUTHORS.rst
diff --git a/.gitignore b/.gitignore
index 2bf40e7..886683e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@
.tox/
*.egg-info/
.coverage
+cffi-*.egg/
+pycparser-*.egg/
+pytest-*.egg/
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 06e23d1..3438aa0 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -5,3 +5,5 @@
* Hynek Schlawack <hs@ox.cx>
* Donald Stufft <donald@stufft.io>
* Laurens Van Houtven <_@lvh.io>
+* Christian Heimes <christian@python.org>
+
diff --git a/setup.py b/setup.py
index d162958..2b93534 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 @@
"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",