Some improvements

Author: Abhijit Sarkar

.github/run.sh

@@ -29,10 +29,7 @@ while (( $# > 0 )); do
    esac
 done
 
-bin_dir=""
-if [[ "$OSTYPE" == "darwin"* ]]; then
-	bin_dir="./venv/bin/"
-fi
+bin_dir="$PWD/venv/bin/"
 
 basedir="${1:-.}"
 
@@ -49,4 +46,4 @@ if (( no_lint == 0 )); then
     "$bin_dir"ruff format --check "$basedir"
   fi
   "$bin_dir"mypy --explicit-package-bases "$basedir" --strict
-fi
+fi

.github/workflows/ci.yml

@@ -8,16 +8,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up
-        uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - name: Set up Python
+        uses: actions/setup-python@v6
         with:
           python-version-file: 'pyproject.toml'
-      - name: Install dependencies
+      - name: Set up venv
         run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
+          python3 -m venv "$PWD/venv"
+          echo "$PWD/venv/bin" >> "$GITHUB_PATH"
+      - name: Install dependencies
+        run: python -m pip install --upgrade pip '.[test]' '.[lint]'
       - name: Test
         run: ./.github/run.sh --no-lint
       - name: Lint
-        run: ./.github/run.sh --no-test
+        run: ./.github/run.sh --no-test

.gitignore

@@ -11,6 +11,11 @@
 __pycache__
 venv
 
+# pip
+build
+dist
+*.egg-info
+
 # Pytest
 .pytest_cache
 

README.md

@@ -4,6 +4,19 @@ Feel free to open issues for questions, comments, or suggestions.
 
 [![](https://github.com/asarkar/exercism-python/workflows/CI/badge.svg)](https://github.com/asarkar/exercism-python/actions)
 
+## Development
+
+```
+% $(brew --prefix python)/bin/python3 -m venv ./venv
+
+% ./venv/bin/python -m pip install --upgrade pip '.[test]' '.[lint]'
+```
+
+To remove the local copy of the package `pydata`:
+```
+% ./venv/bin/python -m pip uninstall -y pydata
+```
+
 ## Running tests
 ```
 ./.github/run.sh <directory>

affine-cipher/affine_cipher.py

@@ -1,4 +1,4 @@
-from typing import Callable
+from collections.abc import Callable
 
 M = 26
 

allergies/allergies.py

@@ -1,6 +1,15 @@
 class Allergies:
     def __init__(self, score: int) -> None:
-        allergies = ["eggs", "peanuts", "shellfish", "strawberries", "tomatoes", "chocolate", "pollen", "cats"]
+        allergies = [
+            "eggs",
+            "peanuts",
+            "shellfish",
+            "strawberries",
+            "tomatoes",
+            "chocolate",
+            "pollen",
+            "cats",
+        ]
         # // If the ith bit is set, the result is that 2^i (greater than 0)
         self.allergens = [allergies[i] for i in range(len(allergies)) if score & (1 << i) > 0]
 

bank-account/bank_account.py

@@ -1,13 +1,12 @@
 from threading import RLock
-from typing import Optional
 
 
 # Some community solutions using decorators:
 # https://exercism.org/tracks/python/exercises/bank-account/solutions/paweltomkiel
 # https://exercism.org/tracks/python/exercises/bank-account/solutions/FergusonTG
 class BankAccount:
     def __init__(self) -> None:
-        self._balance: Optional[int] = None
+        self._balance: int | None = None
         self._lock = RLock()
 
     # Don't need to synchronize here.

binary-search-tree/binary_search_tree.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from typing import Optional
-
 
 class TreeNode:
-    def __init__(self, data: str, left: Optional[TreeNode] = None, right: Optional[TreeNode] = None) -> None:
+    def __init__(
+        self, data: str, left: TreeNode | None = None, right: TreeNode | None = None
+    ) -> None:
         self.data = data
         self.left = left
         self.right = right
@@ -19,7 +19,7 @@ def __init__(self, tree_data: list[str]) -> None:
         for x in tree_data:
             self.root = BinarySearchTree.__insert(self.root, x)
 
-    def data(self) -> Optional[TreeNode]:
+    def data(self) -> TreeNode | None:
         return self.root
 
     def sorted_data(self) -> list[str]:
@@ -28,15 +28,15 @@ def sorted_data(self) -> list[str]:
         return result
 
     @staticmethod
-    def __inorder(node: Optional[TreeNode], values: list[str]) -> None:
+    def __inorder(node: TreeNode | None, values: list[str]) -> None:
         if node is None:
             return
         BinarySearchTree.__inorder(node.left, values)
         values.append(node.data)
         BinarySearchTree.__inorder(node.right, values)
 
     @staticmethod
-    def __insert(node: Optional[TreeNode], val: str) -> TreeNode:
+    def __insert(node: TreeNode | None, val: str) -> TreeNode:
         if node is None:
             return TreeNode(val)
         if val <= node.data:

bowling/bowling.py

@@ -16,10 +16,7 @@ def roll(self, pins: int) -> None:
         if pins < 0:
             raise ValueError("invalid pins")
 
-        if not self.frames or self.frames[-1].is_complete():
-            frame = Frame()
-        else:
-            frame = self.frames.pop()
+        frame = Frame() if not self.frames or self.frames[-1].is_complete() else self.frames.pop()
 
         if frame.score() + pins > 10:
             raise ValueError("not enough pins left")

card-games/lists.py

@@ -47,7 +47,8 @@ def card_average(hand: list[int]) -> float:
 
 
 def approx_average_is_average(hand: list[int]) -> bool:
-    """Return if an average is using (first + last index values ) OR ('middle' card) == calculated average.
+    """Return if an average is using (first + last index values ) OR ('middle' card) ==
+        calculated average.
 
     :param hand: list - cards in hand.
     :return: bool - does one of the approximate averages equal the `true average`?