Skip to content

Fix pytest version conflict #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bogdandm merged 4 commits into from
Apr 17, 2019
Merged

Fix pytest version conflict #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bba5f12
Pin pytest version
bogdandm Apr 17, 2019
8afc0f3
Pin pytest version
bogdandm Apr 17, 2019
81fac2e
Pin pytest version
bogdandm Apr 17, 2019
9faf142
Pin pytest version
bogdandm Apr 17, 2019
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
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ cache: pip
install:
- python setup.py sdist
- python setup.py install
- pip install pytest>=4.4.0 pytest-cov requests coveralls codacy-coverage
- pip install pytest pytest-cov pytest-xdist requests coveralls codacy-coverage
- pip install --ignore-installed pytest>=4.4.0
- pytest --version

script:
- python setup.py test -a '--cov-config .coveragerc --cov=json_to_models -m "not no_expected" test/'
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ def run_tests(self):
},
install_requires=required,
cmdclass={"test": PyTest},
tests_require=["pytest", "pytest-xdist", "requests", "attrs"],
tests_require=["pytest>=4.4.0", "pytest-xdist", "requests", "attrs"],
data_files=[('', ['pytest.ini', '.coveragerc', 'LICENSE'])]
)