From dbe5e37ef742617c93c7975a612582a77c7724a8 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Sun, 16 Jun 2013 21:45:16 -0300
Subject: Split client and server in two different packages and refactor.

---
 soledad/setup.py | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 soledad/setup.py

(limited to 'soledad/setup.py')

diff --git a/soledad/setup.py b/soledad/setup.py
new file mode 100644
index 00000000..51ab0b2b
--- /dev/null
+++ b/soledad/setup.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+# setup.py
+# Copyright (C) 2013 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+from setuptools import (
+    setup,
+    find_packages
+)
+
+
+install_requirements = [
+    'pysqlcipher',
+    'simplejson',
+    'oauth',  # this is not strictly needed by us, but we need it
+              # until u1db adds it to its release as a dep.
+    'u1db',
+    'six==1.1.0',
+    'scrypt',
+    'pyxdg',
+    'pycrypto',
+]
+
+
+tests_requirements = [
+    'mock',
+    'nose2',
+    'testscenarios',
+    'leap.common',
+    'leap.soledad_server',
+]
+
+
+trove_classifiers = (
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: "
+    "GNU General Public License v3 or later (GPLv3+)",
+    "Environment :: Console",
+    "Operating System :: OS Independent",
+    "Operating System :: POSIX",
+    "Programming Language :: Python :: 2.6",
+    "Programming Language :: Python :: 2.7",
+    "Topic :: Database :: Front-Ends",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+)
+
+setup(
+    name='leap.soledad',
+    version='0.1.1',
+    url='https://leap.se/',
+    license='GPLv3+',
+    description='Synchronization of locally encrypted data among devices.',
+    author='The LEAP Encryption Access Project',
+    author_email='info@leap.se',
+    long_description=(
+        "Soledad is the part of LEAP that allows application data to be "
+        "securely shared among devices. It provides, to other parts of the "
+        "LEAP client, an API for data storage and sync."
+    ),
+    namespace_packages=["leap"],
+    packages=find_packages('src', exclude=['leap.soledad.tests']),
+    package_dir={'': 'src'},
+    test_suite='leap.soledad.tests',
+    install_requires=install_requirements,
+    tests_require=tests_requirements,
+    classifiers=trove_classifiers,
+    extras_require={'signaling': ['leap.common']},
+)
-- 
cgit v1.2.3


From afc924f7efe6815380c6cdd9aa1d079223260b03 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Tue, 18 Jun 2013 14:08:27 -0300
Subject: Add missing dependencies.

---
 soledad/setup.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'soledad/setup.py')

diff --git a/soledad/setup.py b/soledad/setup.py
index 51ab0b2b..f0d070da 100644
--- a/soledad/setup.py
+++ b/soledad/setup.py
@@ -24,6 +24,7 @@ from setuptools import (
 
 install_requirements = [
     'pysqlcipher',
+    'pysqlite',  # TODO: this should not be a dep, see #2945
     'simplejson',
     'oauth',  # this is not strictly needed by us, but we need it
               # until u1db adds it to its release as a dep.
@@ -32,6 +33,7 @@ install_requirements = [
     'scrypt',
     'pyxdg',
     'pycrypto',
+    'pyOpenSSL',
 ]
 
 
-- 
cgit v1.2.3