mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-07 11:11:51 +00:00
merge (#3576)
This commit is contained in:
parent
6c0f8d9d50
commit
7c27c4d51c
@ -53,7 +53,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run: docker pull matrixdotorg/sytest-synapsepy3
|
- run: docker pull matrixdotorg/sytest-synapsepy3
|
||||||
- run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs hawkowl/sytestpy3
|
- run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs matrixdotorg/sytest-synapsepy3
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
path: ~/project/logs
|
path: ~/project/logs
|
||||||
destination: logs
|
destination: logs
|
||||||
@ -76,7 +76,7 @@ jobs:
|
|||||||
- checkout
|
- checkout
|
||||||
- run: bash .circleci/merge_base_branch.sh
|
- run: bash .circleci/merge_base_branch.sh
|
||||||
- run: docker pull matrixdotorg/sytest-synapsepy3
|
- run: docker pull matrixdotorg/sytest-synapsepy3
|
||||||
- run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs hawkowl/sytestpy3
|
- run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs matrixdotorg/sytest-synapsepy3
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
path: ~/project/logs
|
path: ~/project/logs
|
||||||
destination: logs
|
destination: logs
|
||||||
@ -101,6 +101,8 @@ workflows:
|
|||||||
jobs:
|
jobs:
|
||||||
- sytestpy2
|
- sytestpy2
|
||||||
- sytestpy2postgres
|
- sytestpy2postgres
|
||||||
|
- sytestpy3
|
||||||
|
- sytestpy3postgres
|
||||||
- sytestpy2merged:
|
- sytestpy2merged:
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
@ -109,6 +111,11 @@ workflows:
|
|||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
ignore: /develop|master/
|
ignore: /develop|master/
|
||||||
# Currently broken while the Python 3 port is incomplete
|
- sytestpy3merged:
|
||||||
# - sytestpy3
|
filters:
|
||||||
# - sytestpy3postgres
|
branches:
|
||||||
|
ignore: /develop|master/
|
||||||
|
- sytestpy3postgresmerged:
|
||||||
|
filters:
|
||||||
|
branches:
|
||||||
|
ignore: /develop|master/
|
||||||
|
@ -25,6 +25,9 @@ matrix:
|
|||||||
services:
|
services:
|
||||||
- postgresql
|
- postgresql
|
||||||
|
|
||||||
|
- python: 3.5
|
||||||
|
env: TOX_ENV=py35
|
||||||
|
|
||||||
- python: 3.6
|
- python: 3.6
|
||||||
env: TOX_ENV=py36
|
env: TOX_ENV=py36
|
||||||
|
|
||||||
|
1
changelog.d/3576.feature
Normal file
1
changelog.d/3576.feature
Normal file
@ -0,0 +1 @@
|
|||||||
|
Python 3.5+ is now supported.
|
@ -348,7 +348,8 @@ class SimpleHttpClient(object):
|
|||||||
|
|
||||||
resp_headers = dict(response.headers.getAllRawHeaders())
|
resp_headers = dict(response.headers.getAllRawHeaders())
|
||||||
|
|
||||||
if 'Content-Length' in resp_headers and resp_headers['Content-Length'] > max_size:
|
if (b'Content-Length' in resp_headers and
|
||||||
|
int(resp_headers[b'Content-Length']) > max_size):
|
||||||
logger.warn("Requested URL is too large > %r bytes" % (self.max_size,))
|
logger.warn("Requested URL is too large > %r bytes" % (self.max_size,))
|
||||||
raise SynapseError(
|
raise SynapseError(
|
||||||
502,
|
502,
|
||||||
@ -381,7 +382,12 @@ class SimpleHttpClient(object):
|
|||||||
)
|
)
|
||||||
|
|
||||||
defer.returnValue(
|
defer.returnValue(
|
||||||
(length, resp_headers, response.request.absoluteURI, response.code),
|
(
|
||||||
|
length,
|
||||||
|
resp_headers,
|
||||||
|
response.request.absoluteURI.decode('ascii'),
|
||||||
|
response.code,
|
||||||
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -466,9 +472,9 @@ class SpiderEndpointFactory(object):
|
|||||||
def endpointForURI(self, uri):
|
def endpointForURI(self, uri):
|
||||||
logger.info("Getting endpoint for %s", uri.toBytes())
|
logger.info("Getting endpoint for %s", uri.toBytes())
|
||||||
|
|
||||||
if uri.scheme == "http":
|
if uri.scheme == b"http":
|
||||||
endpoint_factory = HostnameEndpoint
|
endpoint_factory = HostnameEndpoint
|
||||||
elif uri.scheme == "https":
|
elif uri.scheme == b"https":
|
||||||
tlsCreator = self.policyForHTTPS.creatorForNetloc(uri.host, uri.port)
|
tlsCreator = self.policyForHTTPS.creatorForNetloc(uri.host, uri.port)
|
||||||
|
|
||||||
def endpoint_factory(reactor, host, port, **kw):
|
def endpoint_factory(reactor, host, port, **kw):
|
||||||
|
@ -15,6 +15,8 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
import six
|
||||||
|
|
||||||
from prometheus_client import Counter
|
from prometheus_client import Counter
|
||||||
|
|
||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
@ -26,6 +28,9 @@ from synapse.util.metrics import Measure
|
|||||||
|
|
||||||
from . import push_rule_evaluator, push_tools
|
from . import push_rule_evaluator, push_tools
|
||||||
|
|
||||||
|
if six.PY3:
|
||||||
|
long = int
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
http_push_processed_counter = Counter("synapse_http_httppusher_http_pushes_processed", "")
|
http_push_processed_counter = Counter("synapse_http_httppusher_http_pushes_processed", "")
|
||||||
@ -96,7 +101,7 @@ class HttpPusher(object):
|
|||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def on_new_notifications(self, min_stream_ordering, max_stream_ordering):
|
def on_new_notifications(self, min_stream_ordering, max_stream_ordering):
|
||||||
self.max_stream_ordering = max(max_stream_ordering, self.max_stream_ordering)
|
self.max_stream_ordering = max(max_stream_ordering, self.max_stream_ordering or 0)
|
||||||
yield self._process()
|
yield self._process()
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
|
@ -17,10 +17,11 @@ import email.mime.multipart
|
|||||||
import email.utils
|
import email.utils
|
||||||
import logging
|
import logging
|
||||||
import time
|
import time
|
||||||
import urllib
|
|
||||||
from email.mime.multipart import MIMEMultipart
|
from email.mime.multipart import MIMEMultipart
|
||||||
from email.mime.text import MIMEText
|
from email.mime.text import MIMEText
|
||||||
|
|
||||||
|
from six.moves import urllib
|
||||||
|
|
||||||
import bleach
|
import bleach
|
||||||
import jinja2
|
import jinja2
|
||||||
|
|
||||||
@ -474,7 +475,7 @@ class Mailer(object):
|
|||||||
# XXX: make r0 once API is stable
|
# XXX: make r0 once API is stable
|
||||||
return "%s_matrix/client/unstable/pushers/remove?%s" % (
|
return "%s_matrix/client/unstable/pushers/remove?%s" % (
|
||||||
self.hs.config.public_baseurl,
|
self.hs.config.public_baseurl,
|
||||||
urllib.urlencode(params),
|
urllib.parse.urlencode(params),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -561,7 +562,7 @@ def _create_mxc_to_http_filter(config):
|
|||||||
return "%s_matrix/media/v1/thumbnail/%s?%s%s" % (
|
return "%s_matrix/media/v1/thumbnail/%s?%s%s" % (
|
||||||
config.public_baseurl,
|
config.public_baseurl,
|
||||||
serverAndMediaId,
|
serverAndMediaId,
|
||||||
urllib.urlencode(params),
|
urllib.parse.urlencode(params),
|
||||||
fragment or "",
|
fragment or "",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -13,6 +13,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
import six
|
||||||
|
|
||||||
from synapse.storage import DataStore
|
from synapse.storage import DataStore
|
||||||
from synapse.storage.end_to_end_keys import EndToEndKeyStore
|
from synapse.storage.end_to_end_keys import EndToEndKeyStore
|
||||||
from synapse.util.caches.stream_change_cache import StreamChangeCache
|
from synapse.util.caches.stream_change_cache import StreamChangeCache
|
||||||
@ -21,6 +23,13 @@ from ._base import BaseSlavedStore
|
|||||||
from ._slaved_id_tracker import SlavedIdTracker
|
from ._slaved_id_tracker import SlavedIdTracker
|
||||||
|
|
||||||
|
|
||||||
|
def __func__(inp):
|
||||||
|
if six.PY3:
|
||||||
|
return inp
|
||||||
|
else:
|
||||||
|
return inp.__func__
|
||||||
|
|
||||||
|
|
||||||
class SlavedDeviceStore(BaseSlavedStore):
|
class SlavedDeviceStore(BaseSlavedStore):
|
||||||
def __init__(self, db_conn, hs):
|
def __init__(self, db_conn, hs):
|
||||||
super(SlavedDeviceStore, self).__init__(db_conn, hs)
|
super(SlavedDeviceStore, self).__init__(db_conn, hs)
|
||||||
@ -38,14 +47,14 @@ class SlavedDeviceStore(BaseSlavedStore):
|
|||||||
"DeviceListFederationStreamChangeCache", device_list_max,
|
"DeviceListFederationStreamChangeCache", device_list_max,
|
||||||
)
|
)
|
||||||
|
|
||||||
get_device_stream_token = DataStore.get_device_stream_token.__func__
|
get_device_stream_token = __func__(DataStore.get_device_stream_token)
|
||||||
get_user_whose_devices_changed = DataStore.get_user_whose_devices_changed.__func__
|
get_user_whose_devices_changed = __func__(DataStore.get_user_whose_devices_changed)
|
||||||
get_devices_by_remote = DataStore.get_devices_by_remote.__func__
|
get_devices_by_remote = __func__(DataStore.get_devices_by_remote)
|
||||||
_get_devices_by_remote_txn = DataStore._get_devices_by_remote_txn.__func__
|
_get_devices_by_remote_txn = __func__(DataStore._get_devices_by_remote_txn)
|
||||||
_get_e2e_device_keys_txn = DataStore._get_e2e_device_keys_txn.__func__
|
_get_e2e_device_keys_txn = __func__(DataStore._get_e2e_device_keys_txn)
|
||||||
mark_as_sent_devices_by_remote = DataStore.mark_as_sent_devices_by_remote.__func__
|
mark_as_sent_devices_by_remote = __func__(DataStore.mark_as_sent_devices_by_remote)
|
||||||
_mark_as_sent_devices_by_remote_txn = (
|
_mark_as_sent_devices_by_remote_txn = (
|
||||||
DataStore._mark_as_sent_devices_by_remote_txn.__func__
|
__func__(DataStore._mark_as_sent_devices_by_remote_txn)
|
||||||
)
|
)
|
||||||
count_e2e_one_time_keys = EndToEndKeyStore.__dict__["count_e2e_one_time_keys"]
|
count_e2e_one_time_keys = EndToEndKeyStore.__dict__["count_e2e_one_time_keys"]
|
||||||
|
|
||||||
|
44
tox.ini
44
tox.ini
@ -64,49 +64,11 @@ setenv =
|
|||||||
{[base]setenv}
|
{[base]setenv}
|
||||||
SYNAPSE_POSTGRES = 1
|
SYNAPSE_POSTGRES = 1
|
||||||
|
|
||||||
|
[testenv:py35]
|
||||||
|
usedevelop=true
|
||||||
|
|
||||||
[testenv:py36]
|
[testenv:py36]
|
||||||
usedevelop=true
|
usedevelop=true
|
||||||
commands =
|
|
||||||
/usr/bin/find "{toxinidir}" -name '*.pyc' -delete
|
|
||||||
coverage run {env:COVERAGE_OPTS:} --source="{toxinidir}/synapse" \
|
|
||||||
"{envbindir}/trial" {env:TRIAL_FLAGS:} {posargs:tests/config \
|
|
||||||
tests/api/test_filtering.py \
|
|
||||||
tests/api/test_ratelimiting.py \
|
|
||||||
tests/appservice \
|
|
||||||
tests/crypto \
|
|
||||||
tests/events \
|
|
||||||
tests/handlers/test_appservice.py \
|
|
||||||
tests/handlers/test_auth.py \
|
|
||||||
tests/handlers/test_device.py \
|
|
||||||
tests/handlers/test_directory.py \
|
|
||||||
tests/handlers/test_e2e_keys.py \
|
|
||||||
tests/handlers/test_presence.py \
|
|
||||||
tests/handlers/test_profile.py \
|
|
||||||
tests/handlers/test_register.py \
|
|
||||||
tests/replication/slave/storage/test_account_data.py \
|
|
||||||
tests/replication/slave/storage/test_receipts.py \
|
|
||||||
tests/storage/test_appservice.py \
|
|
||||||
tests/storage/test_background_update.py \
|
|
||||||
tests/storage/test_base.py \
|
|
||||||
tests/storage/test__base.py \
|
|
||||||
tests/storage/test_client_ips.py \
|
|
||||||
tests/storage/test_devices.py \
|
|
||||||
tests/storage/test_end_to_end_keys.py \
|
|
||||||
tests/storage/test_event_push_actions.py \
|
|
||||||
tests/storage/test_keys.py \
|
|
||||||
tests/storage/test_presence.py \
|
|
||||||
tests/storage/test_profile.py \
|
|
||||||
tests/storage/test_registration.py \
|
|
||||||
tests/storage/test_room.py \
|
|
||||||
tests/storage/test_user_directory.py \
|
|
||||||
tests/test_distributor.py \
|
|
||||||
tests/test_dns.py \
|
|
||||||
tests/test_preview.py \
|
|
||||||
tests/test_test_utils.py \
|
|
||||||
tests/test_types.py \
|
|
||||||
tests/util} \
|
|
||||||
{env:TOXSUFFIX:}
|
|
||||||
{env:DUMP_COVERAGE_COMMAND:coverage report -m}
|
|
||||||
|
|
||||||
[testenv:packaging]
|
[testenv:packaging]
|
||||||
deps =
|
deps =
|
||||||
|
Loading…
Reference in New Issue
Block a user