Blame python-astropy-system-pytest.patch
|
Sergio Pascual |
cdfc2ae |
diff -ur astropy-0.3rc1/astropy/tests/helper.py astropy-0.3rc1.pytest/astropy/tests/helper.py
|
|
Sergio Pascual |
cdfc2ae |
--- astropy-0.3rc1/astropy/tests/helper.py 2013-11-19 12:58:43.970955591 +0100
|
|
Sergio Pascual |
cdfc2ae |
+++ astropy-0.3rc1.pytest/astropy/tests/helper.py 2013-11-19 13:00:09.510620451 +0100
|
|
Sergio Pascual |
cdfc2ae |
@@ -34,7 +34,7 @@
|
|
Sergio Pascual |
cdfc2ae |
|
|
Sergio Pascual |
cdfc2ae |
from .. import test
|
|
Sergio Pascual |
cdfc2ae |
|
|
Sergio Pascual |
cdfc2ae |
-if os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
|
|
Sergio Pascual |
cdfc2ae |
+if True: # Use system pytest always, modified in the Fedora package
|
|
Sergio Pascual |
cdfc2ae |
import pytest
|
|
Sergio Pascual |
cdfc2ae |
|
|
Sergio Pascual |
cdfc2ae |
else:
|