summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-05-29 15:13:21 -0300
committerTomás Touceda <chiiph@leap.se>2013-05-29 15:13:21 -0300
commit0a795cceb0f5902cb928b9b67bd91d0050459238 (patch)
tree3baf60a8e77adf3efdbe4ad581fe4daa14718880
parentcec2baa24f454c9f9168b5faed1a465e9943f591 (diff)
parentb00bb5cf4af7183076c02b02722ed6c495ff3f8a (diff)
Merge remote-tracking branch 'kali/bug/add-data-files' into develop
-rw-r--r--MANIFEST.in1
-rw-r--r--README.rst4
-rw-r--r--changes/bug_add-data-files1
-rw-r--r--setup.py30
-rw-r--r--src/leap/common/__init__.py2
5 files changed, 28 insertions, 10 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..84a01ef
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include src/leap/common/testing/*.pem
diff --git a/README.rst b/README.rst
index f960b1f..aeb871f 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,9 @@
leap.common
===========
+
+.. image:: https://pypip.in/v/leap.common/badge.png
+ :target: https://crate.io/packages/leap.common
+
A collection of shared utils used by the several python LEAP subprojects.
* leap.common.cert
diff --git a/changes/bug_add-data-files b/changes/bug_add-data-files
new file mode 100644
index 0000000..5231fb8
--- /dev/null
+++ b/changes/bug_add-data-files
@@ -0,0 +1 @@
+ o Add data files to setup and manifest (certificates for tests)
diff --git a/setup.py b/setup.py
index 99fd25b..c6b7fab 100644
--- a/setup.py
+++ b/setup.py
@@ -32,31 +32,42 @@ requirements = [
"PyCrypto",
]
-
-dependency_links = [
- "https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2.tar.gz#egg=protobuf.socketrpc"
-]
+#dependency_links = [
+ #"https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2.tar.gz#egg=protobuf.socketrpc"
+#]
tests_requirements = [
'mock',
]
-
-# XXX add classifiers, docs
+trove_classifiers = [
+ "Development Status :: 3 - Alpha",
+ "Intended Audience :: Developers",
+ ("License :: OSI Approved :: GNU General "
+ "Public License v3 or later (GPLv3+)"),
+ "Operating System :: OS Independent",
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 2.6",
+ "Programming Language :: Python :: 2.7",
+ "Topic :: Communications",
+ "Topic :: Security",
+ "Topic :: Utilities"
+]
setup(
name='leap.common',
# If you change version, do it also in
# src/leap/common/__init__.py
- version='0.2.4',
+ version='0.2.5',
url='https://leap.se/',
license='GPLv3+',
author='The LEAP Encryption Access Project',
author_email='info@leap.se',
- description='Common files used by the LEAP Client project.',
+ description='Common files used by the LEAP project.',
long_description=(
"Common files used by the LEAP Client project."
),
+ classifiers=trove_classifiers,
namespace_packages=["leap"],
package_dir={'': 'src'},
# For now, we do not exclude tests because of the circular dependency
@@ -65,6 +76,7 @@ setup(
packages=find_packages('src'),
test_suite='leap.common.tests',
install_requires=requirements,
- dependency_links=dependency_links,
+ #dependency_links=dependency_links,
tests_require=tests_requirements,
+ include_package_data=True
)
diff --git a/src/leap/common/__init__.py b/src/leap/common/__init__.py
index 2821f12..2b30715 100644
--- a/src/leap/common/__init__.py
+++ b/src/leap/common/__init__.py
@@ -16,4 +16,4 @@ except ImportError:
__all__ = ["certs", "check", "files", "events"]
-__version__ = "0.2.4"
+__version__ = "0.2.5"