Skip to content

Commit

Permalink
Merge pull request #100 from WillJRoper/astropy6_fix
Browse files Browse the repository at this point in the history
Fixes the conflict with Astropy v6.0.0 
Thank you very much for this!
  • Loading branch information
HeloiseS authored Apr 12, 2024
2 parents bc9553b + fad524d commit 3266615
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 61 deletions.
12 changes: 3 additions & 9 deletions hoki/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst

# Packages may add whatever they like to this file, but
# should keep this content at the top.
# ----------------------------------------------------------------------------
from ._astropy_init import * # noqa
# ----------------------------------------------------------------------------

# Enforce Python version check during package import.
# This is the same check as the one at the top of setup.py
import sys
Expand All @@ -22,6 +16,6 @@ class UnsupportedPythonError(Exception):


if LooseVersion(sys.version) < LooseVersion(__minimum_python_version__):
raise UnsupportedPythonError("hoki does not support Python < {}"
.format(__minimum_python_version__))

raise UnsupportedPythonError(
"hoki does not support Python < {}".format(__minimum_python_version__)
)
52 changes: 0 additions & 52 deletions hoki/_astropy_init.py

This file was deleted.

0 comments on commit 3266615

Please sign in to comment.