diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ee03d76..4538b8d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,9 +67,9 @@ jobs: echo '::group::Retrieve the Versions' # Update version in the project - _VERSION_TTK=$(jq '.["libs/pyTermTk"]' .release-please-manifest.json) - _VERSION_DPT=$(jq '.["apps/dumbPaintTool"]' .release-please-manifest.json) - _VERSION_T_D=$(jq '.["apps/ttkDesigner"]' .release-please-manifest.json) + _VERSION_TTK=$(jq -r '.["libs/pyTermTk"]' .release-please-manifest.json) + _VERSION_DPT=$(jq -r '.["apps/dumbPaintTool"]' .release-please-manifest.json) + _VERSION_T_D=$(jq -r '.["apps/ttkDesigner"]' .release-please-manifest.json) echo "Version TermTk: ${_VERSION_TTK}" echo "Version dumbPaintTool: ${_VERSION_DPT}" echo "Version ttkDesigner: ${_VERSION_T_D}" @@ -77,20 +77,19 @@ jobs: echo '::group::Update the Versions' sed -i \ - "s|__version__:str.*|__version__:str = ${_VERSION_TTK}|" \ + "s|__version__:str.*|__version__:str = '${_VERSION_TTK}'|" \ libs/pyTermTk/TermTk/__init__.py sed -i \ - "s|__version__:str.*|__version__:str = ${_VERSION_DPT}|" \ + "s|__version__:str.*|__version__:str = '${_VERSION_DPT}'|" \ apps/dumbPaintTool/dumbPaintTool/__init__.py sed -i \ - "s|__version__:str.*|__version__:str = ${_VERSION_T_D}|" \ + "s|__version__:str.*|__version__:str = '${_VERSION_T_D}'|" \ apps/ttkDesigner/ttkDesigner/__init__.py # Update required version in any pyproject.toml # that depend on pyTermTk find . -name pyproject.toml | - xargs sed -i \ - "s|'pyTermTk >= [^']*'|'pyTermTk >= ${_VERSION_TTK}'|" + xargs sed "s|'pyTermTk *>=[^']*'|'pyTermTk>=${_VERSION_TTK}'|" -i cp libs/pyTermTk/CHANGELOG.md CHANGELOG.md echo '::endgroup::' diff --git a/apps/dumbPaintTool/pyproject.toml b/apps/dumbPaintTool/pyproject.toml index f30fc880..8baf0bb1 100644 --- a/apps/dumbPaintTool/pyproject.toml +++ b/apps/dumbPaintTool/pyproject.toml @@ -12,7 +12,7 @@ authors = [ ] requires-python = ">=3.9" dependencies = [ - 'pyTermTk >= "0.41.16-a.0"', + 'pyTermTk >= 0.41.16-a.0', 'pyperclip', 'Pillow', ] diff --git a/multiplexers/workbench/main.py b/multiplexers/workbench/main.py index ab91a326..d0194f7e 100755 --- a/multiplexers/workbench/main.py +++ b/multiplexers/workbench/main.py @@ -126,7 +126,6 @@ clipboard = ttk.TTkClipboard() ttk.pyTTkSlot() def _openTerminal(term=[]): - global clipboard _x,_y = 15,5 while (_x,_y) in [_t['pos'] for _t in term]: _x += 4 diff --git a/tests/t.pty/test.pty.006.terminal.06.py b/tests/t.pty/test.pty.006.terminal.06.py index 91f0d152..1221a20f 100755 --- a/tests/t.pty/test.pty.006.terminal.06.py +++ b/tests/t.pty/test.pty.006.terminal.06.py @@ -71,7 +71,6 @@ tnum = 0 @ttk.pyTTkSlot() def _addTerminal(): global tnum - global clipboard tnum+=1 win = ttk.TTkWindow(pos=(12,0), size=(100,30), title=f"Terminallo n.{tnum}", border=True, layout=ttk.TTkVBoxLayout(), flags = ttk.TTkK.WindowFlag.WindowMinMaxButtonsHint|ttk.TTkK.WindowFlag.WindowCloseButtonHint) term = ttk.TTkTerminal(parent=win) diff --git a/tests/t.pty/test.pty.006.terminal.07.py b/tests/t.pty/test.pty.006.terminal.07.py index 4357186f..b0bac594 100755 --- a/tests/t.pty/test.pty.006.terminal.07.py +++ b/tests/t.pty/test.pty.006.terminal.07.py @@ -71,7 +71,6 @@ tnum = 0 @ttk.pyTTkSlot() def _addTerminal(): global tnum - global clipboard tnum+=1 win = ttk.TTkWindow(pos=(12,0), size=(100,30), title=f"Terminallo n.{tnum}", border=True, layout=ttk.TTkVBoxLayout(), flags = ttk.TTkK.WindowFlag.WindowMinMaxButtonsHint|ttk.TTkK.WindowFlag.WindowCloseButtonHint) term = ttk.TTkTerminal(parent=win)