summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-09-06 15:52:06 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-09-06 15:52:06 -0300
commit86578e5e48fb394297da33f5f93ca07aed9e1af3 (patch)
tree70ffb63227d8b93224339267589a08297f3d58fb /common
parent21f58ccc9a29ee82faf0924ea03f39b3c91e43ee (diff)
parent6a72835b3fa7267ffcf30ae0e5b5fa948e296390 (diff)
Merge branch 'release-0.3.2'
Diffstat (limited to 'common')
-rw-r--r--common/changes/feature_3487-split-soledad-into-common-client-and-server1
-rw-r--r--common/changes/feature_improve_packaging1
-rw-r--r--common/pkg/requirements-testing.pip4
-rw-r--r--common/pkg/requirements.pip1
-rw-r--r--common/setup.py5
5 files changed, 7 insertions, 5 deletions
diff --git a/common/changes/feature_3487-split-soledad-into-common-client-and-server b/common/changes/feature_3487-split-soledad-into-common-client-and-server
deleted file mode 100644
index 2eab6b56..00000000
--- a/common/changes/feature_3487-split-soledad-into-common-client-and-server
+++ /dev/null
@@ -1 +0,0 @@
- o Split soledad package into common, client and server. Closes #3487.
diff --git a/common/changes/feature_improve_packaging b/common/changes/feature_improve_packaging
deleted file mode 100644
index e6d3630a..00000000
--- a/common/changes/feature_improve_packaging
+++ /dev/null
@@ -1 +0,0 @@
- o Add versioneer, parse_requirements
diff --git a/common/pkg/requirements-testing.pip b/common/pkg/requirements-testing.pip
index 18040ea1..6ff52ff9 100644
--- a/common/pkg/requirements-testing.pip
+++ b/common/pkg/requirements-testing.pip
@@ -4,3 +4,7 @@ testscenarios
leap.common
leap.soledad.server
leap.soledad.client
+
+# Under quarantine...
+# I've been able to run all tests with six==1.3 -- kali
+# six==1.1.0 # some tests are incompatible with newer versions of six.
diff --git a/common/pkg/requirements.pip b/common/pkg/requirements.pip
index 8fd57c3f..5787114e 100644
--- a/common/pkg/requirements.pip
+++ b/common/pkg/requirements.pip
@@ -1,6 +1,5 @@
simplejson
u1db
-six==1.1.0 # some tests are incompatible with newer versions of six.
#this is not strictly needed by us, but we need it
#until u1db adds it to its release as a dep.
diff --git a/common/setup.py b/common/setup.py
index 22159a2a..0a2f138f 100644
--- a/common/setup.py
+++ b/common/setup.py
@@ -50,13 +50,14 @@ setup(
cmdclass=versioneer.get_cmdclass(),
url='https://leap.se/',
license='GPLv3+',
- description='Synchronization of locally encrypted data among devices.',
+ description='Synchronization of locally encrypted data among devices '
+ '(common files).',
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."
+ "LEAP project, an API for data storage and sync."
),
classifiers=trove_classifiers,
namespace_packages=["leap", "leap.soledad"],