Merge upstream

.github/workflows/build-publish.yml

@@ -2,6 +2,7 @@ name: Publish Python 🐍 distributions 📦 to PyPI and TestPyPI
 on:
   push:
   pull_request:
+    types: [opened, reopened]
   release:
     types: [published]
 jobs:
@@ -12,34 +13,30 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - uses: astral-sh/setup-uv@v7
       - uses: actions/setup-python@v2
         with:
           python-version: 3.x
-      - name: Install tox
-        run: >-
-          pip install tox
+
+      - name: Install the project
+        run: uv sync --locked --dev
+
       - name: Pre Commit
-        run: >-
-          tox -e pre-commit
+        run: uv run pre-commit run --all-files
+
       - name: Test
-        run: >-
-          tox
+        run: uv run pytest
+
       - name: Build
-        run: >-
-          tox -e build
+        run: uv build
+
       - name: Publish distribution 📦 to Test PyPI
         if: contains(github.ref, 'refs/heads/master')
         env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.test_pypi_password }}
-          TWINE_REPOSITORY_URL: https://test.pypi.org/legacy/
-        run: >-
-          tox -e publish
+          UV_PUBLISH_TOKEN: ${{ secrets.test_pypi_password }}
+        run: uv publish --index testpypi
       - name: Publish distribution 📦 to PyPI
         if: contains(github.ref, 'refs/tags/v')
         env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.pypi_password }}
-          TWINE_REPOSITORY_URL: https://upload.pypi.org/legacy/
-        run: >-
-          tox -e publish -- --repository pypi
+          UV_PUBLISH_TOKEN: ${{ secrets.pypi_password }}
+        run: uv publish

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ exclude: '^docs/conf.py'
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.5.0
+  rev: v5.0.0
   hooks:
   - id: trailing-whitespace
   - id: check-added-large-files
@@ -17,30 +17,11 @@ repos:
   - id: mixed-line-ending
     args: ['--fix=auto']  # replace 'auto' with 'lf' to enforce Linux/Mac line endings or 'crlf' for Windows
 
-- repo: https://github.com/pycqa/isort
-  rev: 5.13.2
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.15.1
   hooks:
-  - id: isort
-
-- repo: https://github.com/psf/black
-  rev: 23.12.1
-  hooks:
-  - id: black
-    language_version: python3
-
-- repo: https://github.com/asottile/blacken-docs
-  rev: 1.16.0
-  hooks:
-  - id: blacken-docs
-    additional_dependencies: [black]
-
-- repo: https://github.com/PyCQA/flake8
-  rev: 7.0.0
-  hooks:
-  - id: flake8
-    additional_dependencies: [flake8-print]
-  ## You can add flake8 plugins via `additional_dependencies`:
-  #  additional_dependencies: [flake8-bugbear]
+    - id: ruff-check
+    - id: ruff-format
 
 - repo: https://github.com/Lucas-C/pre-commit-hooks-markup
   rev: v1.0.1
@@ -49,7 +30,13 @@ repos:
     files: README.rst
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.8.0
+  rev: v1.15.0
   hooks:
   -   id: mypy
-      args: [--install-types, --non-interactive, --ignore-missing-imports]
+      args: [--install-types, --non-interactive, --ignore-missing-imports, --disallow-incomplete-defs]
+#      args: [--install-types, --non-interactive, --ignore-missing-imports, --disallow-untyped-defs]
+
+- repo: https://github.com/astral-sh/uv-pre-commit
+  rev: 0.10.2
+  hooks:
+    - id: uv-lock

.readthedocs.yaml

@@ -0,0 +1,25 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+sphinx:
+  configuration: docs/conf.py
+
+build:
+  os: ubuntu-24.04
+  apt_packages:
+    - bison
+    - flex
+  tools:
+    python: "3.14"
+  jobs:
+    pre_create_environment:
+        - asdf plugin add uv
+        - asdf install uv latest
+        - asdf global uv latest
+    create_environment:
+        - uv venv "${READTHEDOCS_VIRTUALENV_PATH}"
+    install:
+        - UV_PROJECT_ENVIRONMENT="${READTHEDOCS_VIRTUALENV_PATH}" uv sync --frozen --group docs

docs/conf.py

@@ -276,5 +276,4 @@
 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),
 }

docs/importers.rst

@@ -170,19 +170,19 @@ TrueLayer account IDs to beancount accounts. e.g.:
 If it is present, transactions for *only these accounts* will be imported.
 
 
-Nordigen
---------
+GoCardless (formerly Nordigen)
+------------------------------
 
-Import from `Nordigen <http://nordigen.com/>`__ using their api services. e.g. supports Revolut.
+Import from `GoCardless <https://gocardless.com/bank-account-data/>`__ (formerly known as `Nordigen <https://gocardless.com/en-us/g/gc-nordigen/>`__) using their api services. Supports `2500+ banks <https://gocardless.com/bank-account-data/coverage/>`__ in Europe and the UK including e.g. Revolut.
 You need to create a free account and create a token. I've included a small cli to allow to hook up
-to different banks with nordigen. If you're country is not supported you can play around with other countries
+to different banks with GoCardless. If you're country is not supported you can play around with other countries
 e.g. CH is not allowed but things like revolut still work. You can also create multiple links and they will
 all be listed in the end.
 
 .. code-block:: console
 
   nordigen-conf list_banks --secret_id YOURSECRET_ID --secret_key YOURSECRET_KEY --country DE
-  nordigen-conf create_link --secret_id YOURSECRET_ID --secret_key YOURSECRET_KEY --bank REVOLUT_REVOGB21 --reference myref
+  nordigen-conf create_link --secret_id YOURSECRET_ID --secret_key YOURSECRET_KEY --bank REVOLUT_REVOGB21 --reference myref --max_historical_days 90 --access_valid_for_days 90 --access_scope "[\"balances\", \"details\", \"transactions\"]"
   nordigen-conf list_accounts --secret_id YOURSECRET_ID --secret_key YOURSECRET_KEY
   nordigen-conf delete_link --secret_id YOURSECRET_ID --secret_key YOURSECRET_KEY --reference myref
 
@@ -402,10 +402,110 @@ Import mt940 from `BCGE <https://www.bcge.ch/>`__
 Swisscard cards
 ---------------
 
-Import Swisscard's `Cashback Cards <https://www.cashback-cards.ch/>` transactions from a CSV export.__
+Import Swisscard's `Cashback Cards <https://www.cashback-cards.ch/>` transactions from a CSV export.
 
 .. code-block:: python
 
   from tariochbctools.importers.swisscard import importer as swisscard
 
   CONFIG = [swisscard.SwisscardImporter("swisscard/.*\.csv", "Liabilities:Cashback")]
+
+Fidelity Netbenefits
+--------------------
+
+Import Fidelity Netbenefits `<https://netbenefits.fidelity.com/>` transactions from a CSV export of the activities.
+
+.. code-block:: python
+
+  from tariochbctools.importers.netbenefits import importer as netbenefits
+
+  CONFIG = [
+      netbenefits.Importer(
+          regexps="Transaction history\.csv",
+          cashAccount="Assets:Netbenefits:USD",
+          investmentAccount="Assets:Netbenefits:SYMBOL",
+          dividendAccount="Income:Interest",
+          taxAccount="Expenses:Tax",
+          capGainAccount="Income:Capitalgain",
+          symbol="SYMBOL",
+          ignoreTypes=["REINVESTMENT REINVEST @ $1.000"],
+          baseCcy="CHF",
+      )
+  ]
+
+radicant account statements
+---------------------------
+
+Import PDF from `radicant <https://radicant.com/>`__
+
+.. code-block:: python
+
+  from tariochbctools.importers.radicant import importer as radicant
+
+  CONFIG = [radicant.Importer("Account.*\.pdf", "Assets:Radicant")]
+
+AwardWallet
+------------------------------
+
+Import from `AwardWallet <https://awardwallet.com/>`__ using their `Account
+Access API <https://awardwallet.com/api/account>`__.
+
+As of 2025 AwardWallet integrates over 460 airline, hotel, shopping and other
+loyalty programmes. Many programmes do not support retrieval of transactions,
+only balances.
+
+1.  Update your personal AwardWallet account.
+    The importer can only retrieve data that has already been synced to your AwardWallet account.
+
+2.  Follow the instructions in the `API documentation
+    <https://awardwallet.com/api/account#introduction>`__ to register for a
+    free Business account and create an API key.
+
+    The API key is restricted to the **allowed IP addresses** you specify in
+    the Business interface API Settings.
+
+3.  Link and authorize personal accounts using the included ``awardwallet-conf``
+    CLI tool:
+
+    .. code-block:: console
+
+      awardwallet-conf --api-key YOUR_API_KEY get_link_url
+
+    Manage access to your personal account under `Manage Users
+    <https://awardwallet.com/user/connections>`__ in the personal web
+    interface.
+
+4.  Generate a config file for all linked users ending with
+    ``awardwallet.yaml`` in your import location (e.g. download folder) and
+    edit it to your needs.
+
+    .. code-block:: console
+
+      awardwallet-conf --api-key YOUR_API_KEY generate > awardwallet.yaml
+
+    If you have multiple accounts using the same points currency (e.g. ``AVIOS``
+    used by BA, Iberia, ...) create sub-accounts for each so that ``balance``
+    directives will work.
+
+    Example configuration file:
+
+    .. code-block:: yaml
+
+      api_key: YOUR_API_KEY
+      users:
+        12345:
+          name: John Smith
+          all_history: false     # only the last 10 txns per account
+          accounts:
+            7654321:
+              provider: "British Airways Club"
+              account: Assets:Current:Points
+              currency: AVIOS
+
+5.  Finally, initialize the importer:
+
+    .. code-block:: python
+
+      from tariochbctools.importers.awardwalletimp import importer as awimp
+
+      CONFIG = [awimp.Importer()]