Skip to content

Commit 53af458

Browse files
committed
Refactor CI config to eliminate tox
Also now use python-olm from pypi instead of directly using the (now defunct) git repo.
1 parent 66531e3 commit 53af458

File tree

4 files changed

+18
-53
lines changed

4 files changed

+18
-53
lines changed

.travis.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
1-
sudo: false
21
language: python
32
python:
43
- "2.7"
5-
- "3.4"
64
- "3.5"
75
- "3.6"
8-
9-
jobs:
10-
include:
11-
- dist: xenial
12-
python: "3.7"
6+
- "3.7"
137

148
before_install:
159
- wget https://gitlab.matrix.org/matrix-org/olm/-/archive/3.1.2/olm-3.1.2.tar.bz2
1610
- tar -xvf olm-3.1.2.tar.bz2
1711
- pushd olm-3.1.2 && make && sudo make PREFIX="/usr" install && popd
1812
- rm -r olm-3.1.2
19-
install: pip install tox-travis
20-
script: tox
13+
14+
install:
15+
- pip install -U coveralls
16+
- pip install -U flake8
17+
- pip install -U check-manifest
18+
- pip install ".[test, doc, e2e]"
19+
20+
script:
21+
- flake8 matrix_client samples test
22+
- check-manifest
23+
- coverage run --source=matrix_client setup.py test
24+
- sphinx-build -W docs/source docs/build/html
25+
26+
after_sucess:
27+
- coverage report
28+
- coveralls

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
include LICENSE
22
include *.rst
3-
include tox.ini
43
recursive-include samples *.py
54
recursive-include test *.py
65

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def exec_file(names):
5353
extras_require={
5454
'test': ['pytest', 'responses'],
5555
'doc': ['Sphinx==1.4.6', 'sphinx-rtd-theme==0.1.9', 'sphinxcontrib-napoleon==0.5.3'],
56-
'format': ['flake8'],
57-
'e2e': ['python-olm @ git+https://github.com/poljar/python-olm.git@4752eb22f005cb9f6143857008572e6d83252841', 'canonicaljson']
56+
'e2e': ['python-olm', 'canonicaljson']
5857
},
5958
)

tox.ini

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)