From 179c8f81229038ce8c8524a7f0f3c149656f266d Mon Sep 17 00:00:00 2001 From: Lukas Rothenberger Date: Fri, 12 Jul 2024 13:24:01 +0200 Subject: [PATCH] chore(CI): move to python 3.10 --- .github/workflows/ci.yml | 6 +++--- .../screens/widgets/ScrollableText.py | 5 +++-- test/utils/subprocess_wrapper/command_execution_wrapper.py | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aca972912..bee5e9422 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: '3.10' cache: 'pip' # uses requirements.txt - name: Install Python dependencies @@ -76,7 +76,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: '3.10' cache: 'pip' # uses requirements.txt - name: Install Python dependencies @@ -123,7 +123,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: '3.10' cache: 'pip' # uses requirements.txt - name: Install Python dependencies diff --git a/DEPRECATED_discopop_wizard/screens/widgets/ScrollableText.py b/DEPRECATED_discopop_wizard/screens/widgets/ScrollableText.py index 775be77e3..51681dae7 100644 --- a/DEPRECATED_discopop_wizard/screens/widgets/ScrollableText.py +++ b/DEPRECATED_discopop_wizard/screens/widgets/ScrollableText.py @@ -7,14 +7,15 @@ # directory for details. import tkinter as tk -from tkinter import ttk +from tkinter import Tk, ttk +from typing import Union class ScrollableTextWidget(object): frame: tk.Frame text_container: tk.Text - def __init__(self, parent_frame): + def __init__(self, parent_frame: Union[tk.Frame, Tk]): self.frame = ttk.Frame(parent_frame) # type: ignore self.frame.pack(fill=tk.BOTH, expand=True) self.frame.rowconfigure(0, weight=1) diff --git a/test/utils/subprocess_wrapper/command_execution_wrapper.py b/test/utils/subprocess_wrapper/command_execution_wrapper.py index b7e61e505..93ca4e370 100644 --- a/test/utils/subprocess_wrapper/command_execution_wrapper.py +++ b/test/utils/subprocess_wrapper/command_execution_wrapper.py @@ -9,6 +9,6 @@ def run_cmd(cmd: str, cwd: str, env): executable="/bin/bash", shell=True, env=env, -# stdout=subprocess.DEVNULL, -# stderr=subprocess.DEVNULL, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, )