From d80b44f079b5fd3d9bf51962542516b9f6340f3a Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Tue, 3 Jan 2017 11:24:35 -0200
Subject: Uses leap fork to test soledad streaming changes
---
service/requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/service/requirements.txt b/service/requirements.txt
index ad990332..fb87f846 100644
--- a/service/requirements.txt
+++ b/service/requirements.txt
@@ -8,6 +8,6 @@ whoosh==2.6.0
Twisted==16.1.1
-e 'git+https://0xacab.org/pixelated/leap_pycommon.git@develop#egg=leap.common'
-e 'git+https://0xacab.org/pixelated/bitmask-dev.git@feat_fetch_remote_on_expiry#egg=leap.bitmask'
--e 'git+https://0xacab.org/pixelated/soledad.git@develop#egg=leap.soledad.common&subdirectory=common/'
--e 'git+https://0xacab.org/pixelated/soledad.git@develop#egg=leap.soledad.client&subdirectory=client/'
+-e 'git+https://0xacab.org/leap/soledad.git@develop#egg=leap.soledad.common&subdirectory=common/'
+-e 'git+https://0xacab.org/leap/soledad.git@develop#egg=leap.soledad.client&subdirectory=client/'
-e .
--
cgit v1.2.3
From 9c6e2a7f40f3e96b203e1528ab974286e27a8d32 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Wed, 18 Jan 2017 14:14:15 -0200
Subject: Revert "Revert "[#888] Fix soledad class contract to be compatible
with new merge. with @thaissiqueira.""
This reverts commit 1e6e165a3fc397e45884eaec1122ba0cc5ff923e.
---
service/pixelated/config/sessions.py | 3 +--
service/test/support/integration/app_test_client.py | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py
index eb233a9f..594b8e35 100644
--- a/service/pixelated/config/sessions.py
+++ b/service/pixelated/config/sessions.py
@@ -95,8 +95,7 @@ class LeapSessionFactory(object):
server_url=server_url,
cert_file=api_cert,
shared_db=None,
- auth_token=user_token,
- defer_encryption=False)
+ auth_token=user_token)
defer.returnValue(soledad)
except (WrongMacError, UnknownMacMethodError), e:
raise SoledadWrongPassphraseException(e)
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py
index d52c85c0..0ff1df31 100644
--- a/service/test/support/integration/app_test_client.py
+++ b/service/test/support/integration/app_test_client.py
@@ -437,9 +437,7 @@ def initialize_soledad(tempdir, uuid):
secret_path,
local_db_path,
server_url,
- cert_file,
- defer_encryption=False,
- syncable=False)
+ cert_file)
yield SoledadMailAdaptor().initialize_store(_soledad)
--
cgit v1.2.3
From 038d21cecd47ab185cfe575d5f51aa34b5ad6178 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Wed, 18 Jan 2017 16:17:43 -0200
Subject: Use version of soledad from pixelated streaming branch
---
service/requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/service/requirements.txt b/service/requirements.txt
index fb87f846..2f39f88f 100644
--- a/service/requirements.txt
+++ b/service/requirements.txt
@@ -8,6 +8,6 @@ whoosh==2.6.0
Twisted==16.1.1
-e 'git+https://0xacab.org/pixelated/leap_pycommon.git@develop#egg=leap.common'
-e 'git+https://0xacab.org/pixelated/bitmask-dev.git@feat_fetch_remote_on_expiry#egg=leap.bitmask'
--e 'git+https://0xacab.org/leap/soledad.git@develop#egg=leap.soledad.common&subdirectory=common/'
--e 'git+https://0xacab.org/leap/soledad.git@develop#egg=leap.soledad.client&subdirectory=client/'
+-e 'git+https://0xacab.org/pixelated/soledad.git@streaming-branch#egg=leap.soledad.common&subdirectory=common/'
+-e 'git+https://0xacab.org/pixelated/soledad.git@streaming-branch#egg=leap.soledad.client&subdirectory=client/'
-e .
--
cgit v1.2.3
From d5869b8e2f7a53ba95a0df6f2fd7129930b8a5c3 Mon Sep 17 00:00:00 2001
From: Thais Siqueira <thais.siqueira@gmail.com>
Date: Tue, 14 Feb 2017 16:04:54 -0200
Subject: Use soledad 0.9.2 version
---
service/requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/service/requirements.txt b/service/requirements.txt
index 2f39f88f..ca80da7c 100644
--- a/service/requirements.txt
+++ b/service/requirements.txt
@@ -8,6 +8,6 @@ whoosh==2.6.0
Twisted==16.1.1
-e 'git+https://0xacab.org/pixelated/leap_pycommon.git@develop#egg=leap.common'
-e 'git+https://0xacab.org/pixelated/bitmask-dev.git@feat_fetch_remote_on_expiry#egg=leap.bitmask'
--e 'git+https://0xacab.org/pixelated/soledad.git@streaming-branch#egg=leap.soledad.common&subdirectory=common/'
--e 'git+https://0xacab.org/pixelated/soledad.git@streaming-branch#egg=leap.soledad.client&subdirectory=client/'
+-e 'git+https://0xacab.org/leap/soledad.git@0.9.2#egg=leap.soledad.common&subdirectory=common/'
+-e 'git+https://0xacab.org/leap/soledad.git@0.9.2#egg=leap.soledad.client&subdirectory=client/'
-e .
--
cgit v1.2.3
From f465aaffc4a520b6026a1bfda58371b8c5265664 Mon Sep 17 00:00:00 2001
From: Thais Siqueira <thais.siqueira@gmail.com>
Date: Wed, 15 Feb 2017 11:48:28 -0200
Subject: Change the soledad branch to point to master
---
service/requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/service/requirements.txt b/service/requirements.txt
index ca80da7c..d642c8e8 100644
--- a/service/requirements.txt
+++ b/service/requirements.txt
@@ -8,6 +8,6 @@ whoosh==2.6.0
Twisted==16.1.1
-e 'git+https://0xacab.org/pixelated/leap_pycommon.git@develop#egg=leap.common'
-e 'git+https://0xacab.org/pixelated/bitmask-dev.git@feat_fetch_remote_on_expiry#egg=leap.bitmask'
--e 'git+https://0xacab.org/leap/soledad.git@0.9.2#egg=leap.soledad.common&subdirectory=common/'
--e 'git+https://0xacab.org/leap/soledad.git@0.9.2#egg=leap.soledad.client&subdirectory=client/'
+-e 'git+https://0xacab.org/leap/soledad.git@master#egg=leap.soledad.common&subdirectory=common/'
+-e 'git+https://0xacab.org/leap/soledad.git@master#egg=leap.soledad.client&subdirectory=client/'
-e .
--
cgit v1.2.3
From 49fd4083b742fb13f7c759c4edee3f8fb2818097 Mon Sep 17 00:00:00 2001
From: Thais Siqueira <thais.siqueira@gmail.com>
Date: Wed, 15 Feb 2017 15:22:12 -0200
Subject: [#888] Using soledad master branch from pixelated fork
with @tayanefernandes
---
service/requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/service/requirements.txt b/service/requirements.txt
index d642c8e8..dace91b2 100644
--- a/service/requirements.txt
+++ b/service/requirements.txt
@@ -8,6 +8,6 @@ whoosh==2.6.0
Twisted==16.1.1
-e 'git+https://0xacab.org/pixelated/leap_pycommon.git@develop#egg=leap.common'
-e 'git+https://0xacab.org/pixelated/bitmask-dev.git@feat_fetch_remote_on_expiry#egg=leap.bitmask'
--e 'git+https://0xacab.org/leap/soledad.git@master#egg=leap.soledad.common&subdirectory=common/'
--e 'git+https://0xacab.org/leap/soledad.git@master#egg=leap.soledad.client&subdirectory=client/'
+-e 'git+https://0xacab.org/pixelated/soledad.git@master#egg=leap.soledad.common&subdirectory=common/'
+-e 'git+https://0xacab.org/pixelated/soledad.git@master#egg=leap.soledad.client&subdirectory=client/'
-e .
--
cgit v1.2.3