Commit f9bfab9f authored by Andrej Shadura's avatar Andrej Shadura

Refresh patches, update dependencies

parent 01004179
...@@ -10,7 +10,7 @@ Build-Depends: ...@@ -10,7 +10,7 @@ Build-Depends:
libjs-jquery, libjs-jquery,
po-debconf, po-debconf,
python (>= 2.6.6-3), python (>= 2.6.6-3),
python-attr, python-attr (>= 16.0.0),
python-bcrypt, python-bcrypt,
python-blist, python-blist,
python-canonicaljson (>= 1.1.3), python-canonicaljson (>= 1.1.3),
...@@ -25,8 +25,8 @@ Build-Depends: ...@@ -25,8 +25,8 @@ Build-Depends:
python-phonenumbers, python-phonenumbers,
python-pil, python-pil,
python-prometheus-client, python-prometheus-client,
python-psutil,
python-pyasn1, python-pyasn1,
python-pydenticon,
python-pymacaroons, python-pymacaroons,
python-pysaml2, python-pysaml2,
python-service-identity (>= 1.0.0), python-service-identity (>= 1.0.0),
...@@ -34,6 +34,7 @@ Build-Depends: ...@@ -34,6 +34,7 @@ Build-Depends:
python-signedjson (>= 1.0.0), python-signedjson (>= 1.0.0),
python-six, python-six,
python-sortedcontainers, python-sortedcontainers,
python-treq (>= 15.1.0),
python-twisted (>= 17.1.0), python-twisted (>= 17.1.0),
python-unpaddedbase64 (>= 1.0.1), python-unpaddedbase64 (>= 1.0.1),
python-yaml python-yaml
......
From: Erik Johnston <erikj@matrix.org>
Date: Fri, 10 Jun 2016 10:57:07 +0100
Subject: tox
---
tox.ini | 1 +
1 file changed, 1 insertion(+)
diff --git a/tox.ini b/tox.ini
index f408def..4a40b2a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
[tox]
envlist = packaging, py27, py36, pep8, check_isort
+sitepackages = True
[base]
deps =
...@@ -10,7 +10,7 @@ diff --git a/synapse/config/_base.py b/synapse/config/_base.py ...@@ -10,7 +10,7 @@ diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index 1ab5593..14052a9 100644 index 1ab5593..14052a9 100644
--- a/synapse/config/_base.py --- a/synapse/config/_base.py
+++ b/synapse/config/_base.py +++ b/synapse/config/_base.py
@@ -31,6 +31,11 @@ class ConfigError(Exception): @@ -32,6 +32,11 @@
MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\
Please opt in or out of reporting anonymized homeserver usage statistics, by Please opt in or out of reporting anonymized homeserver usage statistics, by
setting the `report_stats` key in your config file to either True or False. setting the `report_stats` key in your config file to either True or False.
...@@ -22,7 +22,7 @@ index 1ab5593..14052a9 100644 ...@@ -22,7 +22,7 @@ index 1ab5593..14052a9 100644
""" """
MISSING_REPORT_STATS_SPIEL = """\ MISSING_REPORT_STATS_SPIEL = """\
@@ -45,6 +50,11 @@ @@ -46,6 +51,11 @@
MISSING_SERVER_NAME = """\ MISSING_SERVER_NAME = """\
Missing mandatory `server_name` config option. Missing mandatory `server_name` config option.
......
...@@ -8,7 +8,7 @@ Subject: webclient-instructions ...@@ -8,7 +8,7 @@ Subject: webclient-instructions
--- a/synapse/app/homeserver.py --- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py
@@ -86,12 +86,11 @@ @@ -92,12 +92,11 @@
"Please either install the matrix-angular-sdk or configure\n" "Please either install the matrix-angular-sdk or configure\n"
"the location of the source to serve via the configuration\n" "the location of the source to serve via the configuration\n"
"option `web_client_location`\n\n" "option `web_client_location`\n\n"
......
...@@ -10,7 +10,7 @@ diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py ...@@ -10,7 +10,7 @@ diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 5a0329b..492b05f 100755 index 5a0329b..492b05f 100755
--- a/synapse/app/homeserver.py --- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py
@@ -109,7 +109,7 @@ class SynapseHomeServer(HomeServer): @@ -126,7 +126,7 @@
for res in listener_config["resources"]: for res in listener_config["resources"]:
for name in res["names"]: for name in res["names"]:
resources.update(self._configure_named_resource( resources.update(self._configure_named_resource(
...@@ -19,7 +19,7 @@ index 5a0329b..492b05f 100755 ...@@ -19,7 +19,7 @@ index 5a0329b..492b05f 100755
)) ))
additional_resources = listener_config.get("additional_resources", {}) additional_resources = listener_config.get("additional_resources", {})
@@ -154,7 +154,7 @@ class SynapseHomeServer(HomeServer): @@ -173,7 +173,7 @@
) )
logger.info("Synapse now listening on port %d", port) logger.info("Synapse now listening on port %d", port)
...@@ -28,7 +28,7 @@ index 5a0329b..492b05f 100755 ...@@ -28,7 +28,7 @@ index 5a0329b..492b05f 100755
"""Build a resource map for a named resource """Build a resource map for a named resource
Args: Args:
@@ -212,7 +212,7 @@ class SynapseHomeServer(HomeServer): @@ -240,7 +240,7 @@
SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self),
}) })
......
...@@ -10,7 +10,7 @@ Bug: https://github.com/matrix-org/synapse/issues/3743 ...@@ -10,7 +10,7 @@ Bug: https://github.com/matrix-org/synapse/issues/3743
@@ -25,8 +25,8 @@ @@ -25,8 +25,8 @@
except python_dependencies.MissingRequirementError as e: except python_dependencies.MissingRequirementError as e:
message = "\n".join([ message = "\n".join([
"Missing Requirement: %s" % (e.message,), "Missing Requirement: %s" % (str(e),),
- "To install run:", - "To install run:",
- " pip install --upgrade --force \"%s\"" % (e.dependency,), - " pip install --upgrade --force \"%s\"" % (e.dependency,),
+ "To install, try:", + "To install, try:",
...@@ -18,8 +18,8 @@ Bug: https://github.com/matrix-org/synapse/issues/3743 ...@@ -18,8 +18,8 @@ Bug: https://github.com/matrix-org/synapse/issues/3743
"", "",
]) ])
sys.stderr.writelines(message) sys.stderr.writelines(message)
--- a/synapse/config/jwt.py --- a/synapse/config/jwt_config.py
+++ b/synapse/config/jwt.py +++ b/synapse/config/jwt_config.py
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
"""Missing jwt library. This is required for jwt login. """Missing jwt library. This is required for jwt login.
......
0001-tox.patch
0002-change_instructions.patch 0002-change_instructions.patch
0004-webclient-instructions.patch 0004-webclient-instructions.patch
0005-Honour-config.web_client.patch 0005-Honour-config.web_client.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment