Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ build/

localhost-800*/
static/client/register/register_config.js
.tox
13 changes: 10 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@ include LICENSE
include VERSION
include *.rst
include demo/README
include demo/demo.tls.dh
include demo/*.py
include demo/*.sh

recursive-include synapse/storage/schema *.sql
recursive-include synapse/storage/schema *.py

recursive-include demo *.dh
recursive-include demo *.py
recursive-include demo *.sh
recursive-include docs *
recursive-include scripts *
recursive-include scripts-dev *
recursive-include tests *.py

recursive-include static *.css
recursive-include static *.html
recursive-include static *.js

prune demo/etc
5 changes: 0 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ def exec_file(path_segments):
packages=find_packages(exclude=["tests", "tests.*"]),
description="Reference Synapse Home Server",
install_requires=dependencies['requirements'](include_conditional=True).keys(),
setup_requires=[
"Twisted>=15.1.0", # Here to override setuptools_trial's dependency on Twisted>=2.4.0
"setuptools_trial",
"mock"
],
dependency_links=dependencies["DEPENDENCY_LINKS"],
include_package_data=True,
zip_safe=False,
Expand Down
27 changes: 27 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[tox]
envlist = packaging, py27, pep8

[testenv]
deps =
coverage
Twisted>=15.1
mock
setenv =
PYTHONDONTWRITEBYTECODE = no_byte_code
commands =
coverage run --source=./synapse {envbindir}/trial tests
coverage report -m
install_command =
pip install --process-dependency-links --pre {opts} {packages}

[testenv:packaging]
deps =
check-manifest
commands =
check-manifest

[testenv:pep8]
basepython = python2.7
deps =
flake8
commands = flake8 synapse