summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/astropy/files/astropy-1.0.4-system-pytest.patch')
-rw-r--r--dev-python/astropy/files/astropy-1.0.4-system-pytest.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/dev-python/astropy/files/astropy-1.0.4-system-pytest.patch b/dev-python/astropy/files/astropy-1.0.4-system-pytest.patch
new file mode 100644
index 000000000000..638f7e84bb0b
--- /dev/null
+++ b/dev-python/astropy/files/astropy-1.0.4-system-pytest.patch
@@ -0,0 +1,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: