NPO-Accounting/conservancy_beancount Changeset - a27d68beab7b

Changeset - a27d68beab7b

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Brett Smith - 4 years ago 2020-07-27 15:50:11
brettcsmith@brettcsmith.org

cliutil: Add diff_year function.

4 files changed with 33 insertions and 26 deletions:

conservancy_beancount/cliutil.py

conservancy_beancount/reports/fund.py

conservancy_beancount/reports/ledger.py

tests/test_cliutil.py

0 comments (0 inline, 0 general)

conservancy_beancount/cliutil.py

➞

Show inline comments

@@ ... @@
         nargs=0,
         const=f"{progname} version {VERSION}\n{LICENSE}",
         help="Show program version and license information",
+    )
 def date_arg(arg: str) -> datetime.date:
     return datetime.datetime.strptime(arg, '%Y-%m-%d').date()
 def diff_year(date: datetime.date, diff: int) -> datetime.date:
     new_year = date.year + diff
     try:
         return date.replace(year=new_year)
     except ValueError:
         # The original date is Feb 29, which doesn't exist in the new year.
         if diff < 0:
             return datetime.date(new_year, 2, 28)
         else:
             return datetime.date(new_year, 3, 1)
 def year_or_date_arg(arg: str) -> Union[int, datetime.date]:
     """Get either a date or a year (int) from an argument string
     This is a useful argument type for arguments that will be passed into
     Books loader methods which can accept either a fiscal year or a full date.
     """
     try:
         year = int(arg, 10)

conservancy_beancount/reports/fund.py

➞

Show inline comments

@@ ... @@
     args = parser.parse_args(arglist)
     if args.report_type is None:
         if any(term.meta_key == 'project' for term in args.search_terms):
             args.report_type = ReportType.TEXT
         else:
             args.report_type = ReportType.ODS
     return args
 def diff_year(date: datetime.date, diff: int) -> datetime.date:
     new_year = date.year + diff
     try:
         return date.replace(year=new_year)
     except ValueError:
         # The original date is Feb 29, which doesn't exist in the new year.
         if diff < 0:
             return datetime.date(new_year, 2, 28)
         else:
             return datetime.date(new_year, 3, 1)
 def main(arglist: Optional[Sequence[str]]=None,
          stdout: TextIO=sys.stdout,
          stderr: TextIO=sys.stderr,
          config: Optional[configmod.Config]=None,
 ) -> int:
     args = parse_arguments(arglist)
     cliutil.set_loglevel(logger, args.loglevel)
     if config is None:
         config = configmod.Config()
         config.load_file()
     if args.stop_date is None:
         if args.start_date is None:
             args.stop_date = datetime.date.today()
         else:
             args.stop_date = diff_year(args.start_date, 1)
+            args.stop_date = cliutil.diff_year(args.start_date, 1)
     if args.start_date is None:
         args.start_date = diff_year(args.stop_date, -1)
+        args.start_date = cliutil.diff_year(args.stop_date, -1)
     returncode = 0
     books_loader = config.books_loader()
     if books_loader is None:
         entries, load_errors, _ = books.Loader.load_none(config.config_file_path())
     else:
         entries, load_errors, _ = books_loader.load_fy_range(args.start_date, args.stop_date)
     for error in load_errors:

conservancy_beancount/reports/ledger.py

➞

Show inline comments

@@ ... @@
                 'Assets:Prepaid',
                 'Liabilities:UnearnedIncome',
                 'Liabilities:Payable',
+            ]
         else:
             args.accounts = list(LedgerODS.ACCOUNT_COLUMNS)
     return args
 def diff_year(date: datetime.date, diff: int) -> datetime.date:
     new_year = date.year + diff
     try:
         return date.replace(year=new_year)
     except ValueError:
         # The original date is Feb 29, which doesn't exist in the new year.
         if diff < 0:
             return datetime.date(new_year, 2, 28)
         else:
             return datetime.date(new_year, 3, 1)
 def main(arglist: Optional[Sequence[str]]=None,
          stdout: TextIO=sys.stdout,
          stderr: TextIO=sys.stderr,
          config: Optional[configmod.Config]=None,
 ) -> int:
     args = parse_arguments(arglist)
     cliutil.set_loglevel(logger, args.loglevel)
     if config is None:
         config = configmod.Config()
         config.load_file()
     today = datetime.date.today()
     if args.start_date is None:
         args.start_date = diff_year(today, -1)
+        args.start_date = cliutil.diff_year(today, -1)
         if args.stop_date is None:
             args.stop_date = today + datetime.timedelta(days=30)
     elif args.stop_date is None:
         args.stop_date = diff_year(args.start_date, 1)
+        args.stop_date = cliutil.diff_year(args.start_date, 1)
     returncode = 0
     books_loader = config.books_loader()
     if books_loader is None:
         entries, load_errors, options = books.Loader.load_none(config.config_file_path())
     else:
         entries, load_errors, options = books_loader.load_fy_range(args.start_date, args.stop_date)
     for error in load_errors:

tests/test_cliutil.py

➞

Show inline comments

@@ ... / @@ -213,8 +213,26 @@ def test_setup_logger(): @@
 ])
 def test_version_argument(argparser, capsys, arg):
     with pytest.raises(SystemExit) as exc_check:
         args = argparser.parse_args(['--version'])
     assert exc_check.value.args[0] == 0
     stdout, _ = capsys.readouterr()
     lines = iter(stdout.splitlines())
     assert re.match(r'^test_cliutil version \d+\.\d+\.\d+', next(lines, "<EOF>"))
 @pytest.mark.parametrize('date,diff,expected', [
     (datetime.date(2010, 2, 28), 0, datetime.date(2010, 2, 28)),
     (datetime.date(2010, 2, 28), 1, datetime.date(2011, 2, 28)),
     (datetime.date(2010, 2, 28), 2, datetime.date(2012, 2, 28)),
     (datetime.date(2010, 2, 28), -1, datetime.date(2009, 2, 28)),
     (datetime.date(2010, 2, 28), -2, datetime.date(2008, 2, 28)),
     (datetime.date(2012, 2, 29), 2, datetime.date(2014, 3, 1)),
     (datetime.date(2012, 2, 29), 4, datetime.date(2016, 2, 29)),
     (datetime.date(2012, 2, 29), -2, datetime.date(2010, 2, 28)),
     (datetime.date(2012, 2, 29), -4, datetime.date(2008, 2, 29)),
     (datetime.date(2010, 3, 1), 1, datetime.date(2011, 3, 1)),
     (datetime.date(2010, 3, 1), 2, datetime.date(2012, 3, 1)),
     (datetime.date(2010, 3, 1), -1, datetime.date(2009, 3, 1)),
     (datetime.date(2010, 3, 1), -2, datetime.date(2008, 3, 1)),
 ])
 def test_diff_year(date, diff, expected):
     assert cliutil.diff_year(date, diff) == expected

0 comments (0 inline, 0 general)