Skip to content

Commit

Permalink
Merge pull request #581 from bmorris3/astropy-v6-compat
Browse files Browse the repository at this point in the history
Compatibility with astropy v6.0
  • Loading branch information
bmorris3 committed Apr 5, 2024
2 parents 5e4ac2c + df7f1d3 commit e791471
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 42 deletions.
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
0.10 (unreleased)
-----------------

- Fix compatibility with astropy v6.0.

0.9.1 (2023-09-20)
------------------
Expand Down
29 changes: 13 additions & 16 deletions astroplan/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,18 @@
* Docs: https://astroplan.readthedocs.io/
"""

# Affiliated packages may add whatever they like to this file, but
# should keep this content at the top.
# ----------------------------------------------------------------------------
from ._astropy_init import *
# ----------------------------------------------------------------------------
try:
from .version import version as __version__
except ImportError:
__version__ = ''

# For egg_info test builds to pass, put package imports here.
if not _ASTROPY_SETUP_:
from .utils import *
from .observer import *
from .target import *
from .exceptions import *
from .moon import *
from .constraints import *
from .scheduling import *
from .periodic import *
from .utils import *
from .observer import *
from .target import *
from .exceptions import *
from .moon import *
from .constraints import *
from .scheduling import *
from .periodic import *

download_IERS_A()
download_IERS_A()
25 changes: 0 additions & 25 deletions astroplan/_astropy_init.py

This file was deleted.

2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ packages = find:
python_requires = >=3.7
setup_requires = setuptools_scm
install_requires =
numpy>=1.17
numpy<2
astropy>=4
pytz
six
Expand Down

0 comments on commit e791471

Please sign in to comment.