summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-09-01 14:50:29 +0100
committerMark Haines <mjark@negativecurvature.net>2015-09-01 14:50:29 +0100
commit236245f7d8c5adb4be90a7871fe6e2244134c8b4 (patch)
tree0fdaedd29373cc7edc9f7b4703625640c5e556e0
parentMerge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff)
parentUse the version of "matrix-angular-sdk" hosted on pypi (diff)
downloadsynapse-236245f7d8c5adb4be90a7871fe6e2244134c8b4.tar.xz
Merge pull request #264 from matrix-org/markjh/syweb_on_pypi
Use the version of "matrix-angular-sdk" hosted on pypi
-rw-r--r--synapse/python_dependencies.py5
-rw-r--r--tox.ini2
2 files changed, 0 insertions, 7 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index 8ec272fd5f..795ef27182 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -56,11 +56,6 @@ def github_link(project, version, egg): return "https://github.com/%s/tarball/%s/#egg=%s" % (project, version, egg) DEPENDENCY_LINKS = { - "matrix-angular-sdk": github_link( - project="matrix-org/matrix-angular-sdk", - version="v0.6.6", - egg="matrix_angular_sdk-0.6.6", - ), } diff --git a/tox.ini b/tox.ini
index 3f0649b628..a69948484f 100644 --- a/tox.ini +++ b/tox.ini
@@ -11,8 +11,6 @@ setenv = commands = coverage run --source=synapse {envbindir}/trial {posargs:tests} coverage report -m -install_command = - pip install --process-dependency-links --pre {opts} {packages} [testenv:packaging] deps =