Skip to content

Commit

Permalink
Fix failure related to astropy PR 16673
Browse files Browse the repository at this point in the history
  • Loading branch information
mcara committed Sep 10, 2024
1 parent 2b2bb77 commit 337a003
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
16 changes: 10 additions & 6 deletions tweakwcs/linearfit.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,29 @@
"""
import logging
import numbers
from packaging.version import Version

import numpy as np
import astropy
from astropy.modeling.fitting import LevMarLSQFitter
import numpy as np
from packaging.version import Version

if Version(astropy.__version__) >= Version('5.1'):
from astropy.modeling.fitting import fitter_to_model_params
from astropy.modeling.fitting import LMLSQFitter
else:
from astropy.modeling.fitting import (_fitter_to_model_params as
fitter_to_model_params)
from astropy.modeling.fitting import LevMarLSQFitter as LMLSQFitter

Check warning on line 24 in tweakwcs/linearfit.py

View check run for this annotation

Codecov / codecov/patch

tweakwcs/linearfit.py#L24

Added line #L24 was not covered by tests

from . linalg import inv
from . import __version__ # noqa: F401

__author__ = 'Mihai Cara, Warren Hack'

__all__ = [
'iter_linear_fit', 'build_fit_matrix', 'SUPPORTED_FITGEOM_MODES',
'_LevMarLSQFitter2x2'
'iter_linear_fit',
'build_fit_matrix',
'SUPPORTED_FITGEOM_MODES',
'_LevMarLSQFitter2x2',
]

# Supported fitgeom modes and corresponding minobj
Expand Down Expand Up @@ -846,7 +850,7 @@ def build_fit_matrix(rot, scale=1):
return matrix


class _LevMarLSQFitter2x2(LevMarLSQFitter):
class _LevMarLSQFitter2x2(LMLSQFitter):
""" Performs fits of 2D vector-models to 2D reference points. """
def objective_function(self, fps, *args):
model, weights, inputs, meas = args
Expand Down
5 changes: 3 additions & 2 deletions tweakwcs/tests/test_linearfit.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
from itertools import product
import math
import sys
import pytest
import numpy as np

from astropy.modeling.models import Shift, Rotation2D
import numpy as np
import pytest
from tweakwcs import linearfit, linalg


Expand Down

0 comments on commit 337a003

Please sign in to comment.