Merge branch 'master' into master

Author: NiklasRosenstein

.github/renovate.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended"]
+}

.github/workflows/publish-pypi.yml

@@ -1,23 +1,41 @@
 name: Build and publish Python distributions to PyPI
 
 on:
-  - push
-  - workflow_dispatch
+  push:
+    branches: [ 'master' ]
+    tags: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
 
 jobs:
+  checks:
+    name: Checks
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          version: "0.5.21"
+      - name: Pytest
+        run: uv run pytest
+      - name: Ruff check
+        run: uv run ruff check
+      - name: Ruff format
+        run: uv run ruff format --check
+
   build-n-publish:
     name: Build and publish Python distributions to PyPI
     runs-on: ubuntu-latest
+    needs: checks
     steps:
       - uses: actions/checkout@master
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
-          python-version: 3.11
+          version: "0.5.21"
       - name: Build wheel
-        run: |
-          python3 -m pip install wheel
-          python3 setup.py sdist bdist_wheel
+        run: uv build
       - name: Publish distribution to PyPI
         if: startsWith(github.event.ref, 'refs/tags')
         uses: pypa/gh-action-pypi-publish@release/v1.9

MANIFEST.in

@@ -92,16 +92,15 @@ If no arguments are supplied pytr will look for them in the file `~/.pytr/creden
 
 ## Linting and Code Formatting
 
-This project uses [black](https://github.com/psf/black) for code linting and auto-formatting. You can auto-format the code by running:
+This project uses [Ruff](https://astral.sh/ruff) for code linting and auto-formatting. You can auto-format the code by running:
 
 ```bash
-# Install black if not already installed
-pip install black
-
-# Auto-format code
-black ./pytr
+uv run ruff format            # Format code
+uv run ruff check --fix-only  # Remove unneeded imports, order imports, etc.
 ```
 
+Ruff runs as part of CI and your Pull Request cannot be merged unless it satisfies the linting and formatting checks.
+
 ## Setting Up a Development Environment
 
 1. Clone the repository:

README.md

@@ -1,6 +1,6 @@
 [build-system]
-requires = ["setuptools>=42", "wheel", "babel"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-babel"]
+build-backend = "hatchling.build"
 
 [project]
 name = "pytr"
@@ -12,7 +12,7 @@ license = { text = "MIT" }
 authors = [
     { name = "marzzzello", email = "[email protected]" }
 ]
-urls = { "Homepage" = "https://gitlab.com/pytr-org/pytr/" }
+urls = { "Homepage" = "https://github.com/pytr-org/pytr" }
 classifiers = [
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3 :: Only",
@@ -30,16 +30,24 @@ dependencies = [
     "pygments",
     "requests_futures",
     "shtab",
-    "websockets>=10.1",
+    "websockets>=10.1,<14",
     "babel",
 ]
 
 [project.scripts]
 pytr = "pytr.main:main"
 
-[tool.setuptools]
-include-package-data = true
-packages = ["pytr"]
+[tool.hatch.build.hooks.babel]
+locale_dir = "pytr/locale"
 
-[tool.setuptools.package-data]
-pytr = ["pytr/locale/*/*/*.mo", "pytr/locale/*/*/*.po"]
+[dependency-groups]
+dev = [
+    "ruff>=0.9.4",
+    "pytest>=8.3.4",
+]
+
+[tool.ruff]
+line-length = 120
+
+[tool.ruff.lint]
+extend-select = ["I"]

pyproject.toml

@@ -1,28 +1,27 @@
 import json
 import sys
-from pygments import highlight, lexers, formatters
 import time
 from getpass import getpass
 
-from pytr.api import TradeRepublicApi, CREDENTIALS_FILE
+from pygments import formatters, highlight, lexers
+
+from pytr.api import CREDENTIALS_FILE, TradeRepublicApi
 from pytr.utils import get_logger
 
 
 def get_settings(tr):
     formatted_json = json.dumps(tr.settings(), indent=2)
     if sys.stdout.isatty():
-        colorful_json = highlight(
-            formatted_json, lexers.JsonLexer(), formatters.TerminalFormatter()
-        )
+        colorful_json = highlight(formatted_json, lexers.JsonLexer(), formatters.TerminalFormatter())
         return colorful_json
     else:
         return formatted_json
 
 
-def login(phone_no=None, pin=None, web=True):
+def login(phone_no=None, pin=None, web=True, store_credentials=False):
     """
-    If web is true, use web login method as else simulate app login.
-    Check if credentials file exists else create it.
+    If web is true, use web login method, else simulate app login.
+    Handle credentials parameters and store to credentials file if requested.
     If no parameters are set but are needed then ask for input
     """
     log = get_logger(__name__)
@@ -41,9 +40,7 @@ def login(phone_no=None, pin=None, web=True):
         CREDENTIALS_FILE.parent.mkdir(parents=True, exist_ok=True)
         if phone_no is None:
             log.info("Credentials file not found")
-            print(
-                "Please enter your TradeRepublic phone number in the format +4912345678:"
-            )
+            print("Please enter your TradeRepublic phone number in the format +4912345678:")
             phone_no = input()
         else:
             log.info("Phone number provided as argument")
@@ -52,17 +49,13 @@ def login(phone_no=None, pin=None, web=True):
             print("Please enter your TradeRepublic pin:")
             pin = getpass(prompt="Pin (Input is hidden):")
 
-        print('Save credentials? Type "y" to save credentials:')
-        save = input()
-        if save == "y":
+        if store_credentials:
             with open(CREDENTIALS_FILE, "w") as f:
                 f.writelines([phone_no + "\n", pin + "\n"])
 
             log.info(f"Saved credentials in {CREDENTIALS_FILE}")
-
         else:
             save_cookies = False
-            log.info("Credentials not saved")
 
     tr = TradeRepublicApi(phone_no=phone_no, pin=pin, save_cookies=save_cookies)
 
@@ -78,15 +71,13 @@ def login(phone_no=None, pin=None, web=True):
                 exit(1)
             request_time = time.time()
             print("Enter the code you received to your mobile app as a notification.")
-            print(
-                f"Enter nothing if you want to receive the (same) code as SMS. (Countdown: {countdown})"
-            )
+            print(f"Enter nothing if you want to receive the (same) code as SMS. (Countdown: {countdown})")
             code = input("Code: ")
             if code == "":
                 countdown = countdown - (time.time() - request_time)
                 for remaining in range(int(countdown)):
                     print(
-                        f"Need to wait {int(countdown-remaining)} seconds before requesting SMS...",
+                        f"Need to wait {int(countdown - remaining)} seconds before requesting SMS...",
                         end="\r",
                     )
                     time.sleep(1)

pytr/account.py

@@ -1,7 +1,7 @@
 import asyncio
 from datetime import datetime
 
-from pytr.utils import preview, get_logger
+from pytr.utils import get_logger, preview
 
 
 class Alarms:
@@ -19,9 +19,7 @@ async def alarms_loop(self):
                 recv += 1
                 self.alarms = response
             else:
-                print(
-                    f"unmatched subscription of type '{subscription['type']}':\n{preview(response)}"
-                )
+                print(f"unmatched subscription of type '{subscription['type']}':\n{preview(response)}")
 
             if recv == 1:
                 return
@@ -36,9 +34,7 @@ async def ticker_loop(self):
                 recv += 1
                 self.alarms = response
             else:
-                print(
-                    f"unmatched subscription of type '{subscription['type']}':\n{preview(response)}"
-                )
+                print(f"unmatched subscription of type '{subscription['type']}':\n{preview(response)}")
 
             if recv == 1:
                 return
@@ -47,11 +43,7 @@ def overview(self):
         print("ISIN         status created  target  diff% createdAt        triggeredAT")
         self.log.debug(f"Processing {len(self.alarms)} alarms")
 
-        for (
-            a
-        ) in (
-            self.alarms
-        ):  # sorted(positions, key=lambda x: x['netValue'], reverse=True):
+        for a in self.alarms:  # sorted(positions, key=lambda x: x['netValue'], reverse=True):
             self.log.debug(f"  Processing {a} alarm")
             ts = int(a["createdAt"]) / 1000.0
             target_price = float(a["targetPrice"])
@@ -61,9 +53,7 @@ def overview(self):
                 triggered = "-"
             else:
                 ts = int(a["triggeredAt"]) / 1000.0
-                triggered = datetime.fromtimestamp(ts).isoformat(
-                    sep=" ", timespec="minutes"
-                )
+                triggered = datetime.fromtimestamp(ts).isoformat(sep=" ", timespec="minutes")
 
             if a["createdPrice"] == 0:
                 diffP = 0.0