Merge pull request #5504 from pradyunsg/ci/remove-pinned-versions

Remove pytest version constraint for CI
This commit is contained in:
Pradyun Gedam 2018-06-14 20:45:46 +05:30 committed by GitHub
commit 4fac098951
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions

View File

@ -1,14 +1,13 @@
freezegun
mock
pretend
pytest<=3.2.5
pytest-catchlog
pytest
pytest-cov
pytest-rerunfailures
pytest-timeout
pytest-xdist
scripttest
https://github.com/pypa/virtualenv/archive/master.zip#egg=virtualenv
# Revert the following hack after a PyYAML is released supporting Py3.7
pyyaml; python_version < "3.7"
https://github.com/yaml/pyyaml/archive/master.zip#egg=pyyaml ; python_version >= "3.7"
mock
scripttest>=1.3
https://github.com/pypa/virtualenv/archive/master.zip#egg=virtualenv

View File

@ -1,3 +1,5 @@
import logging
import pytest
from pip._internal.commands.search import (
@ -158,7 +160,10 @@ def test_search_print_results_should_contain_latest_versions(caplog):
'versions': ['2.0.1', '2.0.3']
}
]
print_results(hits)
with caplog.at_level(logging.INFO):
print_results(hits)
log_messages = sorted([r.getMessage() for r in caplog.records])
assert log_messages[0].startswith('testlib1 (1.0.5)')
assert log_messages[1].startswith('testlib2 (2.0.3)')

View File

@ -1,6 +1,7 @@
from __future__ import with_statement
import json
import logging
import os
import sys
import textwrap
@ -410,6 +411,9 @@ def test_uninstallpathset_no_paths(caplog):
"""
from pip._internal.req.req_uninstall import UninstallPathSet
from pkg_resources import get_distribution
caplog.set_level(logging.INFO)
test_dist = get_distribution('pip')
uninstall_set = UninstallPathSet(test_dist)
uninstall_set.remove() # with no files added to set