Skip to content

Commit 24bfce1

Browse files
authored
Drop support for astropy 3 (#353)
1 parent 4a852cb commit 24bfce1

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ packages = find:
1717
python_requires = >=3.6
1818
setup_requires = setuptools_scm
1919
install_requires =
20-
astropy
20+
astropy>=4
2121
networkx
2222
numpy
2323
scipy

skypy/galaxy/_spectrum_loaders.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import numpy as np
44
import astropy.utils.data
55
import astropy.table
6-
from astropy import __version__ as astropy_version
76
from astropy import units
87

98
import os
@@ -20,10 +19,7 @@
2019

2120
def download_file(url, cache=True):
2221
'''download_file with some specific settings'''
23-
if astropy_version.startswith('3.'): # pragma: no cover
24-
extra_kwargs = {}
25-
else:
26-
extra_kwargs = {'pkgname': 'skypy'}
22+
extra_kwargs = {'pkgname': 'skypy'}
2723
return astropy.utils.data.download_file(
2824
url, cache=cache, show_progress=False, **extra_kwargs)
2925

skypy/pipeline/_pipeline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def execute(self, parameters={}):
187187
if len(names) > 1:
188188
# Multi-column assignment
189189
t = Table(self.get_value(settings), names=names)
190-
self.state[table].add_columns(t.columns.values())
190+
self.state[table].add_columns(t.columns)
191191
else:
192192
# Single column assignment
193193
self.state[table][column] = self.get_value(settings)

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ deps =
6868
dev: :NIGHTLY:scipy
6969
dev: git+https://github.com/astropy/astropy.git#egg=astropy
7070

71-
latest: astropy==4.0.*
71+
latest: astropy==4.1.*
7272
latest: numpy==1.19.*
7373
latest: scipy==1.5.*
7474

75-
oldest: astropy==3.2.*
75+
oldest: astropy==4.0.*
7676
oldest: numpy==1.16.*
7777
oldest: scipy==1.2.*
7878

0 commit comments

Comments
 (0)