Merge branch 'main' into signal-register-init

Author: slook

.github/workflows/testing.yml

@@ -12,12 +12,14 @@ on:
 
 jobs:
   test-autogen:
+    name: Test AutoGen Code
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.sha }}
-      - run: |
+      - name: Check Autogen Code is up to dated
+        run: |
           PYTHONPATH=libs/pyTermTk tools/autogenForwarded.py --apply
           if [[ $(git status --porcelain) ]] ; then
             git diff
@@ -29,14 +31,15 @@ jobs:
             echo "✅   - Release Clean"
           fi
 
-  build:
+  test-pyTermTk:
+    name: Test pyTermTk
     # runs-on: ubuntu-latest
     runs-on: self-hosted
 
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
 
     steps:
     - uses: actions/checkout@v3
@@ -64,7 +67,12 @@ jobs:
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         # flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 
-    - name: Test with pytest
+    - name: pytest
+      run: |
+        DDDD=$(pwd)
+        pytest ${DDDD}/tests/pytest
+
+    - name: Dumb Smoke Test
       run: |
         # To fix a folder permissin issue let's try to run the test from /tmp
         DDDD=$(pwd)
@@ -75,5 +83,4 @@ jobs:
         wget -O tmp/test.input.001.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.001.bin
         wget -O tmp/test.input.002.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.002.bin
         wget -O tmp/test.input.003.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.003.bin
-        pytest ${DDDD}/tests/pytest
         pytest ${DDDD}/tests/pytest/run_*

.vscode/settings.json

@@ -6,9 +6,10 @@
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
     "mypy-type-checker.args": [
-        "--config-file=pyproject.toml"
+        "--config-file=libs/pyTermTk/pyproject.toml"
     ],
     "python.analysis.extraPaths": [
-        "./libs/pyTermTk",
+        "libs/pyTermTk",
+        "apps/",
     ]
 }

Makefile

@@ -133,14 +133,14 @@ test: .venv
 	#   tests/pytest/test_001_demo.py -r test.input.bin
 	# Play the test stream
 	#   tests/pytest/test_001_demo.py -p test.input.bin
-	mkdir -p tmp
-	wget -O tmp/test.input.001.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.001.bin
-	wget -O tmp/test.input.002.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.002.bin
-	wget -O tmp/test.input.003.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.003.bin
 	tools/check.import.sh
 	. .venv/bin/activate ; \
 	    flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude .venv,build,tmp,experiments ;
 	. .venv/bin/activate ; \
         pytest tests/pytest
+	mkdir -p tmp
+	wget -O tmp/test.input.001.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.001.bin
+	wget -O tmp/test.input.002.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.002.bin
+	wget -O tmp/test.input.003.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.003.bin
 	. .venv/bin/activate ; \
         pytest tests/pytest/run_*

README.md

@@ -69,7 +69,10 @@ Unravel your inner artist with [The Terminal ASCII Photoshop](https://ceccopiera
 ```bash
 pip3 install --upgrade pyTermTk
 ```
-
+Install from the dev branch:
+```bash
+pip install --upgrade git+https://github.com/ceccopierangiolieugenio/pyTermTk.git#subdirectory=libs/pyTermTk
+```
 ## Quick Test/Try - no install required
 
 #### Clone

apps/dumbPaintTool/dumbPaintTool/app/paintarea.py

@@ -57,7 +57,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.setTrans(ttk.TTkColor.bg('#FF00FF'))
         self.resizeCanvas(*glbls.documentSize)
-        self.setFocusPolicy(ttk.TTkK.ClickFocus + ttk.TTkK.TabFocus)
+        self.setFocusPolicy(ttk.TTkK.ClickFocus | ttk.TTkK.TabFocus)
 
         glbls.brush.toolTypeChanged.connect(self.setTool)
         glbls.brush.areaChanged.connect(    self.setAreaBrush)

apps/dumbPaintTool/main.py

@@ -22,7 +22,7 @@
 # SOFTWARE.
 
 import sys,os
-sys.path.append(os.path.join(sys.path[0],'../../'))
+sys.path.append(os.path.join(sys.path[0],'../../libs/pyTermTk'))
 
 from dumbPaintTool.app import main
 

apps/perspectivator/perspectivator.pil.py

@@ -33,7 +33,7 @@
 
 from PIL import Image, ImageDraw, ImageFilter, ImageChops, ImageOps
 
-sys.path.append(os.path.join(sys.path[0],'../..'))
+sys.path.append(os.path.join(sys.path[0],'../../libs/pyTermTk'))
 
 import TermTk as ttk
 

apps/ttkDesigner/ttkDesigner/app/menuBarEditor.py

@@ -172,7 +172,7 @@ def __init__(self, menuButton, designer, **kwargs):
         super().__init__(**kwargs)
         self.layout().addWidget(self._btnAddSpacer)
         self.layout().addWidget(self._btnAddMenu  )
-        self.setFocusPolicy(ttk.TTkK.ClickFocus + ttk.TTkK.TabFocus)
+        self.setFocusPolicy(ttk.TTkK.ClickFocus | ttk.TTkK.TabFocus)
         self.viewChanged.connect(self._viewChangedHandler)
         self._btnAddSpacer.clicked.connect(self.addSpacer)
         self._btnAddMenu.clicked.connect(self.addMenu)

demo/games/breakout/main.py

@@ -25,7 +25,7 @@
 import sys, os, math
 from dataclasses import dataclass
 
-sys.path.append(os.path.join(sys.path[0],'../../..'))
+sys.path.append(os.path.join(sys.path[0],'../../../libs/pyTermTk'))
 import TermTk as ttk
 
 @dataclass

demo/games/breakoutrl/main.py

@@ -25,7 +25,7 @@
 import sys, os
 from random import randint
 
-sys.path.append(os.path.join(sys.path[0],'../../..'))
+sys.path.append(os.path.join(sys.path[0],'../../../libs/pyTermTk'))
 import TermTk as ttk
 
 from bolib import *