blob: 638f7e84bb0b5720a11d139c1da7cabc0acb949c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
diff -ur astropy-1.0/astropy/tests/helper.py astropy-1.0.pytest/astropy/tests/helper.py
--- astropy-1.0/astropy/tests/helper.py 2015-02-18 22:45:32.000000000 +0100
+++ astropy-1.0.pytest/astropy/tests/helper.py 2015-02-19 16:20:28.201778929 +0100
@@ -35,8 +35,8 @@
AstropyDeprecationWarning,
AstropyPendingDeprecationWarning)
from ..config import configuration
-
-if os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
+# Modified by Fedora package
+if True or os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
import pytest
else:
|
