Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.0

f10fd8a4 · Erik Johnston · 271ee604 · 3c11c9c1 · f10fd8a4 · f10fd8a4
Commit f10fd8a4 authored 9 years ago by Erik Johnston
--- a/scripts/check_auth.py
+++ b/scripts/check_auth.py
--- a/scripts/check_event_hash.py
+++ b/scripts/check_event_hash.py
--- a/scripts/check_signature.py
+++ b/scripts/check_signature.py
--- a/scripts/copyrighter-sql.pl
+++ b/scripts/copyrighter-sql.pl
--- a/scripts/copyrighter.pl
+++ b/scripts/copyrighter.pl
--- a/scripts/database-save.sh
+++ b/scripts/database-save.sh
--- a/scripts/federation_client.py
+++ b/scripts/federation_client.py
--- a/scripts/hash_history.py
+++ b/scripts/hash_history.py
--- a/scripts/make_identicons.pl
+++ b/scripts/make_identicons.pl
--- a/scripts/nuke-room-from-db.sh
+++ b/scripts/nuke-room-from-db.sh
--- a/scripts/sphinx_api_docs.sh
+++ b/scripts/sphinx_api_docs.sh
--- a/scripts/port_from_sqlite_to_postgres.py
+++ b/scripts/port_from_sqlite_to_postgres.py
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # Copyright 2015 OpenMarket Ltd
 #

--- a/register_new_matrix_user
+++ b/register_new_matrix_user
--- a/scripts/upgrade_db_to_v0.6.0.py
+++ b/scripts/upgrade_db_to_v0.6.0.py
-
+#!/usr/bin/env python
 from synapse.storage import SCHEMA_VERSION, read_schema
 from synapse.storage._base import SQLBaseStore
 from synapse.storage.signatures import SignatureStore

--- a/setup.py
+++ b/setup.py
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+import glob
 import os
 from setuptools import setup, find_packages

@@ -55,5 +56,5 @@ setup(
    include_package_data=True,
    zip_safe=False,
    long_description=long_description,
-    scripts=["synctl", "register_new_matrix_user"],
+    scripts=["synctl"] + glob.glob("scripts/*"),
 )