Skip to content

Commit 019d5a5

Browse files
authored
Merge pull request #1 from todoa2c/specify-source-and-test-dir
Specify source and test dir
2 parents b176ab4 + feb6c48 commit 019d5a5

File tree

5 files changed

+41
-10
lines changed

5 files changed

+41
-10
lines changed

.travis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
language: python
2+
python:
3+
- 2.7
4+
- 3.3
5+
- 3.4
6+
- 3.5
7+
- pypy
8+
9+
install:
10+
- pip install tox tox-travis
11+
- pip install coverage coveralls
12+
13+
script:
14+
- tox -r

requirements.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
cov-core==1.7
2-
coverage==3.7
3-
execnet==1.1
4-
py==1.4.17
5-
pytest==2.4.2
6-
pytest-cov==1.6
7-
pytest-xdist==1.9
1+
cov-core==1.15.0
2+
coverage==4.4.1
3+
execnet==1.4.1
4+
py==1.4.34
5+
pytest==3.1.3
6+
pytest-cov==2.5.1
7+
pytest-xdist==1.18.0
8+
tox==2.7.0
9+
virtualenv==15.1.0

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ license-file = LICENSE
44
[wheel]
55
universal = 1
66

7-
[pytest]
8-
addopts = -rsxX -v
7+
[tool:pytest]
8+
addopts = -rsxX -v tests acme
99
norecursedirs = .git

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def run_tests(self):
1717

1818
setup(
1919
name='skeleton_for_pytest',
20-
version='0.0.1',
20+
version='0.0.2',
2121
url='https://github.com/tddbc/python_pytest.git',
2222
author='TDD BaseCamp',
2323
author_email='tddbc@googlegroups.com',
@@ -36,6 +36,8 @@ def run_tests(self):
3636
'Programming Language :: Python :: 2.7',
3737
'Programming Language :: Python :: 3',
3838
'Programming Language :: Python :: 3.3',
39+
'Programming Language :: Python :: 3.4',
40+
'Programming Language :: Python :: 3.5',
3941
'Programming Language :: Python :: Implementation :: PyPy',
4042
],
4143
)

tox.ini

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[tox]
2+
skipsdist = True
3+
envlist =
4+
py27,
5+
py33,
6+
py34,
7+
py35
8+
9+
[testenv]
10+
deps=
11+
-r{toxinidir}/requirements.txt
12+
commands=
13+
python setup.py test

0 commit comments

Comments
 (0)