From f83ed1d8afc2cf8cee2a02496ae3cc3cdb3aee77 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Sat, 10 Aug 2013 23:28:29 +0200 Subject: add classifiers, url, description and nose integration for python setup.py test --- setup.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c3b754f3..d162958b 100644 --- a/setup.py +++ b/setup.py @@ -18,4 +18,31 @@ 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.", + classifiers=[ + "Development Status :: 2 - Pre-Alpha", + "Intended Audience :: Developers", + "License :: OSI Approved :: Apache Software License", + "Natural Language :: English", + "Operating System :: MacOS :: MacOS X", + "Operating System :: POSIX", + "Operating System :: POSIX :: BSD", + "Operating System :: POSIX :: Linux", + "Operating System :: Microsoft :: Windows", + "Programming Language :: C", + "Programming Language :: Python", + "Programming Language :: Python :: 2", + "Programming Language :: Python :: 2.6", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.2", + "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", + "Topic :: Security :: Cryptography", + ], ) -- cgit v1.2.3 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 --- setup.py | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'setup.py') 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 From ff1e64fd4ad32227f34e6ff2210c56e1a3db0d7d Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Sun, 11 Aug 2013 15:33:51 +0200 Subject: drop setup.py test again --- setup.py | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2b935340..7fc10b4c 100644 --- a/setup.py +++ b/setup.py @@ -13,20 +13,6 @@ 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", @@ -36,8 +22,6 @@ setup( 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", -- cgit v1.2.3 From 913bcb79c581992d99bd33c629631f78364b0cfe Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Sun, 11 Aug 2013 15:35:40 +0200 Subject: super nit-pick --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7fc10b4c..30b795b5 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,8 @@ setup( "primitives and recipes to Python developers.", license="Apache License, Version 2.0", url="https://github.com/alex/cryptography", - zip_safe=False, # for cffi + # for cffi + zip_safe=False, setup_requires=["cffi>=0.6"], classifiers=[ "Development Status :: 2 - Pre-Alpha", -- cgit v1.2.3 From 7fe70cb233d9489488d3be297d0daf0b3523b7bc Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Sun, 11 Aug 2013 15:52:21 +0200 Subject: hyper nit-pick --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 30b795b5..fe23f302 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import sys from setuptools import setup setup( -- cgit v1.2.3 From 5f12a1b89a46f028582945dff23a97c53e8ae2c5 Mon Sep 17 00:00:00 2001 From: Donald Stufft Date: Sun, 11 Aug 2013 16:37:43 -0400 Subject: Fix the packaging meta-data --- setup.py | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index fe23f302..7fe90d9c 100644 --- a/setup.py +++ b/setup.py @@ -10,18 +10,35 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. - from setuptools import setup +about = {} +with open("cryptography/__about__.py") as fp: + exec(fp.read(), about) + + +CFFI_DEPENDENCY = "cffi>=0.6" + +install_requires = [ + CFFI_DEPENDENCY, +] + +setup_requires = [ + CFFI_DEPENDENCY, +] + + setup( - name="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", - # for cffi - zip_safe=False, - setup_requires=["cffi>=0.6"], + name=about["__title__"], + version=about["__version__"], + + description=about["__summary__"], + license=about["__license__"], + url=about["__uri__"], + + author=about["__author__"], + author_email=about["__email__"], + classifiers=[ "Development Status :: 2 - Pre-Alpha", "Intended Audience :: Developers", @@ -44,4 +61,10 @@ setup( "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Security :: Cryptography", ], + + install_requires=install_requires, + setup_requires=setup_requires, + + # for cffi + zip_safe=False, ) -- cgit v1.2.3 From 9ebb8ff06ceb8b65bf41a9f1c907dbddfeabd2ed Mon Sep 17 00:00:00 2001 From: Donald Stufft Date: Sun, 11 Aug 2013 17:05:03 -0400 Subject: Include all of our files in the distributions, and install packages --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7fe90d9c..e1cc2394 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -from setuptools import setup +from setuptools import setup, find_packages about = {} with open("cryptography/__about__.py") as fp: @@ -62,6 +62,8 @@ setup( "Topic :: Security :: Cryptography", ], + packages=find_packages(exclude=["tests", "tests.*"]), + install_requires=install_requires, setup_requires=setup_requires, -- cgit v1.2.3