Skip to content

Commit

Permalink
Merge f66b3be into 708ae8a
Browse files Browse the repository at this point in the history
  • Loading branch information
carljm committed Dec 17, 2020
2 parents 708ae8a + f66b3be commit d81e5cf
Show file tree
Hide file tree
Showing 13 changed files with 1,449 additions and 4 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ The currently supported set of data sources is:
- [beancount_import.source.stockplanconnect](beancount_import/source/stockplanconnect.py):
imports release/trade transactions from
[Morgan Stanley StockPlan Connect](https://stockplanconnect.com).
- [beancount_import.source.schwab_csv](beancount_import/source/schwab_csv.py):
imports transactions and positions CSV exports from Schwab brokerage accounts.
- [beancount_import.source.ultipro_google](beancount_import/source/ultipro_google.py):
imports Google employee Ultipro payroll statements.
- [beancount_import.source.generic_importer_source](beancount_import/source/generic_importer_source.py):
Expand Down
4 changes: 2 additions & 2 deletions beancount_import/reconcile.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import collections
import datetime
import re
from typing import List, Optional, Union, Callable, Dict, Tuple, Any, Iterable, Set, NamedTuple
from typing import List, Optional, Union, Callable, Dict, Mapping, Tuple, Any, Iterable, Set, NamedTuple
import argparse
import os
import tempfile
Expand Down Expand Up @@ -33,7 +33,7 @@
('date', datetime.date),
('entries', Entries),
('source', Optional[Source]),
('info', Optional[Dict[str, Any]]),
('info', Optional[Mapping[str, Any]]),
('formatted', str),
('id', str),
])
Expand Down
4 changes: 2 additions & 2 deletions beancount_import/source/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def load(spec: dict, log_status: LogFunction) -> Source
"""

import datetime
from typing import Iterable, NamedTuple, List, Dict, Any, Tuple, Union, Callable, Optional
from typing import Iterable, NamedTuple, List, Dict, Mapping, Any, Tuple, Union, Callable, Optional
import importlib

from beancount.core.data import Transaction, Entries, Directive, Posting, Meta
Expand All @@ -103,7 +103,7 @@ def load(spec: dict, log_status: LogFunction) -> Source
ImportResult = NamedTuple('ImportResult', [
('date', datetime.date),
('entries', Entries),
('info', Optional[Dict[str, Any]]),
('info', Optional[Mapping[str, Any]]),
])

InvalidSourceReference = NamedTuple('InvalidSourceReference', [
Expand Down

0 comments on commit d81e5cf

Please sign in to comment.