blob: 0b1c7973b59bca87f70f10b0ca376e876c3a4f11 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
diff -ruN astroquery-0.3.9.orig/astroquery/conftest.py astroquery-0.3.9/astroquery/conftest.py
--- astroquery-0.3.9.orig/astroquery/conftest.py 2018-11-27 14:51:16.000000000 +0100
+++ astroquery-0.3.9/astroquery/conftest.py 2019-07-23 18:19:17.000000000 +0200
@@ -5,15 +5,20 @@
# by importing them here in conftest.py they are discoverable by py.test
# no matter how it is invoked within the source tree.
-from astropy.tests.pytest_plugins import (PYTEST_HEADER_MODULES,
- enable_deprecations_as_exceptions,
- TESTED_VERSIONS)
+from astropy.version import version as astropy_version
-try:
- packagename = os.path.basename(os.path.dirname(__file__))
- TESTED_VERSIONS[packagename] = version.version
-except NameError:
- pass
+if astropy_version < '3.0':
+ # With older versions of Astropy, we actually need to import the pytest
+ # plugins themselves in order to make them discoverable by pytest.
+ from astropy.tests.pytest_plugins import *
+else:
+ # As of Astropy 3.0, the pytest plugins provided by Astropy are
+ # automatically made available when Astropy is installed. This means it's
+ # not necessary to import them here, but we still need to import global
+ # variables that are used for configuration.
+ from astropy.tests.plugins.display import PYTEST_HEADER_MODULES, TESTED_VERSIONS
+
+from astropy.tests.helper import enable_deprecations_as_exceptions
# Add astropy to test header information and remove unused packages.
# Pytest header customisation was introduced in astropy 1.0.
@@ -36,12 +41,17 @@
# The warnings_to_ignore_by_pyver parameter was added in astropy 2.0
enable_deprecations_as_exceptions(modules_to_ignore_on_import=['requests'])
+# add '_testrun' to the version name so that the user-agent indicates that
+# it's being run in a test
+from . import version
+version.version += '_testrun'
+
+
# This is to figure out the affiliated package version, rather than
# using Astropy's
-try:
- from .version import version
-except ImportError:
- version = 'dev'
+from .version import version, astropy_helpers_version
+
packagename = os.path.basename(os.path.dirname(__file__))
TESTED_VERSIONS[packagename] = version
+TESTED_VERSIONS['astropy_helpers'] = astropy_helpers_version
|