summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-05-28 01:52:37 +0900
committerKali Kaneko <kali@leap.se>2013-05-28 01:52:37 +0900
commit0decfb4c7ac9bba501e79f68c7fc45b68d6dd6d7 (patch)
tree9da327b232de763d0155ea1fcff3e95fa250a780
parent3214e542c7e5ebaadd704c17f2a34858b7b8e92e (diff)
fix dependencies
-rw-r--r--.gitignore1
-rw-r--r--changes/bug_fix-deps1
-rw-r--r--setup.py5
3 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 42580d30..4d06b77d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ dist/
build/
MANIFEST
*.egg-info/
+*.egg
diff --git a/changes/bug_fix-deps b/changes/bug_fix-deps
new file mode 100644
index 00000000..415386f8
--- /dev/null
+++ b/changes/bug_fix-deps
@@ -0,0 +1 @@
+ o Fix bad dependencies in setup.py.
diff --git a/setup.py b/setup.py
index afebf609..1f972746 100644
--- a/setup.py
+++ b/setup.py
@@ -31,9 +31,10 @@ install_requirements = [
'python-gnupg',
'simplejson',
'twisted>=12.0.0', # TODO: maybe we just want twisted-web?
+ 'oauth',
'u1db',
'requests',
- 'six==1.1',
+ 'six==1.1.0',
'pysqlite',
'scrypt',
]
@@ -57,7 +58,7 @@ setup(
name='leap.soledad',
# TODO: change version according to decisions regarding soledad versus
# leap client versions.
- version='0.1.0-dev',
+ version='0.1.0',
url='https://leap.se/',
license='GPLv3+',
description='Synchronization of locally encrypted data among devices.',