Skip to content

Commit

Permalink
Merge pull request #482 from WilliamJamieson/bugfix/astropy_develop_f…
Browse files Browse the repository at this point in the history
…ixes

Fixes for failures when using astropy develop.
  • Loading branch information
shanosborne committed Jan 11, 2022
2 parents 2640d89 + 911b732 commit 1377ad5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion poppy/tests/test_multiprocessing.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import astropy.io.fits as fits
import sys
from distutils.version import LooseVersion
from astropy.tests.helper import remote_data

try:
import pytest
Expand Down
2 changes: 1 addition & 1 deletion poppy/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -1340,7 +1340,7 @@ def __init__(self, func=None, **kwargs):
self.decorator_kwargs = kwargs

def __call__(self, wrapped_function):
from astropy.utils.decorators import wraps
from functools import wraps
from astropy.units import UnitsError, add_enabled_equivalencies, Quantity
import inspect

Expand Down

0 comments on commit 1377ad5

Please sign in to comment.