summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-18 13:57:55 +0000
committerErik Johnston <erik@matrix.org>2015-02-18 13:57:55 +0000
commita7925259a15f2995af2fedc2a8c59cdabd78b963 (patch)
tree079f8fefaf9ae250d13bb3d3ec888cc16356a577 /synapse/python_dependencies.py
parentAdd errback to all deferreds in transaction_queue (diff)
parentMerge pull request #80 from matrix-org/restrict-destinations (diff)
downloadsynapse-a7925259a15f2995af2fedc2a8c59cdabd78b963.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index ec78fc3627..9464b4fb62 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -25,6 +25,11 @@ def github_link(project, version, egg):
 
 DEPENDENCY_LINKS = [
     github_link(
+        project="pyca/pynacl",
+        version="d4d3175589b892f6ea7c22f466e0e223853516fa",
+        egg="pynacl-0.3.0",
+    ),
+    github_link(
         project="matrix-org/syutil",
         version="v0.0.3",
         egg="syutil-0.0.3",
@@ -34,11 +39,6 @@ DEPENDENCY_LINKS = [
         version="v0.6.2",
         egg="matrix_angular_sdk-0.6.2",
     ),
-    github_link(
-        project="pyca/pynacl",
-        version="d4d3175589b892f6ea7c22f466e0e223853516fa",
-        egg="pynacl-0.3.0",
-    )
 ]