Merge pull request #7 from ogajduse/date-deps-n-fix-import

Python and pytest compatibility fixes

Author: ogajduse

pytest_fixture_tools/plugin.py

@@ -4,7 +4,7 @@
 import os
 import errno
 
-from _pytest.python import getlocation
+from _pytest.compat import getlocation
 from collections import defaultdict
 
 import pydot

requirements-testing.txt

@@ -1,3 +1,2 @@
-pytest-pep8
 pytest-cov
 pytest-cache

setup.py

@@ -52,7 +52,7 @@ def run_tests(self):
     ] + [('Programming Language :: Python :: %s' % x) for x in '2.6 2.7 3.0 3.1 3.2 3.3'.split()],
     cmdclass={'test': ToxTestCommand},
     install_requires=[
-        'pytest', 'pydot'
+        'pytest', 'pydot', 'py'
     ],
     # the following makes a plugin available to py.test
     entry_points={

tests/test_fixtrue_graph.py

@@ -22,7 +22,7 @@ def arg1(request):
     sub1.join("test_in_sub1.py").write("def test_1(arg1): pass")
     sub2.join("test_in_sub2.py").write("def test_2(arg1): pass")
 
-    result = testdir.runpytest_subprocess('--fixture-graph', '-s')
+    result = testdir.runpytest_subprocess('--fixture-graph', '-s', '--fixture-graph-output-type', 'dot')
 
     result.stdout.fnmatch_lines("created artifacts/fixture-graph-sub1-test_in_sub1.py__test_1.dot.")
     result.stdout.fnmatch_lines('created artifacts/fixture-graph-sub1-sub2-test_in_sub2.py__test_2.dot.')

tox.ini

@@ -18,5 +18,4 @@ deps =
     hg+https://bitbucket.org/hpk42/pytest
 
 [pytest]
-pep8maxlinelength=120
-addopts = pytest_fixture_tools tests --pep8
+addopts = pytest_fixture_tools tests