Merge pull request #41 from dstufft/fix-setup

Fix setup

5 files changed, 96 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 886683e3..ecf07a08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ _build/
 cffi-*.egg/
 pycparser-*.egg/
 pytest-*.egg/
+dist/
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 00000000..a0d91cec
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,7 @@
+include LICENSE
+include AUTHORS.rst
+include CONTRIBUTING.rst
+include README.rst
+
+recursive-include tests *.py
+recursive-include tests/primitives/vectors *
diff --git a/cryptography/__about__.py b/cryptography/__about__.py
new file mode 100644
index 00000000..16d631fd
--- /dev/null
+++ b/cryptography/__about__.py
@@ -0,0 +1,32 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+__all__ = [
+    "__title__", "__summary__", "__uri__", "__version__", "__author__",
+    "__email__", "__license__", "__copyright__",
+]
+
+__title__ = "cryptography"
+__summary__ = ("cryptography is a package designed to expose cryptographic "
+               "primitives and recipes to Python developers.")
+__uri__ = "https://github.com/alex/cryptography"
+
+__version__ = "0.1.dev1"
+
+__author__ = ("Alex Gaynor, Donald Stufft, Laurens van Houvten, "
+              "Jean-Paul Calderone, Chris Heime, and Indivdual Contributors")
+__email__ = "cryptography-dev@python.org"
+
+__license__ = "Apache License, Version 2.0"
+__copyright__ = "Copyright 2013 Donald Stufft"
diff --git a/cryptography/__init__.py b/cryptography/__init__.py
index e69de29b..f37bd227 100644
--- a/cryptography/__init__.py
+++ b/cryptography/__init__.py
@@ -0,0 +1,22 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from cryptography.__about__ import (
+    __title__, __summary__, __uri__, __version__, __author__, __email__,
+    __license__, __copyright__
+)
+
+
+__all__ = [
+    "__title__", "__summary__", "__uri__", "__version__", "__author__",
+    "__email__", "__license__", "__copyright__",
+]
diff --git a/setup.py b/setup.py
index fe23f302..e1cc2394 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, find_packages
+
+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,
+]
 
-from setuptools import setup
 
 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,12 @@ setup(
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Security :: Cryptography",
     ],
+
+    packages=find_packages(exclude=["tests", "tests.*"]),
+
+    install_requires=install_requires,
+    setup_requires=setup_requires,
+
+    # for cffi
+    zip_safe=False,
 )