summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTulio Casagrande <tcasagra@thoughtworks.com>2016-10-11 16:54:36 -0300
committerTulio Casagrande <tcasagra@thoughtworks.com>2016-10-11 16:54:36 -0300
commit9356d5c3d4e940e5d4ebf1c851a16b43374a6bc3 (patch)
treef0fb078d009650cb0d431eddd1344040aeabc19b
parent28f64b866d1f3c51fe1208d37450f2153ba1575f (diff)
[#792] Move leap.bonafide to leap.bitmask.bonafide
-rw-r--r--service/pixelated/config/leap.py6
-rw-r--r--service/pixelated/resources/auth.py2
-rw-r--r--service/requirements.txt2
-rw-r--r--service/test/unit/resources/test_login_resource.py2
4 files changed, 6 insertions, 6 deletions
diff --git a/service/pixelated/config/leap.py b/service/pixelated/config/leap.py
index 3d307fc7..e9e4a796 100644
--- a/service/pixelated/config/leap.py
+++ b/service/pixelated/config/leap.py
@@ -5,9 +5,9 @@ from twisted.cred.error import UnauthorizedLogin
from twisted.internet import defer, threads
from leap.common.events import (server as events_server)
from leap.soledad.common.errors import InvalidAuthTokenError
-from leap.bonafide._srp import SRPAuthError
-from leap.bonafide.session import Session
-from leap.bonafide.provider import Api
+from leap.bitmask.bonafide._srp import SRPAuthError
+from leap.bitmask.bonafide.session import Session
+from leap.bitmask.bonafide.provider import Api
from pixelated.config import credentials
from pixelated.config import leap_config
from pixelated.config.authentication import Authentication
diff --git a/service/pixelated/resources/auth.py b/service/pixelated/resources/auth.py
index a9297b30..6d675eb3 100644
--- a/service/pixelated/resources/auth.py
+++ b/service/pixelated/resources/auth.py
@@ -29,7 +29,7 @@ from twisted.web import util
from twisted.cred import error
from twisted.web.resource import IResource, ErrorPage
-from leap.bonafide._srp import SRPAuthError
+from leap.bitmask.bonafide._srp import SRPAuthError
from pixelated.config.leap import create_leap_session, authenticate
from pixelated.resources import IPixelatedSession
diff --git a/service/requirements.txt b/service/requirements.txt
index bbc5044e..f68c8ad3 100644
--- a/service/requirements.txt
+++ b/service/requirements.txt
@@ -9,7 +9,7 @@ whoosh==2.5.7
Twisted==16.1.1
-e 'git+https://github.com/pixelated/leap_pycommon.git@develop#egg=leap.common'
-e 'git+https://github.com/pixelated/leap_auth.git#egg=leap.auth'
--e 'git+https://github.com/leapcode/bonafide.git@master#egg=leap.bonafide'
+-e 'git+https://github.com/leapcode/bitmask-dev.git@master#egg=leap.bitmask'
-e 'git+https://github.com/pixelated/soledad.git@develop#egg=leap.soledad.common&subdirectory=common/'
-e 'git+https://github.com/pixelated/soledad.git@develop#egg=leap.soledad.client&subdirectory=client/'
-e 'git+https://github.com/pixelated/soledad.git@develop#egg=leap.soledad.server&subdirectory=server/'
diff --git a/service/test/unit/resources/test_login_resource.py b/service/test/unit/resources/test_login_resource.py
index 0ff9ec91..be199e0e 100644
--- a/service/test/unit/resources/test_login_resource.py
+++ b/service/test/unit/resources/test_login_resource.py
@@ -1,6 +1,6 @@
import os
-from leap.bonafide._srp import SRPAuthError
+from leap.bitmask.bonafide._srp import SRPAuthError
from mock import patch
from mockito import mock, when, any as ANY, verify, verifyZeroInteractions, verifyNoMoreInteractions
from twisted.trial import unittest