[pkg] remove remaining refs to older soledad structure

2 files changed, 4 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index d4cbc171..fc8d7717 100644
--- a/Makefile
+++ b/Makefile
@@ -15,16 +15,15 @@ dev-backend:
 
 dev-latest-backend: dev-backend
 	pip install -e 'git+https://0xacab.org/leap/leap_pycommon@master#egg=leap.common'
-	pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad.common&subdirectory=common'
-	pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad.client&subdirectory=client'
+	pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad'
 
 dev-all: install_pixelated
 	pip install -e '.[all]'
+	pip install scrypt zope.proxy pysqlcipher
 
 dev-latest-all: dev-all
 	pip install -e 'git+https://0xacab.org/leap/leap_pycommon@master#egg=leap.common'
-	pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad.common&subdirectory=common'
-	pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad.client&subdirectory=client'
+	pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad'
 
 uninstall:
 	pip uninstall leap.bitmask
diff --git a/setup.py b/setup.py
index c68278e7..948e0899 100644
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,7 @@ if platform.system() == "Windows":
     required.append(['appdirs'])
     required.append(['python-gnupg'])
 
+# TODO change to leap.soledad when we tag 0.10
 mail_deps = ['leap.soledad.client', 'gnupg']
 gui_deps = ['vext.pyqt5', 'leap.bitmask_js']
 tor_deps = ['txtorcon']