From fb3d2ee752d8b516cda707503b6cb4ff7bc2c9bc Mon Sep 17 00:00:00 2001 From: Fabian Arndt Date: Fri, 10 Jan 2025 23:59:54 +0100 Subject: [PATCH] CI: Fix "protonfixes" module resolution --- .github/workflows/ci.yml | 9 ++++++--- pyproject.toml | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c262cd1..37b70cce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,12 @@ jobs: pip install trio pip install "git+https://github.com/njbooher/steam.git@wsproto#egg=steam[client]" + # PyRight, the unit tests, and other scripts import/resolve the "protonfixes" module + # We are using the path "umu-protonfixes", which isn't a valid module name and can't be used + # However: this simple, hacky symbolic link in the parent folder can fix this inconvenience + - name: Fix python module resolution + run: ln -rs . ../protonfixes + # FIXME: problem matcher is currently disabled upstream, using a fork for the moment # https://github.com/ludeeus/action-shellcheck/pull/103 # FIXME: symlinks don't work upstream @@ -56,9 +62,6 @@ jobs: - name: Validate gamefix imports run: | - cd .. - ln -s umu-protonfixes protonfixes - cd protonfixes python3 .github/scripts/check_imports.py - name: Test with unittest diff --git a/pyproject.toml b/pyproject.toml index 41902dc3..72a240a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,6 +17,7 @@ exclude = [ "subprojects", "verbs" ] +extraPaths = [ ".." ] # Fix "protonfixes" module resolution pythonVersion = "3.9" pythonPlatform = "Linux"