From 4b5de795b492b5beb15385b20fe289851c1b2570 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 7 Jun 2017 09:55:28 -0300 Subject: [PATCH] Add py35 and py36 to CI and drop support for pytest<2.8 Also drop requirement on pytest_cache --- pytest_xprocess.py | 3 +-- setup.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pytest_xprocess.py b/pytest_xprocess.py index e8d731c..c4edbdd 100644 --- a/pytest_xprocess.py +++ b/pytest_xprocess.py @@ -18,8 +18,7 @@ def pytest_addoption(parser): def getrootdir(config): - from pytest_cache import getrootdir - return getrootdir(config, ".xprocess").ensure(dir=1) + return config.rootdir.join(".xprocess").ensure(dir=1) def pytest_cmdline_main(config): diff --git a/setup.py b/setup.py index 1992785..b3dd88c 100755 --- a/setup.py +++ b/setup.py @@ -12,5 +12,5 @@ if __name__ == "__main__": url='https://github.com/pytest-dev/pytest-xprocess/', py_modules=['pytest_xprocess', 'xprocess'], entry_points={'pytest11': ['xprocess = pytest_xprocess']}, - install_requires=['pytest-cache', 'pytest>=2.3.5', 'psutil'], + install_requires=['pytest>=2.8', 'psutil'], ) -- 2.24.0