Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-16296: flake8 fixes #103

Merged
merged 2 commits into from
Oct 24, 2018
Merged

DM-16296: flake8 fixes #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ae9546
Ignore W504
timj Oct 24, 2018
ae454de
Flake8 fixes: escapes and + string continutions
timj Oct 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions python/lsst/meas/astrom/astrometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ class AstrometryConfig(RefMatchConfig):
)
forceKnownWcs = pexConfig.Field(
dtype=bool,
doc="If True then load reference objects and match sources but do not fit a WCS; " +
doc="If True then load reference objects and match sources but do not fit a WCS; "
" this simply controls whether 'run' calls 'solve' or 'loadAndMatch'",
default=False,
)
maxIter = pexConfig.RangeField(
doc="maximum number of iterations of match sources and fit WCS" +
doc="maximum number of iterations of match sources and fit WCS"
"ignored if not fitting a WCS",
dtype=int,
default=3,
Expand All @@ -66,7 +66,7 @@ class AstrometryConfig(RefMatchConfig):


class AstrometryTask(RefMatchTask):
"""!Match an input source catalog with objects from a reference catalog and solve for the WCS
r"""!Match an input source catalog with objects from a reference catalog and solve for the WCS

@anchor AstrometryTask_

Expand Down Expand Up @@ -140,7 +140,7 @@ def DebugInfo(name):
_DefaultName = "astrometricSolver"

def __init__(self, refObjLoader, schema=None, **kwargs):
"""!Construct an AstrometryTask
r"""!Construct an AstrometryTask

@param[in] refObjLoader A reference object loader object
@param[in] schema ignored; available for compatibility with an older astrometry task
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/meas/astrom/catalogStarSelector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def __call__(self, source):

@pexConfig.registerConfigurable("catalog", sourceSelectorRegistry)
class CatalogStarSelectorTask:
"""!Select stars based on a reference catalog
r"""!Select stars based on a reference catalog

@anchor CatalogStarSelectorTask_

Expand Down
2 changes: 1 addition & 1 deletion python/lsst/meas/astrom/directMatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class DirectMatchConfig(DirectMatchConfigWithoutLoader):


class DirectMatchTask(Task):
"""!Simple matching of a source catalog to a reference catalog
r"""!Simple matching of a source catalog to a reference catalog

@anchor DirectMatchTask_

Expand Down
8 changes: 4 additions & 4 deletions python/lsst/meas/astrom/fitSipDistortion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ class FitSipDistortionConfig(lsst.pex.config.Config):
default=1
)
maxScatterArcsec = lsst.pex.config.RangeField(
doc="Maximum median scatter of a WCS fit beyond which the fit fails (arcsec); " +
doc="Maximum median scatter of a WCS fit beyond which the fit fails (arcsec); "
"be generous, as this is only intended to catch catastrophic failures",
dtype=float,
default=10,
min=0,
)
refUncertainty = lsst.pex.config.Field(
doc="RMS uncertainty in reference catalog positions, in pixels. Will be added " +
doc="RMS uncertainty in reference catalog positions, in pixels. Will be added "
"in quadrature with measured uncertainties in the fit.",
dtype=float,
default=0.25,
Expand All @@ -68,8 +68,8 @@ class FitSipDistortionConfig(lsst.pex.config.Config):
default=100,
)
gridBorder = lsst.pex.config.Field(
doc="When setting the gird region, how much to extend the image " +
"bounding box (in pixels) before transforming it to intermediate " +
doc="When setting the gird region, how much to extend the image "
"bounding box (in pixels) before transforming it to intermediate "
"world coordinates using the initial WCS.",
dtype=float,
default=50.0,
Expand Down
6 changes: 3 additions & 3 deletions python/lsst/meas/astrom/fitTanSipWcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class FitTanSipWcsConfig(pexConfig.Config):
min=0,
)
numIter = pexConfig.RangeField(
doc="number of iterations of fitter (which fits X and Y separately, and so benefits from " +
doc="number of iterations of fitter (which fits X and Y separately, and so benefits from "
"a few iterations",
dtype=int,
default=3,
Expand All @@ -41,7 +41,7 @@ class FitTanSipWcsConfig(pexConfig.Config):
min=0.0,
)
maxScatterArcsec = pexConfig.RangeField(
doc="maximum median scatter of a WCS fit beyond which the fit fails (arcsec); " +
doc="maximum median scatter of a WCS fit beyond which the fit fails (arcsec); "
"be generous, as this is only intended to catch catastrophic failures",
dtype=float,
default=10,
Expand All @@ -58,7 +58,7 @@ class FitTanSipWcsConfig(pexConfig.Config):


class FitTanSipWcsTask(pipeBase.Task):
"""!Fit a TAN-SIP WCS given a list of reference object/source matches
r"""!Fit a TAN-SIP WCS given a list of reference object/source matches

@anchor FitTanSipWcsTask_

Expand Down
2 changes: 1 addition & 1 deletion python/lsst/meas/astrom/matchOptimisticB/matchOptimisticBContinued.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def setDefaults(self):


class MatchOptimisticBTask(pipeBase.Task):
"""!Match sources to reference objects
r"""!Match sources to reference objects

@anchor MatchOptimisticBTask_

Expand Down
2 changes: 1 addition & 1 deletion python/lsst/meas/astrom/matchPessimisticB.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def validate(self):


class MatchPessimisticBTask(pipeBase.Task):
"""!Match sources to reference objects
r"""!Match sources to reference objects

@anchor MatchPessimisticBTask_

Expand Down
4 changes: 2 additions & 2 deletions python/lsst/meas/astrom/ref_match.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class RefMatchConfig(pexConfig.Config):
)
matchDistanceSigma = pexConfig.RangeField(
doc="the maximum match distance is set to "
" mean_match_distance + matchDistanceSigma*std_dev_match_distance; " +
" mean_match_distance + matchDistanceSigma*std_dev_match_distance; "
"ignored if not fitting a WCS",
dtype=float,
default=2,
Expand Down Expand Up @@ -71,7 +71,7 @@ class RefMatchTask(pipeBase.Task):
_DefaultName = "calibrationBaseClass"

def __init__(self, refObjLoader, schema=None, **kwargs):
"""!Construct a RefMatchTask
r"""!Construct a RefMatchTask

@param[in] refObjLoader A reference object loader object
@param[in] schema ignored; available for compatibility with an older astrometry task
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[flake8]
max-line-length = 110
ignore = E133, E226, E228, N802, N803, N806, E266
ignore = E133, E226, E228, N802, N803, N806, E266, W504
# TODO: remove E266 when Task documentation is converted to rst in DM-14207.
exclude =
__init__.py,
tests/data/*

[tool:pytest]
addopts = --flake8
flake8-ignore = E133 E226 E228 N802 N803 N806
flake8-ignore = E133 E226 E228 N802 N803 N806 W504
# TODO: remove E266 lines when Task documentation is converted to rst in DM-14207.
tests/data/*
astrometry.py E266
Expand Down