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

This commit is contained in:
Erik Johnston 2015-05-06 12:54:36 +01:00
commit f10fd8a470
15 changed files with 4 additions and 2 deletions

1
scripts/port_from_sqlite_to_postgres.py Normal file → Executable file
View File

@ -1,3 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright 2015 OpenMarket Ltd
#

2
scripts/upgrade_db_to_v0.6.0.py Normal file → Executable file
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
from synapse.storage import SCHEMA_VERSION, read_schema
from synapse.storage._base import SQLBaseStore
from synapse.storage.signatures import SignatureStore

View File

@ -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/*"),
)