PyPI - tariochbctools - Versions diffs - 1.0.1__tar.gz → 1.1.1__tar.gz - Mend

tariochbctools 1.0.1tar.gz → 1.1.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (94) hide show

{tariochbctools-1.0.1 → tariochbctools-1.1.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: tariochbctools
-Version: 1.0.1
+Version: 1.1.1
 Summary: Importers, plugins and price fetchers for Beancount
 Home-page: https://github.com/tarioch/beancounttools/
 Author: Patrick Ruckstuhl

{tariochbctools-1.0.1 → tariochbctools-1.1.1}/src/tariochbctools/importers/bitst/importer.py RENAMED Viewed

@@ -10,6 +10,7 @@ from beancount.core.number import MISSING, D
 from dateutil.parser import parse
 from dateutil.relativedelta import relativedelta
+from tariochbctools.importers.general.deduplication import ReferenceDuplicatesComparator
 from tariochbctools.importers.general.priceLookup import PriceLookup
@@ -166,3 +167,5 @@ class Importer(beangulp.Importer):
         return data.Transaction(
             meta, date, "*", "", narration, data.EMPTY_SET, data.EMPTY_SET, postings
         )
+    cmp = ReferenceDuplicatesComparator()

{tariochbctools-1.0.1 → tariochbctools-1.1.1}/src/tariochbctools/importers/blockchain/importer.py RENAMED Viewed

@@ -6,6 +6,7 @@ import yaml
 from beancount.core import amount, data
 from beancount.core.number import D
+from tariochbctools.importers.general.deduplication import ReferenceDuplicatesComparator
 from tariochbctools.importers.general.priceLookup import PriceLookup
@@ -66,3 +67,5 @@ class Importer(beangulp.Importer):
                 entries.append(entry)
         return entries
+    cmp = ReferenceDuplicatesComparator()

tariochbctools-1.1.1/src/tariochbctools/importers/general/deduplication.py ADDED Viewed

@@ -0,0 +1,14 @@
+class ReferenceDuplicatesComparator:
+    def __init__(self, refs=["ref"]):
+        self.refs = refs
+    def __call__(self, entry1, entry2):
+        entry1Refs = set()
+        entry2Refs = set()
+        for ref in self.refs:
+            if ref in entry1.meta:
+                entry1Refs.add(entry1.meta[ref])
+            if ref in entry2.meta:
+                entry2Refs.add(entry2.meta[ref])
+        return entry1Refs & entry2Refs

{tariochbctools-1.0.1 → tariochbctools-1.1.1}/src/tariochbctools/importers/general/mt940importer.py RENAMED Viewed

@@ -6,6 +6,8 @@ import mt940
 from beancount.core import amount, data
 from beancount.core.number import D
+from tariochbctools.importers.general.deduplication import ReferenceDuplicatesComparator
 class Importer(beangulp.Importer):
     """An importer for MT940 files."""
@@ -60,6 +62,8 @@ class Importer(beangulp.Importer):
         return entries
+    cmp = ReferenceDuplicatesComparator()
     def prepare_payee(self, trxdata: dict[str, Any]) -> str:
         return ""

{tariochbctools-1.0.1 → tariochbctools-1.1.1}/src/tariochbctools/importers/nordigen/importer.py RENAMED Viewed

@@ -7,6 +7,8 @@ import yaml
 from beancount.core import amount, data
 from beancount.core.number import D
+from tariochbctools.importers.general.deduplication import ReferenceDuplicatesComparator
 class HttpServiceException(Exception):
     pass
@@ -105,3 +107,5 @@ class Importer(beangulp.Importer):
                 entries.append(entry)
         return entries
+    cmp = ReferenceDuplicatesComparator(["nordref"])

{tariochbctools-1.0.1 → tariochbctools-1.1.1}/src/tariochbctools/importers/transferwise/importer.py RENAMED Viewed

@@ -15,6 +15,8 @@ from beancount.core import amount, data
 from beancount.core.number import D
 from dateutil.relativedelta import relativedelta
+from tariochbctools.importers.general.deduplication import ReferenceDuplicatesComparator
 http = urllib3.PoolManager()
@@ -183,3 +185,5 @@ class Importer(beangulp.Importer):
                 entries.append(entry)
         return entries
+    cmp = ReferenceDuplicatesComparator()

{tariochbctools-1.0.1 → tariochbctools-1.1.1}/src/tariochbctools/importers/zak/importer.py RENAMED Viewed

@@ -8,6 +8,8 @@ from beancount.core import amount, data
 from beancount.core.number import D
 from dateutil.parser import parse
+from tariochbctools.importers.general.deduplication import ReferenceDuplicatesComparator
 class Importer(beangulp.Importer):
     """An importer for Bank Cler ZAK PDF files files."""
@@ -127,3 +129,5 @@ class Importer(beangulp.Importer):
                 entries.append(self.createBalanceEntry(filepath, date, saldo))
         return entries
+    cmp = ReferenceDuplicatesComparator(["zakref"])

{tariochbctools-1.0.1 → tariochbctools-1.1.1}/src/tariochbctools/plugins/generate_base_ccy_prices.py RENAMED Viewed

@@ -13,7 +13,11 @@ def generate(entries, options_map, baseCcy):
     additionalEntries = []
     for entry in entries:
-        if isinstance(entry, data.Price) and entry.amount.currency != baseCcy:
+        if (
+            isinstance(entry, data.Price)
+            and entry.amount.currency != baseCcy
+            and entry.currency != baseCcy
+        ):
             fxTuple = tuple([entry.amount.currency, baseCcy])
             fxRate = prices.get_price(priceMap, fxTuple, entry.date)
             if fxRate[1] and not _alreadyExistingPrice(

{tariochbctools-1.0.1 → tariochbctools-1.1.1}/src/tariochbctools.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: tariochbctools
-Version: 1.0.1
+Version: 1.1.1
 Summary: Importers, plugins and price fetchers for Beancount
 Home-page: https://github.com/tarioch/beancounttools/
 Author: Patrick Ruckstuhl

{tariochbctools-1.0.1 → tariochbctools-1.1.1}/src/tariochbctools.egg-info/SOURCES.txt RENAMED Viewed

@@ -36,6 +36,7 @@ src/tariochbctools/importers/blockchain/importer.py
 src/tariochbctools/importers/cembrastatement/__init__.py
 src/tariochbctools/importers/cembrastatement/importer.py
 src/tariochbctools/importers/general/__init__.py
+src/tariochbctools/importers/general/deduplication.py
 src/tariochbctools/importers/general/mailAdapterImporter.py
 src/tariochbctools/importers/general/mt940importer.py
 src/tariochbctools/importers/general/priceLookup.py
@@ -84,6 +85,8 @@ tests/tariochbctools/plugins/__init__.py
 tests/tariochbctools/plugins/test_generate_base_ccy_prices.py
 tests/tariochbctools/plugins/data/generate_base_ccy_prices/entry_already_exists_expected.beancount
 tests/tariochbctools/plugins/data/generate_base_ccy_prices/entry_already_exists_input.beancount
+tests/tariochbctools/plugins/data/generate_base_ccy_prices/issue122_expected.beancount
+tests/tariochbctools/plugins/data/generate_base_ccy_prices/issue122_input.beancount
 tests/tariochbctools/plugins/data/generate_base_ccy_prices/missing_fx_expected.beancount
 tests/tariochbctools/plugins/data/generate_base_ccy_prices/missing_fx_input.beancount
 tests/tariochbctools/plugins/data/generate_base_ccy_prices/normal_expected.beancount

tariochbctools-1.1.1/tests/tariochbctools/plugins/data/generate_base_ccy_prices/issue122_expected.beancount ADDED Viewed

@@ -0,0 +1,3 @@
+2020-01-01 price USD                                    10 TUG
+2020-01-01 price USD                                  0.10 EUR
+2020-01-01 price EUR                                   100 TUG

tariochbctools-1.1.1/tests/tariochbctools/plugins/data/generate_base_ccy_prices/issue122_input.beancount ADDED Viewed

@@ -0,0 +1,4 @@
+plugin "tariochbctools.plugins.generate_base_ccy_prices" "EUR"
+2020-01-01 price USD 10 TUG
+2020-01-01 price EUR 100 TUG

{tariochbctools-1.0.1 → tariochbctools-1.1.1}/tests/tariochbctools/plugins/test_generate_base_ccy_prices.py RENAMED Viewed

@@ -6,7 +6,9 @@ from beancount import loader
 from beancount.parser import printer
-@pytest.mark.parametrize("testCase", ["normal", "missing_fx", "entry_already_exists"])
+@pytest.mark.parametrize(
+    "testCase", ["normal", "missing_fx", "entry_already_exists", "issue122"]
+)
 def test_data(testCase):
     dataDir = os.path.join(
         os.path.dirname(__file__), "data", "generate_base_ccy_prices"