Skip to content

Commit 9ee8c61

Browse files
committed
MAINT: adding astropy 7.1.1 compatibility to the tests
1 parent 660eb7d commit 9ee8c61

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

astroquery/esa/euclid/tests/test_euclidtap.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
from astroquery.esa.euclid.core import EuclidClass
2626
from astroquery.esa.euclid.core import conf
27+
from astroquery.utils.commons import ASTROPY_LT_7_1_1
2728
from astroquery.utils.tap.conn.tests.DummyConnHandler import DummyConnHandler
2829
from astroquery.utils.tap.conn.tests.DummyResponse import DummyResponse
2930
from astroquery.utils.tap.core import TapPlus
@@ -116,7 +117,10 @@ def column_attrs():
116117
}
117118
columns = {k: Column(name=k, description=k, dtype=v) for k, v in dtypes.items()}
118119

119-
columns["source_id"].meta = {"_votable_string_dtype": "char"}
120+
if ASTROPY_LT_7_1_1:
121+
columns["source_id"].meta = {"_votable_string_dtype": "char"}
122+
else:
123+
columns["source_id"].meta = {"_votable_string_dtype": "char", "_votable_arraysize": "*"}
120124
return columns
121125

122126

astroquery/gaia/tests/test_gaiatap.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
from astroquery.gaia import conf
3333
from astroquery.gaia.core import GaiaClass
34+
from astroquery.utils.commons import ASTROPY_LT_7_1_1
3435
from astroquery.utils.tap.conn.tests.DummyConnHandler import DummyConnHandler
3536
from astroquery.utils.tap.conn.tests.DummyResponse import DummyResponse
3637
from astroquery.utils.tap.core import TapPlus
@@ -112,9 +113,14 @@ def column_attrs():
112113
"source_id": object,
113114
"table1_oid": np.int32
114115
}
116+
115117
columns = {k: Column(name=k, description=k, dtype=v) for k, v in dtypes.items()}
116118

117-
columns["source_id"].meta = {"_votable_string_dtype": "char"}
119+
if ASTROPY_LT_7_1_1:
120+
columns["source_id"].meta = {"_votable_string_dtype": "char"}
121+
else:
122+
columns["source_id"].meta = {"_votable_string_dtype": "char", "_votable_arraysize": "*"}
123+
118124
return columns
119125

120126

astroquery/utils/commons.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@
3131
'validate_email',
3232
'ASTROPY_LT_5_1',
3333
'ASTROPY_LT_5_3',
34-
'ASTROPY_LT_6_0']
34+
'ASTROPY_LT_6_0',
35+
'ASTROPY_LT_7_1_1']
3536

3637
ASTROPY_LT_5_1 = not minversion('astropy', '5.1')
3738
ASTROPY_LT_5_3 = not minversion('astropy', '5.3')
3839
ASTROPY_LT_6_0 = not minversion('astropy', '6.0')
40+
ASTROPY_LT_7_1_1 = not minversion('astropy', '7.1.1')
3941

4042

4143
def parse_coordinates(coordinates):

0 commit comments

Comments
 (0)