summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rwxr-xr-xclient/pkg/generate_wheels.sh2
-rwxr-xr-xclient/pkg/pip_install_requirements.sh2
-rw-r--r--client/pkg/requirements-latest.pip1
-rw-r--r--client/src/leap/soledad/client/examples/benchmarks/measure_index_times.py4
-rw-r--r--client/src/leap/soledad/client/examples/benchmarks/measure_index_times_custom_docid.py4
-rw-r--r--client/src/leap/soledad/client/examples/use_adbapi.py4
-rw-r--r--client/src/leap/soledad/client/sqlcipher.py2
7 files changed, 9 insertions, 10 deletions
diff --git a/client/pkg/generate_wheels.sh b/client/pkg/generate_wheels.sh
index e29c327e..496f8e01 100755
--- a/client/pkg/generate_wheels.sh
+++ b/client/pkg/generate_wheels.sh
@@ -7,7 +7,7 @@ if [ "$WHEELHOUSE" = "" ]; then
fi
pip wheel --wheel-dir $WHEELHOUSE pip
-pip wheel --wheel-dir $WHEELHOUSE --allow-external u1db --allow-unverified u1db --allow-external dirspec --allow-unverified dirspec -r pkg/requirements.pip
+pip wheel --wheel-dir $WHEELHOUSE --allow-external dirspec --allow-unverified dirspec -r pkg/requirements.pip
if [ -f pkg/requirements-testing.pip ]; then
pip wheel --wheel-dir $WHEELHOUSE -r pkg/requirements-testing.pip
fi
diff --git a/client/pkg/pip_install_requirements.sh b/client/pkg/pip_install_requirements.sh
index 1f5ac5f6..b97c826f 100755
--- a/client/pkg/pip_install_requirements.sh
+++ b/client/pkg/pip_install_requirements.sh
@@ -4,7 +4,7 @@
# Use at your own risk.
# See $usage for help
-insecure_packages="u1db dirspec"
+insecure_packages="dirspec"
leap_wheelhouse=https://lizard.leap.se/wheels
show_help() {
diff --git a/client/pkg/requirements-latest.pip b/client/pkg/requirements-latest.pip
index a629aa57..fa483db7 100644
--- a/client/pkg/requirements-latest.pip
+++ b/client/pkg/requirements-latest.pip
@@ -1,6 +1,5 @@
--index-url https://pypi.python.org/simple/
---allow-external u1db --allow-unverified u1db
--allow-external dirspec --allow-unverified dirspec
-e 'git+https://github.com/pixelated-project/leap_pycommon.git@develop#egg=leap.common'
diff --git a/client/src/leap/soledad/client/examples/benchmarks/measure_index_times.py b/client/src/leap/soledad/client/examples/benchmarks/measure_index_times.py
index 08775580..4fc91d9d 100644
--- a/client/src/leap/soledad/client/examples/benchmarks/measure_index_times.py
+++ b/client/src/leap/soledad/client/examples/benchmarks/measure_index_times.py
@@ -24,9 +24,9 @@ import hashlib
import os
import sys
-import u1db
from twisted.internet import defer, reactor
+from leap.soledad.common import l2db
from leap.soledad.client import adbapi
from leap.soledad.client.sqlcipher import SQLCipherOptions
@@ -135,7 +135,7 @@ def countDocs(_):
def printResult(r, **kwargs):
if kwargs:
debug(*kwargs.values())
- elif isinstance(r, u1db.Document):
+ elif isinstance(r, l2db.Document):
debug(r.doc_id, r.content['number'])
else:
len_results = len(r[1])
diff --git a/client/src/leap/soledad/client/examples/benchmarks/measure_index_times_custom_docid.py b/client/src/leap/soledad/client/examples/benchmarks/measure_index_times_custom_docid.py
index 9deba136..38ea18a3 100644
--- a/client/src/leap/soledad/client/examples/benchmarks/measure_index_times_custom_docid.py
+++ b/client/src/leap/soledad/client/examples/benchmarks/measure_index_times_custom_docid.py
@@ -24,11 +24,11 @@ import hashlib
import os
import sys
-import u1db
from twisted.internet import defer, reactor
from leap.soledad.client import adbapi
from leap.soledad.client.sqlcipher import SQLCipherOptions
+from leap.soledad.common import l2db
folder = os.environ.get("TMPDIR", "tmp")
@@ -135,7 +135,7 @@ def countDocs(_):
def printResult(r, **kwargs):
if kwargs:
debug(*kwargs.values())
- elif isinstance(r, u1db.Document):
+ elif isinstance(r, l2db.Document):
debug(r.doc_id, r.content['number'])
else:
len_results = len(r[1])
diff --git a/client/src/leap/soledad/client/examples/use_adbapi.py b/client/src/leap/soledad/client/examples/use_adbapi.py
index d7bd21f2..a2683836 100644
--- a/client/src/leap/soledad/client/examples/use_adbapi.py
+++ b/client/src/leap/soledad/client/examples/use_adbapi.py
@@ -21,11 +21,11 @@ from __future__ import print_function
import datetime
import os
-import u1db
from twisted.internet import defer, reactor
from leap.soledad.client import adbapi
from leap.soledad.client.sqlcipher import SQLCipherOptions
+from leap.soledad.common import l2db
folder = os.environ.get("TMPDIR", "tmp")
@@ -68,7 +68,7 @@ def countDocs(_):
def printResult(r):
- if isinstance(r, u1db.Document):
+ if isinstance(r, l2db.Document):
debug(r.doc_id, r.content['number'])
else:
len_results = len(r[1])
diff --git a/client/src/leap/soledad/client/sqlcipher.py b/client/src/leap/soledad/client/sqlcipher.py
index bf2a50f1..f36c0b6a 100644
--- a/client/src/leap/soledad/client/sqlcipher.py
+++ b/client/src/leap/soledad/client/sqlcipher.py
@@ -594,7 +594,7 @@ class U1DBSQLiteBackend(sqlite_backend.SQLitePartialExpandDatabase):
self._db_handle = conn
self._real_replica_uid = None
self._ensure_schema()
- self._factory = u1db.Document
+ self._factory = l2db.Document
class SoledadSQLCipherWrapper(SQLCipherDatabase):