diff options
| author | Kali Kaneko <kali@leap.se> | 2013-05-08 02:26:26 +0900 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-05-08 02:26:26 +0900 |
| commit | c8c77b406946287110d2a6092c4d4ad419925981 (patch) | |
| tree | 01b94e235f2932141d5464ed61b3c4e549c66bb3 | |
| parent | cb49c8687a12a98b8d216b62bd49d90d6b1fa422 (diff) | |
update setup, deps are in pypi now
| -rw-r--r-- | README | 24 | ||||
| -rw-r--r-- | README.rst | 12 | ||||
| -rw-r--r-- | setup.py | 7 |
3 files changed, 16 insertions, 27 deletions
diff --git a/README b/README deleted file mode 100644 index c03b766b..00000000 --- a/README +++ /dev/null @@ -1,24 +0,0 @@ -Soledad -- Synchronization Of Locally Encrypted Data Among Devices -================================================================== - -This software is under development. - -Dependencies ------------- - -The following Soledad dependencies have not been packaged in pypi yet, and so -are downloaded directly from their repositories (see `setup.py`): - - * pysqlcipher: pysqlite fork that binds to SQLCipher libraries. - Repository: git://git.futeisha.org/pysqlcipher.git@develop - - * leap.common: Leap's common code (provides config, events, testing, etc). - Repository: ssh://code.leap.se/leap_pycommon.git@develop - -Tests ------ - -To run CouchDB tests, be sure you have CouchDB installed on your system. -Tests can be run with: - - python setup.py test diff --git a/README.rst b/README.rst new file mode 100644 index 00000000..b6d2d684 --- /dev/null +++ b/README.rst @@ -0,0 +1,12 @@ +Soledad -- Synchronization Of Locally Encrypted Data Among Devices +================================================================== + +This software is under development. + +Tests +----- + +To run CouchDB tests, be sure you have CouchDB installed on your system. +Tests can be run with: + + python setup.py test @@ -39,7 +39,8 @@ install_requirements = [ # platform-supplied package, or install Twisted by downloading a tarball, # unpacking it, and running setup.py." # - https://twistedmatrix.com/trac/wiki/FrequentlyAskedQuestions - 'twisted==13.0.0', # TODO: maybe we just want twisted-web? + 'twisted==13.0.0', # TODO: maybe we just want twisted-web? + # twisted cannot be installed separately using pip. 'u1db', 'requests', 'six==1.1', @@ -49,8 +50,8 @@ install_requirements = [ # TODO: change below so we get stable versions of modules. dependency_links = [ - 'git+git://git.futeisha.org/pysqlcipher.git@develop#egg=pysqlcipher', - 'git+ssh://code.leap.se/leap_pycommon.git@develop#egg=leap.common', + #'git+git://git.futeisha.org/pysqlcipher.git@develop#egg=pysqlcipher', + #'git+ssh://code.leap.se/leap_pycommon.git@develop#egg=leap.common', 'http://twistedmatrix.com/Releases/Twisted/13.0/Twisted-13.0.0.tar.bz2#egg=twisted-13.0.0' ] |