diff options
Diffstat (limited to 'pkg')
| -rwxr-xr-x | pkg/linux/build_bundle.sh | 3 | ||||
| -rw-r--r-- | pkg/requirements-testing.pip | 2 | ||||
| -rw-r--r-- | pkg/requirements.pip | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/pkg/linux/build_bundle.sh b/pkg/linux/build_bundle.sh index 781884cb..e6a1043f 100755 --- a/pkg/linux/build_bundle.sh +++ b/pkg/linux/build_bundle.sh @@ -9,13 +9,14 @@ DEST=$5 rm $TEMPLATE_BUNDLE/CHANGELOG rm $TEMPLATE_BUNDLE/relnotes.txt rm -rf $TEMPLATE_BUNDLE/apps/leap -rm $TEMPLATE_BUNDLE/lib/leap/{common,keymanager,soledad,mail} +rm -rf $TEMPLATE_BUNDLE/lib/leap/{common,keymanager,soledad,mail} # checkout VERSION in all repos for i in {leap_client,leap_pycommon,soledad,keymanager,leap_mail} do cd $REPOS_ROOT/$i + git fetch git checkout $VERSION done diff --git a/pkg/requirements-testing.pip b/pkg/requirements-testing.pip index 2df5fe56..e789664a 100644 --- a/pkg/requirements-testing.pip +++ b/pkg/requirements-testing.pip @@ -1,6 +1,7 @@ nose nose-exclude nose-progressive +mock unittest2 # TODO we should include this dep only for python2.6 @@ -13,6 +14,5 @@ tox # double reqs # (the client already includes, which gives some errors) # ----------- -# mock # re-add XXX #twisted #zope.interface diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 7d0f79af..b39960b7 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -18,6 +18,8 @@ qt4reactor python-gnupg python-daemon # this should not be needed for Windows. +keyring<3.0.0 # See #3759 + leap.common>=0.3.0 leap.soledad.client>=0.3.0 leap.keymanager>=0.2.0 |