Skip to content
This repository was archived by the owner on Feb 4, 2021. It is now read-only.

Commit fee2d4c

Browse files
authored
Use tox-travis. (#27)
And fix a few Travis/Tox related things.
1 parent a99a5da commit fee2d4c

File tree

5 files changed

+10
-19
lines changed

5 files changed

+10
-19
lines changed

.coveragerc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ source = jupyter_spark
44

55
[paths]
66
source =
7-
src/jupyter_spark
87
.tox/*/lib/python*/site-packages/jupyter_spark
98
.tox/pypy*/site-packages/jupyter_spark
109

.travis.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
language: python
2-
python: 3.5
32
sudo: false
4-
cache:
5-
directories:
6-
- "~/.cache/pip"
7-
env:
8-
- TOXENV=py27
9-
- TOXENV=py33
10-
- TOXENV=py34
11-
- TOXENV=py35
12-
- TOXENV=pypy
3+
cache: pip
4+
python:
5+
- "2.7"
6+
- "3.4"
7+
- "3.5"
8+
- "pypy"
139
install:
14-
- pip install tox codecov
10+
- pip install tox-travis
1511
script:
1612
- tox -v
1713
after_success:
18-
- codecov
14+
- bash <(curl -s https://codecov.io/bash)

pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[pytest]
2-
addopts = -v --flake8 --isort --cov-report=term-missing --cov=jupyter_spark --cov-config .coveragerc
2+
addopts = -v --flake8 --isort --cov-report xml --cov-report=term-missing --cov=jupyter_spark --cov-config .coveragerc
33
norecursedirs = *.egg .eggs dist build docs .tox
44
flake8-ignore = E501

tests/test_spark.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from jupyter_spark.handlers import SparkHandler
1010
from jupyter_spark.spark import BEAUTIFULSOUP_BUILDER, Spark
1111

12-
1312
PROXY_PREFIX = "/proxy/application_1234556789012_3456"
1413
spark = Spark(base_url='http://localhost:8888')
1514

tox.ini

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,17 @@
44
# and then run "tox" from this directory.
55
[tox]
66
recreate = true
7-
usedevelop = true
8-
envlist = py27, py33, py34, py35, pypy
97

108
[testenv]
119
commands =
12-
coverage erase
1310
py.test {posargs}
1411
deps:
1512
tornado
1613
coverage>=4.0
1714
pytest-isort
1815
pytest-cache>=1.0
1916
pytest-cov
20-
flake8<3.0.0
17+
flake8
2118
pytest-flake8>=0.5
2219
pytest>=2.8.0
2320
six

0 commit comments

Comments
 (0)