tariochbctools 0.34.0__tar.gz → 0.36__tar.gz

{tariochbctools-0.34.0/src/tariochbctools.egg-info → tariochbctools-0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tariochbctools
-Version: 0.34.0
+Version: 0.36
 Summary: Importers, plugins and price fetchers for Beancount
 Home-page: https://github.com/tarioch/beancounttools/
 Author: Patrick Ruckstuhl
@@ -20,7 +20,7 @@ Classifier: License :: OSI Approved :: MIT License
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
 Requires-Dist: importlib-metadata; python_version < "3.8"
-Requires-Dist: beancount
+Requires-Dist: beancount<3,>=2
 Requires-Dist: bitstampclient
 Requires-Dist: mt-940
 Requires-Dist: pyyaml

{tariochbctools-0.34.0 → tariochbctools-0.36}/docs/conf.py

@@ -276,5 +276,4 @@ latex_documents = [
 python_version = ".".join(map(str, sys.version_info[0:2]))
 intersphinx_mapping = {
     "python": ("https://docs.python.org/" + python_version, None),
-    "pyscaffold": ("https://pyscaffold.org/en/stable", None),
 }

{tariochbctools-0.34.0 → tariochbctools-0.36}/setup.cfg

@@ -29,7 +29,7 @@ package_dir =
 	=src
 install_requires = 
 	importlib-metadata; python_version<"3.8"
-	beancount
+	beancount>=2,<3
 	bitstampclient
 	mt-940
 	pyyaml

{tariochbctools-0.34.0 → tariochbctools-0.36}/src/tariochbctools/importers/swisscard/importer.py

@@ -33,7 +33,8 @@ class SwisscardImporter(identifier.IdentifyMixin, importer.ImporterProtocol):
                 book_date = parse(row["Transaction date"].strip(), dayfirst=True).date()
                 amt = amount.Amount(-D(row["Amount"]), row["Currency"])
                 metakv = {
-                    "category": row["Category"],
+                    "merchant": row["Merchant Category"],
+                    "category": row["Registered Category"],
                 }
                 meta = data.new_metadata(file.name, 0, metakv)
                 description = row["Description"].strip()

{tariochbctools-0.34.0 → tariochbctools-0.36}/src/tariochbctools/importers/transferwise/importer.py

@@ -27,8 +27,10 @@ class Importer(importer.ImporterProtocol):
         return ""
 
     def __init__(self, *args, **kwargs):
+        if "profileId" in kwargs:
+            self.profileId = kwargs.pop("profileId")
         if "startDate" in kwargs:
-            self.startDate = kwargs["startDate"]
+            self.startDate = kwargs.pop("startDate")
         else:
             self.startDate = datetime.combine(
                 date.today() + relativedelta(months=-3),
@@ -36,7 +38,7 @@ class Importer(importer.ImporterProtocol):
                 timezone.utc,
             ).isoformat()
         if "endDate" in kwargs:
-            self.endDate = kwargs["endDate"]
+            self.endDate = kwargs.pop("endDate")
         else:
             self.endDate = datetime.combine(
                 date.today(), datetime.max.time(), timezone.utc
@@ -121,9 +123,12 @@ class Importer(importer.ImporterProtocol):
         self.private_key_path = config["privateKeyPath"]
 
         headers = {"Authorization": "Bearer " + self.api_token}
-        r = requests.get("https://api.transferwise.com/v1/profiles", headers=headers)
-        profiles = r.json()
-        self.profileId = profiles[0]["id"]
+        if not self.profileId:
+            r = requests.get(
+                "https://api.transferwise.com/v1/profiles", headers=headers
+            )
+            profiles = r.json()
+            self.profileId = profiles[0]["id"]
 
         r = requests.get(
             "https://api.transferwise.com/v1/borderless-accounts",

{tariochbctools-0.34.0 → tariochbctools-0.36/src/tariochbctools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tariochbctools
-Version: 0.34.0
+Version: 0.36
 Summary: Importers, plugins and price fetchers for Beancount
 Home-page: https://github.com/tarioch/beancounttools/
 Author: Patrick Ruckstuhl
@@ -20,7 +20,7 @@ Classifier: License :: OSI Approved :: MIT License
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
 Requires-Dist: importlib-metadata; python_version < "3.8"
-Requires-Dist: beancount
+Requires-Dist: beancount<3,>=2
 Requires-Dist: bitstampclient
 Requires-Dist: mt-940
 Requires-Dist: pyyaml

{tariochbctools-0.34.0 → tariochbctools-0.36}/src/tariochbctools.egg-info/requires.txt

@@ -1,4 +1,4 @@
-beancount
+beancount<3,>=2
 bitstampclient
 mt-940
 pyyaml