mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-08 01:07:30 -08:00
9bfc3cd91f
import patches from fedora for unbundling Closes gentoo/gentoo#10 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=556884 Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher <jlec@gentoo.org>
15 lines
650 B
Diff
15 lines
650 B
Diff
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:
|