diff options
| author | kali <kali@leap.se> | 2013-01-30 10:42:32 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-01-30 10:42:32 +0900 |
| commit | ededacbc47861ef9804fe60545087e48e06bfc82 (patch) | |
| tree | ad5c17a4029f7aff2f7587242644d4c140562aed /pkg | |
| parent | 34abbe9a8b9f6ce7eff1d68d48f5be842868dff8 (diff) | |
| parent | 8ddd01b8f5bcc14fb7a51bfb95d0eacc83db640e (diff) | |
Merge branch 'release-0.2.0' into release/v0.2.0
removing soledad + email from release branch created with git flow
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/requirements.pip | 11 | ||||
| -rw-r--r-- | pkg/test-requirements.pip | 6 |
2 files changed, 0 insertions, 17 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index cbfbe8fb..89b0ad3b 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -15,14 +15,3 @@ sh pyxdg pygeoip # optional - -# email - -zope.interface -twisted>=12.3.0 - -# soledad deps -- will move to its own repo soon -python-gnupg -u1db -oauth -couchdb diff --git a/pkg/test-requirements.pip b/pkg/test-requirements.pip index d60439ea..a7349bfc 100644 --- a/pkg/test-requirements.pip +++ b/pkg/test-requirements.pip @@ -1,4 +1,3 @@ -six>=1.1,<1.2 # soledad req (nose2) unittest2 # TODO we should include this dep only for python2.6 coverage mock @@ -7,8 +6,3 @@ pep8==1.1 sphinx>=1.1.2 nose-exclude tox - -# for soledad * to be splitted * -nose2 -testscenarios -testtools |