From c6cc63ed80a48229467e3583a1d4ab4c7fd14ecd Mon Sep 17 00:00:00 2001 From: Nick Hastings Date: Sat, 15 Jun 2024 12:33:01 -0400 Subject: [PATCH 1/2] Update action and Python versions in CI style/format job --- .github/workflows/yapf.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/yapf.yml b/.github/workflows/yapf.yml index 845c1e87..6c3e2d7f 100644 --- a/.github/workflows/yapf.yml +++ b/.github/workflows/yapf.yml @@ -7,12 +7,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8] + python-version: [3.12] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install Dependencies From 7ebe68ff9ac505769400a41778c89c30c1fd73b3 Mon Sep 17 00:00:00 2001 From: Nick Hastings Date: Sat, 15 Jun 2024 12:39:17 -0400 Subject: [PATCH 2/2] Run yapf to appease style/format check --- ambuild2/frontend/cpp/msvc_utils.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ambuild2/frontend/cpp/msvc_utils.py b/ambuild2/frontend/cpp/msvc_utils.py index ab94bad8..b28a568b 100644 --- a/ambuild2/frontend/cpp/msvc_utils.py +++ b/ambuild2/frontend/cpp/msvc_utils.py @@ -255,12 +255,12 @@ def DetectInclusionPattern(text): def GetCodePage(): try: - stdout = subprocess.run( - "chcp", shell=True, - stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, - stdin=subprocess.DEVNULL - ).stdout - codec = 'cp'+re.match(b".+: (\d+)\s*$", stdout).group(1).decode() + stdout = subprocess.run("chcp", + shell = True, + stdout = subprocess.PIPE, + stderr = subprocess.DEVNULL, + stdin = subprocess.DEVNULL).stdout + codec = 'cp' + re.match(b".+: (\d+)\s*$", stdout).group(1).decode() codecs.lookup(codec) return codec except LookupError: