jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tox/setup.py: remove _PYTEST_SETUP_SKIP_PLUGGY_DEP=1 hack

This commit is contained in:
Daniel Hahler 2019-03-03 13:15:13 +01:00
parent 2970c1df24
commit c4aa57bc4c
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
setup.py
View File

@ -1,5 +1,3 @@
import os
from setuptools import setup from setuptools import setup
# TODO: if py gets upgrade to >=1.6, # TODO: if py gets upgrade to >=1.6,
@ -15,15 +13,10 @@ INSTALL_REQUIRES = [
'funcsigs;python_version<"3.0"', 'funcsigs;python_version<"3.0"',
'pathlib2>=2.2.0;python_version<"3.6"', 'pathlib2>=2.2.0;python_version<"3.6"',
'colorama;sys_platform=="win32"', 'colorama;sys_platform=="win32"',
"pluggy>=0.7",
] ]
# if _PYTEST_SETUP_SKIP_PLUGGY_DEP is set, skip installing pluggy;
# used by tox.ini to test with pluggy master
if "_PYTEST_SETUP_SKIP_PLUGGY_DEP" not in os.environ:
INSTALL_REQUIRES.append("pluggy>=0.7")
def main(): def main():
setup( setup(
use_scm_version={"write_to": "src/_pytest/_version.py"}, use_scm_version={"write_to": "src/_pytest/_version.py"},

3
tox.ini
View File

@ -42,9 +42,6 @@ setenv =
pexpect: _PYTEST_TOX_PLATFORM=linux|darwin pexpect: _PYTEST_TOX_PLATFORM=linux|darwin
pexpect: _PYTEST_TOX_POSARGS_PEXPECT=testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py pexpect: _PYTEST_TOX_POSARGS_PEXPECT=testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py
# TODO: remove?!
pluggymaster: _PYTEST_SETUP_SKIP_PLUGGY_DEP=1
xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto
extras = testing extras = testing
deps = deps =