From cb6df57f3f25bca6346a9d308d59f2e954dc402c Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Mon, 17 Apr 2023 21:55:13 -0400 Subject: [PATCH 1/6] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c02476f2..93906692 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,7 @@ jobs: if: matrix.os == 'macos-latest' - name: Install Requirements - run: python3 -m pip install --upgrade pip && pip3 install wheel && pip3 install -r requirements.txt && pip3 uninstall -y typing && pip3 uninstall -y charset_normalizer + run: python3 -m pip install --upgrade pip && pip3 install wheel && pip3 install -r requirements.txt && pip3 uninstall -y typing - name: Build Wheel run: python3 setup.py bdist_wheel From af295a1a665b3b2c77c7f4a1b66d074ca3a05282 Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Mon, 17 Apr 2023 22:11:50 -0400 Subject: [PATCH 2/6] Try new version of python --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 93906692..ac967de2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,9 +41,9 @@ jobs: - name: Setup Python MacOS run: | - wget https://www.python.org/ftp/python/3.9.2/python-3.9.2-macos11.pkg - sudo installer -verbose -pkg ./python-3.9.2-macos11.pkg -target / - echo "/Library/Frameworks/Python.framework/Versions/3.9/bin" >> $GITHUB_PATH + wget https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg + sudo installer -verbose -pkg ./python-3.10.11-macos11.pkg -target / + echo "/Library/Frameworks/Python.framework/Versions/3.10/bin" >> $GITHUB_PATH if: matrix.os == 'macos-latest' - name: Install Requirements From d4abb640c9418d96c0505486e21e068dcafcfd5a Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Mon, 17 Apr 2023 22:18:37 -0400 Subject: [PATCH 3/6] Maybe this will work? --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ac967de2..e964da0c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,6 +62,9 @@ jobs: - name: Run Pyinstaller run: | + pip3 uninstall charset_normalizer + git clone https://github.com/Ousret/charset_normalizer.git + pip3 install -e charset_normalizer python3 version.py pyinstaller pros.spec pyinstaller --onefile pros/cli/compile_commands/intercept-cc.py --name=intercept-cc From d9bbf395972aa4782bf7ff27a45634cf326be7b8 Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Mon, 17 Apr 2023 22:20:13 -0400 Subject: [PATCH 4/6] We try again --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e964da0c..c45a2c4c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,9 +62,6 @@ jobs: - name: Run Pyinstaller run: | - pip3 uninstall charset_normalizer - git clone https://github.com/Ousret/charset_normalizer.git - pip3 install -e charset_normalizer python3 version.py pyinstaller pros.spec pyinstaller --onefile pros/cli/compile_commands/intercept-cc.py --name=intercept-cc @@ -73,6 +70,9 @@ jobs: - name: Run Pyinstaller MacOS run: | + pip3 uninstall charset_normalizer + git clone https://github.com/Ousret/charset_normalizer.git + pip3 install -e -y charset_normalizer python3 version.py pyinstaller pros-macos.spec pyinstaller --onefile pros/cli/compile_commands/intercept-cc.py --name=intercept-cc --target-arch=universal2 From 60bb6a4f8b820f4c5424f67538de7ad0e00fec2d Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Mon, 17 Apr 2023 22:22:07 -0400 Subject: [PATCH 5/6] Make the uninstall work --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c45a2c4c..40543c78 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,7 +70,7 @@ jobs: - name: Run Pyinstaller MacOS run: | - pip3 uninstall charset_normalizer + pip3 uninstall -y charset_normalizer git clone https://github.com/Ousret/charset_normalizer.git pip3 install -e -y charset_normalizer python3 version.py From d05d2e899360edbf7adbd1e20a954f503e6f092b Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Mon, 17 Apr 2023 22:27:20 -0400 Subject: [PATCH 6/6] Work --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 40543c78..1d597153 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -72,7 +72,7 @@ jobs: run: | pip3 uninstall -y charset_normalizer git clone https://github.com/Ousret/charset_normalizer.git - pip3 install -e -y charset_normalizer + pip3 install -e ./charset_normalizer python3 version.py pyinstaller pros-macos.spec pyinstaller --onefile pros/cli/compile_commands/intercept-cc.py --name=intercept-cc --target-arch=universal2