diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2016-12-11 15:20:32 -0500 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-12-11 15:32:28 -0500 |
commit | 3dd506f01d48b98aeea9bdbca0105d4c7d8ad538 (patch) | |
tree | 07b3933bd8651b7ac184736f2a3463a483e4e7b5 /conftest.py | |
parent | 2268fb9887cfea2e28e156bd2c8314132261402f (diff) | |
parent | 5c9406987aacf17d9c004aa1456797e0044306e5 (diff) | |
download | python-setuptools-git-develop-nspkg-always.tar.gz |
Merge branch 'master' into develop-nspkg-alwaysdevelop-nspkg-always
Diffstat (limited to 'conftest.py')
-rw-r--r-- | conftest.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/conftest.py b/conftest.py index 47a5d888..3cccfe1a 100644 --- a/conftest.py +++ b/conftest.py @@ -1,8 +1,8 @@ -import pytest - pytest_plugins = 'setuptools.tests.fixtures' -def pytest_addoption(parser): - parser.addoption("--package_name", action="append", default=[], - help="list of package_name to pass to test functions") +def pytest_addoption(parser): + parser.addoption( + "--package_name", action="append", default=[], + help="list of package_name to pass to test functions", + ) |