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.

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

DM-16296: Fixes for new flake8 #101

Merged
merged 2 commits into from
Oct 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion python/lsst/daf/butler/core/datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def name(self):

@property
def dataUnits(self):
"""A `frozenset` of `DataUnit` names that defines the `DatasetRef`\ s
r"""A `frozenset` of `DataUnit` names that defines the `DatasetRef`\ s
corresponding to this `DatasetType`.
"""
return self._dataUnits
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/daf/butler/core/quantum.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ def run(self):

@property
def predictedInputs(self):
"""A `dict` of input datasets that were expected to be used,
r"""A `dict` of input datasets that were expected to be used,
with `DatasetType` names as keys and a list of `DatasetRef` instances
as values.

Input `Datasets` that have already been stored may be
`DatasetRef`\s, and in many contexts may be guaranteed to be.
`DatasetRef`\ s, and in many contexts may be guaranteed to be.
Read-only; update via `Quantum.addPredictedInput()`.
"""
return self._predictedInputs
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/daf/butler/gen2convert/walker.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def readCalibInfo(self, calibPath=None):
queryList = []
# This query only includes calibration types that are known at this time
for tableRow in c.execute(
"SELECT name FROM sqlite_master WHERE type='table' AND name IN " +
"SELECT name FROM sqlite_master WHERE type='table' AND name IN "
"('bias', 'dark', 'defect', 'flat', 'fringe', 'sky')"):
queryList.append("SELECT '%s' AS type,filter,ccd,calibDate,validStart,validEnd FROM %s" %
(tableRow["name"], tableRow["name"]))
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[flake8]
max-line-length = 110
ignore = E133, E226, E228, N802, N803, N806
ignore = E133, E226, E228, N802, N803, N806, W504
exclude = __init__.py

[tool:pytest]
addopts = --flake8
flake8-ignore = E133 E226 E228 N802 N803 N806
flake8-ignore = E133 E226 E228 N802 N803 N806 W504
2 changes: 1 addition & 1 deletion tests/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ def testEscape(self):
self.assertEqual(c[r".a.foo\.bar"], 1)
self.assertEqual(c[":a:foo.bar"], 1)
self.assertEqual(c[".b😂c.bar_baz"], 2)
self.assertEqual(c["😂b\😂c😂bar_baz"], 2)
self.assertEqual(c[r"😂b\😂c😂bar_baz"], 2)
self.assertEqual(c[r"\a\foo.bar"], 1)
self.assertEqual(c["\ra\rfoo.bar"], 1)
with self.assertRaises(ValueError):
Expand Down