Merge branch 'master' into lxml-formatter

2018-07-25 11:39:48 -04:00
parent 99f84b5dfe dbfb980bde
commit d5f6e45363
53 changed files with 3574 additions and 907 deletions
@@ -26,9 +26,9 @@ setuptools.setup(

    install_requires=[
        "aiohttp>=3.0.1,<4",
-        "mautrix-appservice>=0.3.0,<0.4.0",
+        "mautrix-appservice>=0.3.1,<0.4.0",
        "SQLAlchemy>=1.2.3,<2",
-        "alembic>=0.9.8,<0.10",
+        "alembic>=1.0.0,<2",
        "Markdown>=2.6.11,<3",
        "ruamel.yaml>=0.15.35,<0.16",
        "future-fstrings>=0.4.2",
@@ -52,7 +52,7 @@ setuptools.setup(
        mautrix-telegram=mautrix_telegram.__main__:main
    """,
    package_data={"mautrix_telegram": [
-        "public/*.mako", "public/*.png", "public/*.css",
+        "web/public/*.mako", "web/public/*.png", "web/public/*.css",
    ]},
    data_files=[
        (".", ["example-config.yaml", "alembic.ini"]),