From 4df5b13e668516c10fd504eb01acc6b309fce383 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 10 Dec 2018 10:10:01 +0000 Subject: [PATCH] Update pytest requirements --- Pipfile | 11 ++++++----- requirements/pytest.txt | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Pipfile b/Pipfile index 22ca7ca4ccd..ea33b11c9e1 100644 --- a/Pipfile +++ b/Pipfile @@ -20,17 +20,18 @@ boto = ">=2.32.1" boto3 = ">=1.2.1" moto = ">=0.3.6" SaltPyLint = ">=v2017.3.6" -pytest = ">=3.5.0" +pytest = ">=4.0.1" +pytest-cov = "*" +pytest-salt = "==2018.12.8" +pytest-timeout = ">=1.3.3" +pytest-tempdir = ">=2018.8.11" +pytest-helpers-namespace = ">=2017.11.11" [packages.futures] # Required by Tornado to handle threads stuff. version = ">=2.0" markers = "python_version < '3.0'" -[dev-packages.pytest-salt] -git = "git://github.com/saltstack/pytest-salt.git" -ref = "master" - [dev-packages.httpretty] # httpretty Needs to be here for now even though it's a dependency of boto. # A pip install on a fresh system will decide to target httpretty 0.8.10 to diff --git a/requirements/pytest.txt b/requirements/pytest.txt index 5e0c3ad7fca..c27d5cb2ea7 100644 --- a/requirements/pytest.txt +++ b/requirements/pytest.txt @@ -1,7 +1,7 @@ # PyTest pytest >= 4.0.1 pytest-cov -pytest-salt >= 2018.12.8 +pytest-salt == 2018.12.8 pytest-timeout >= 1.3.3 pytest-tempdir >= 2018.8.11 pytest-helpers-namespace >= 2017.11.11