summaryrefslogtreecommitdiff
path: root/dev-python/astropy/files/astropy-1.0.4-system-pytest.patch
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, 0 insertions, 14 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
deleted file mode 100644
index 638f7e84bb0..00000000000
--- a/dev-python/astropy/files/astropy-1.0.4-system-pytest.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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: