From 0ac91baec282c1ca32a2f736e971393103cab0c4 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 23 Aug 2013 17:40:44 +0200 Subject: Remove the hard-dep on six It looks like it is no longer needed, but leaving it commented until we do some more tests. --- common/pkg/requirements-testing.pip | 4 ++++ common/pkg/requirements.pip | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) 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. -- cgit v1.2.3 From 0b13f1eeef095e14beea065f9e6b97159180d37a Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 26 Aug 2013 15:25:04 +0200 Subject: Add some notes about the package split. * in description line * in readme * add each package crate icon and link. --- README.rst | 21 +++++++++++++++++++-- client/setup.py | 5 +++-- common/setup.py | 5 +++-- server/setup.py | 5 +++-- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/README.rst b/README.rst index c2a33234..8fa966c2 100644 --- a/README.rst +++ b/README.rst @@ -2,11 +2,28 @@ Soledad ================================================================== *Synchronization Of Locally Encrypted Data Among Devices* -.. image:: https://pypip.in/v/leap.soledad/badge.png - :target: https://crate.io/packages/leap.soledad +Soledad is the part of LEAP that allows application data to be +securely shared among devices. It provides, to other parts of the +LEAP project, an API for data storage and sync. This software is under development. +There are currently three python packages maintained under this +repository: + +**leap.soledad.common** common pieces. +.. image:: https://pypip.in/v/leap.soledad.common/badge.png + :target: https://crate.io/packages/leap.soledad.common + +**leap.soledad.client** where the soledad client lives. +.. image:: https://pypip.in/v/leap.soledad.client/badge.png + :target: https://crate.io/packages/leap.soledad.client + +**leap.soledad.server** oh surprise! bits needed for the soledad server. +.. image:: https://pypip.in/v/leap.soledad.server/badge.png + :target: https://crate.io/packages/leap.soledad.server + + Library dependencies -------------------- * ``libsqlite3-dev`` diff --git a/client/setup.py b/client/setup.py index 142922a4..4f62809f 100644 --- a/client/setup.py +++ b/client/setup.py @@ -51,13 +51,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 ' + '(client components).', 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"], 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"], diff --git a/server/setup.py b/server/setup.py index 7dcd127c..e5c36278 100644 --- a/server/setup.py +++ b/server/setup.py @@ -57,13 +57,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 ' + '(server components)', 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"], -- cgit v1.2.3 From 18241699c963921ebf3e990ad19c0fd60c673f05 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 27 Aug 2013 18:38:56 +0200 Subject: add bypass var for init files --- server/setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/setup.py b/server/setup.py index e5c36278..348aa838 100644 --- a/server/setup.py +++ b/server/setup.py @@ -29,7 +29,8 @@ versioneer.parentdir_prefix = 'leap.soledad.server-' from pkg import utils -if os.environ.get('VIRTUAL_ENV', None): +isset = lambda var: os.environ.get(var, None) +if isset('VIRTUAL_ENV') or isset('LEAP_SKIP_INIT'): data_files = None else: # XXX this should go only for linux/mac @@ -71,5 +72,5 @@ setup( packages=find_packages('src'), package_dir={'': 'src'}, install_requires=utils.parse_requirements(), - data_files=data_files, + data_files=data_files ) -- cgit v1.2.3 From bffc2f8712af48640f107f24f0724c68c6610e5f Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Wed, 28 Aug 2013 14:38:43 -0300 Subject: Use dirspec instead of plain xdg. Closes #3574. --- client/changes/feature-3574_use-dirspec-instead-of-plain-xdg | 1 + client/pkg/requirements.pip | 1 - client/src/leap/soledad/client/__init__.py | 7 ++----- 3 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 client/changes/feature-3574_use-dirspec-instead-of-plain-xdg diff --git a/client/changes/feature-3574_use-dirspec-instead-of-plain-xdg b/client/changes/feature-3574_use-dirspec-instead-of-plain-xdg new file mode 100644 index 00000000..9bdc5071 --- /dev/null +++ b/client/changes/feature-3574_use-dirspec-instead-of-plain-xdg @@ -0,0 +1 @@ + o Use dirspec instead of plain xdg. Closes #3574. diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip index 86b79bb2..df6ddb94 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -2,7 +2,6 @@ pysqlcipher simplejson u1db scrypt -pyxdg pycryptopp # diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py index df2b30c2..c6fbeac4 100644 --- a/client/src/leap/soledad/client/__init__.py +++ b/client/src/leap/soledad/client/__init__.py @@ -37,12 +37,11 @@ import socket import ssl import errno - -from xdg import BaseDirectory from hashlib import sha256 from u1db.remote import http_client from u1db.remote.ssl_match_hostname import match_hostname +from leap.common.config import get_path_prefix # # Signaling function @@ -218,9 +217,7 @@ class Soledad(object): Keys used to access storage secrets in recovery documents. """ - DEFAULT_PREFIX = os.path.join( - BaseDirectory.xdg_config_home, - 'leap', 'soledad') + DEFAULT_PREFIX = os.path.join(get_path_prefix(), 'leap', 'soledad') """ Prefix for default values for path. """ -- cgit v1.2.3 From fa3f18d1455d9d1cdb63d52af05ad014c0aee47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Thu, 29 Aug 2013 14:44:10 -0300 Subject: Use soledad.server namespace in init script --- server/changes/bug_init_script | 2 ++ server/pkg/soledad | 2 +- server/src/leap/soledad/server/__init__.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 server/changes/bug_init_script diff --git a/server/changes/bug_init_script b/server/changes/bug_init_script new file mode 100644 index 00000000..dc4fc322 --- /dev/null +++ b/server/changes/bug_init_script @@ -0,0 +1,2 @@ + o Fix the init script for soledad server so that it uses the new + package namespace. \ No newline at end of file diff --git a/server/pkg/soledad b/server/pkg/soledad index c233731e..841233d1 100644 --- a/server/pkg/soledad +++ b/server/pkg/soledad @@ -12,7 +12,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin PIDFILE=/var/run/soledad.pid RUNDIR=/var/lib/soledad/ -OBJ=leap.soledad_server.application +OBJ=leap.soledad.server.application LOGFILE=/var/log/soledad.log HTTPS_PORT=2424 CERT_PATH=/etc/leap/soledad-server.pem diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index 0c56acb9..67b0611d 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -20,7 +20,7 @@ A U1DB server that stores data using CouchDB as its persistence layer. This should be run with: - twistd -n web --wsgi=leap.soledad_server.application --port=2424 + twistd -n web --wsgi=leap.soledad.server.application --port=2424 """ import configparser -- cgit v1.2.3 From 6a72835b3fa7267ffcf30ae0e5b5fa948e296390 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 6 Sep 2013 15:42:00 -0300 Subject: Fold in changes. --- CHANGELOG | 10 ++++++++++ client/changes/feature-3574_use-dirspec-instead-of-plain-xdg | 1 - .../feature_3487-split-soledad-into-common-client-and-server | 1 - common/changes/feature_improve_packaging | 1 - server/changes/bug_init_script | 2 -- 5 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 client/changes/feature-3574_use-dirspec-instead-of-plain-xdg delete mode 100644 common/changes/feature_3487-split-soledad-into-common-client-and-server delete mode 100644 common/changes/feature_improve_packaging delete mode 100644 server/changes/bug_init_script diff --git a/CHANGELOG b/CHANGELOG index 2137aebd..4d04046a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,13 @@ +0.3.2 Sep 6: +Client: + o Use dirspec instead of plain xdg. Closes #3574. +Server: + o Fix the init script for soledad server so that it uses the new + package namespace. +Common: + o Split soledad package into common, client and server. Closes #3487. + o Add versioneer, parse_requirements + 0.3.1 Aug 23: Client: o Add libsqlite3-dev requirement for soledad. diff --git a/client/changes/feature-3574_use-dirspec-instead-of-plain-xdg b/client/changes/feature-3574_use-dirspec-instead-of-plain-xdg deleted file mode 100644 index 9bdc5071..00000000 --- a/client/changes/feature-3574_use-dirspec-instead-of-plain-xdg +++ /dev/null @@ -1 +0,0 @@ - o Use dirspec instead of plain xdg. Closes #3574. 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/server/changes/bug_init_script b/server/changes/bug_init_script deleted file mode 100644 index dc4fc322..00000000 --- a/server/changes/bug_init_script +++ /dev/null @@ -1,2 +0,0 @@ - o Fix the init script for soledad server so that it uses the new - package namespace. \ No newline at end of file -- cgit v1.2.3 From 52f314e927ce220afcb78e94d96e8a86ec7eb270 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 12 Sep 2013 14:12:44 +0200 Subject: Fix changelog The last entries for common really belonged to 0.3.1 --- CHANGELOG | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4d04046a..6d797d89 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,9 +4,6 @@ Client: Server: o Fix the init script for soledad server so that it uses the new package namespace. -Common: - o Split soledad package into common, client and server. Closes #3487. - o Add versioneer, parse_requirements 0.3.1 Aug 23: Client: -- cgit v1.2.3 From dd52a6bdcbd05e6eb0b6d4a20dd54be1200c7965 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 12 Sep 2013 14:15:24 +0200 Subject: Update version to 0.3.2, add python-dirspec dependency --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7745afa9..70547f16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +soledad (0.3.2) unstable; urgency=low + + * Update to 0.3.2 + + -- Micah Anderson Thu, 12 Sep 2013 14:13:56 +0200 + soledad (0.3.1.1) unstable; urgency=low [ Ben Carrillo ] diff --git a/debian/control b/debian/control index d4cf04db..c5427347 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Package: soledad-client Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-sqlcipher, python-pysqlite1.1, python-simplejson, python-oauth, python-u1db, python-scrypt, - python-xdg, python-pycryptopp, soledad-common + python-dirspec, python-pycryptopp, soledad-common Description: Synchronization of locally encrypted data among devices. 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 -- cgit v1.2.3