From 2e07f90baf9575c4c04cd70143881dc664f9b957 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 3 Nov 2022 14:54:18 +0530 Subject: [PATCH] ... --- .github/workflows/ci.yml | 9 +-------- kitty_tests/main.py | 1 + 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 961b63b19..74f18faaf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,17 +80,10 @@ jobs: - name: Test for trailing whitespace run: if grep -Inr '\s$' kitty kitty_tests kittens docs *.py *.asciidoc *.rst *.go .gitattributes .gitignore; then echo Trailing whitespace found, aborting.; exit 1; fi -<<<<<<< HEAD - - name: Set up Python - uses: actions/setup-python@v3 - with: - python-version: "3.10" -======= - name: Set up Python uses: actions/setup-python@v3 with: - python-version: 3.9 ->>>>>>> 359bf535d (Install Go 1.18 on CI) + python-version: "3.10" - name: Install Go uses: actions/setup-go@v3 diff --git a/kitty_tests/main.py b/kitty_tests/main.py index 0c26f9b31..0cba7072a 100644 --- a/kitty_tests/main.py +++ b/kitty_tests/main.py @@ -7,6 +7,7 @@ import re import shlex import shutil import subprocess +import sys import unittest from contextlib import contextmanager from functools import lru_cache