From a90d593b630c4b72a709299f029ae81e37177077 Mon Sep 17 00:00:00 2001 From: Ruth Comer Date: Tue, 14 Nov 2023 16:55:31 +0000 Subject: [PATCH] Manually address E501 and B018 --- cf_units/__init__.py | 5 +++-- .../_udunits2_parser/parser/udunits2Lexer.py | 3 ++- .../_udunits2_parser/parser/udunits2Parser.py | 2 +- .../parser/udunits2ParserVisitor.py | 5 +++-- cf_units/tests/integration/parse/test_parse.py | 4 ++-- .../tests/integration/test__Unit_num2date.py | 18 ++++++++++++------ 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/cf_units/__init__.py b/cf_units/__init__.py index 2b1a25eb..bb639962 100644 --- a/cf_units/__init__.py +++ b/cf_units/__init__.py @@ -191,7 +191,8 @@ def suppress_errors(): except _ud.UdunitsError as e: error_msg = ': "%s"' % e.error_msg() if e.errnum else "" raise OSError( - f"[{e.status_msg()}] Failed to open UDUNITS-2 XML unit database{error_msg}" + f"[{e.status_msg()}] " + f"Failed to open UDUNITS-2 XML unit database{error_msg}" ) @@ -1670,7 +1671,7 @@ def change_calendar(self, calendar): >>> u.change_calendar('standard') Unit('days since 1499-12-23T00:00:00', calendar='standard') - """ + """ # NOQA E501 if not self.is_time_reference(): raise ValueError("unit is not a time reference") diff --git a/cf_units/_udunits2_parser/parser/udunits2Lexer.py b/cf_units/_udunits2_parser/parser/udunits2Lexer.py index 3d4c33df..d8742bdb 100644 --- a/cf_units/_udunits2_parser/parser/udunits2Lexer.py +++ b/cf_units/_udunits2_parser/parser/udunits2Lexer.py @@ -1,4 +1,5 @@ -# Generated from /home/ruth/git_stuff/cf-units/cf_units/_udunits2_parser/parser/udunits2Lexer.g4 by ANTLR 4.11.1 +# Generated from cf_units/_udunits2_parser/parser/udunits2Lexer.g4 by +# ANTLR 4.11.1 import sys from antlr4 import * diff --git a/cf_units/_udunits2_parser/parser/udunits2Parser.py b/cf_units/_udunits2_parser/parser/udunits2Parser.py index bd197034..5cff5fe4 100644 --- a/cf_units/_udunits2_parser/parser/udunits2Parser.py +++ b/cf_units/_udunits2_parser/parser/udunits2Parser.py @@ -1,4 +1,4 @@ -# Generated from /home/ruth/git_stuff/cf-units/cf_units/_udunits2_parser/udunits2Parser.g4 by ANTLR 4.11.1 +# Generated from cf_units/_udunits2_parser/udunits2Parser.g4 by ANTLR 4.11.1 import sys from antlr4 import * diff --git a/cf_units/_udunits2_parser/parser/udunits2ParserVisitor.py b/cf_units/_udunits2_parser/parser/udunits2ParserVisitor.py index f83c692e..6bac1ac0 100644 --- a/cf_units/_udunits2_parser/parser/udunits2ParserVisitor.py +++ b/cf_units/_udunits2_parser/parser/udunits2ParserVisitor.py @@ -1,4 +1,4 @@ -# Generated from /home/ruth/git_stuff/cf-units/cf_units/_udunits2_parser/udunits2Parser.g4 by ANTLR 4.11.1 +# Generated from cf_units/_udunits2_parser/udunits2Parser.g4 by ANTLR 4.11.1 from antlr4 import * if __name__ is not None and "." in __name__: @@ -6,7 +6,8 @@ else: from udunits2Parser import udunits2Parser -# This class defines a complete generic visitor for a parse tree produced by udunits2Parser. +# This class defines a complete generic visitor for a parse tree produced by +# udunits2Parser. class udunits2ParserVisitor(ParseTreeVisitor): diff --git a/cf_units/tests/integration/parse/test_parse.py b/cf_units/tests/integration/parse/test_parse.py index ecec5bb8..bc0498f5 100644 --- a/cf_units/tests/integration/parse/test_parse.py +++ b/cf_units/tests/integration/parse/test_parse.py @@ -242,7 +242,7 @@ def test_known_issues(_, unit_str, expected): # These are the cases that don't work yet but which do work with udunits. # Make sure udunits can read it. - cf_units.Unit(unit_str).symbol + cf_units.Unit(unit_str).symbol # noqa: B018 if isinstance(expected, type) and issubclass(expected, Exception): with pytest.raises(SyntaxError): @@ -293,7 +293,7 @@ def test_invalid_syntax_units(_, unit_str): # allowed with our grammar. with pytest.raises(ValueError): - cf_units.Unit(unit_str).symbol + cf_units.Unit(unit_str).symbol # noqa: B018 with pytest.raises(SyntaxError): normalize(unit_str) diff --git a/cf_units/tests/integration/test__Unit_num2date.py b/cf_units/tests/integration/test__Unit_num2date.py index 11d4c1c3..0f39225f 100644 --- a/cf_units/tests/integration/test__Unit_num2date.py +++ b/cf_units/tests/integration/test__Unit_num2date.py @@ -186,7 +186,8 @@ def test_simple_360_day(self): self.udays, self.udays, ] - # Expected results in (days, seconds, microseconds) delta from unit epoch. + # Expected results in (days, seconds, microseconds) delta from unit + # epoch. expected = [ (0, nums[0], 0), (0, nums[1], 0), @@ -218,7 +219,8 @@ def test_fractional_360_day(self): self.udays, self.udays, ] - # Expected results in (days, seconds, microseconds) delta from unit epoch. + # Expected results in (days, seconds, microseconds) delta from unit + # epoch. expected = [ (0, nums[0] * 60, 0), (0, nums[1] * 60, 0), @@ -234,7 +236,8 @@ def test_fractional_second_360_day(self): self.setup_units("360_day") nums = [0.25, 0.5, 0.75, 1.5, 2.5, 3.5, 4.5] units = [self.useconds] * 7 - # Expected results in (days, seconds, microseconds) delta from unit epoch. + # Expected results in (days, seconds, microseconds) delta from unit + # epoch. expected = [ (0, 0, 250000), (0, 0, 500000), @@ -273,7 +276,8 @@ def test_simple_365_day(self): self.udays, self.udays, ] - # Expected results in (days, seconds, microseconds) delta from unit epoch. + # Expected results in (days, seconds, microseconds) delta from unit + # epoch. expected = [ (0, nums[0], 0), (0, nums[1], 0), @@ -305,7 +309,8 @@ def test_fractional_365_day(self): self.udays, self.udays, ] - # Expected results in (days, seconds, microseconds) delta from unit epoch. + # Expected results in (days, seconds, microseconds) delta from unit + # epoch. expected = [ (0, nums[0] * 60, 0), (0, nums[1] * 60, 0), @@ -321,7 +326,8 @@ def test_fractional_second_365_day(self): self.setup_units("365_day") nums = [0.25, 0.5, 0.75, 1.5, 2.5, 3.5, 4.5] units = [self.useconds] * 7 - # Expected results in (days, seconds, microseconds) delta from unit epoch. + # Expected results in (days, seconds, microseconds) delta from unit + # epoch. expected = [ (0, 0, 250000), (0, 0, 500000),