p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4877 from blueyed/pluggymaster 

tox: generic pluggymaster factor, remove env hack
This commit is contained in:
Bruno Oliveira 2019-03-03 09:52:54 -03:00 committed by GitHub
parent ed68fcf665 c4aa57bc4c
commit f3f6cb2093
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 20 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"},

13
tox.ini
View File

@ -47,6 +47,7 @@ extras = testing
deps = deps =
numpy: numpy numpy: numpy
pexpect: pexpect pexpect: pexpect
pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
xdist: pytest-xdist>=1.13 xdist: pytest-xdist>=1.13
{env:_PYTEST_TOX_EXTRA_DEP:} {env:_PYTEST_TOX_EXTRA_DEP:}
platform = {env:_PYTEST_TOX_PLATFORM:.*} platform = {env:_PYTEST_TOX_PLATFORM:.*}
@ -78,18 +79,6 @@ commands =
deps = {[testenv:py27-trial]deps} deps = {[testenv:py27-trial]deps}
commands = {[testenv:py27-trial]commands} commands = {[testenv:py27-trial]commands}
[testenv:py27-pluggymaster]
setenv=
{[testenv]setenv}
_PYTEST_SETUP_SKIP_PLUGGY_DEP=1
deps =
{[testenv]deps}
git+https://github.com/pytest-dev/pluggy.git@master
[testenv:py37-pluggymaster]
setenv = {[testenv:py27-pluggymaster]setenv}
deps = {[testenv:py27-pluggymaster]deps}
[testenv:docs] [testenv:docs]
basepython = python3 basepython = python3
skipsdist = True skipsdist = True