Skip to content

Commit 0113405

Browse files
authored
Fix pytest version conflict (#18)
* Pin pytest version * Pin pytest version * Pin pytest version * Pin pytest version
1 parent 2adfd8a commit 0113405

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ cache: pip
66
install:
77
- python setup.py sdist
88
- python setup.py install
9-
- pip install pytest>=4.4.0 pytest-cov requests coveralls codacy-coverage
9+
- pip install pytest pytest-cov pytest-xdist requests coveralls codacy-coverage
10+
- pip install --ignore-installed pytest>=4.4.0
11+
- pytest --version
1012

1113
script:
1214
- python setup.py test -a '--cov-config .coveragerc --cov=json_to_models -m "not no_expected" test/'

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ def run_tests(self):
4545
},
4646
install_requires=required,
4747
cmdclass={"test": PyTest},
48-
tests_require=["pytest", "pytest-xdist", "requests", "attrs"],
48+
tests_require=["pytest>=4.4.0", "pytest-xdist", "requests", "attrs"],
4949
data_files=[('', ['pytest.ini', '.coveragerc', 'LICENSE'])]
5050
)

0 commit comments

Comments
 (0)