From 310fb6cd4daad0d8a134d4f136fad4912249ff6c Mon Sep 17 00:00:00 2001 From: Benedikt Reinartz Date: Sat, 18 Apr 2026 19:54:26 +0200 Subject: [PATCH 1/3] Update clr-loader for better find_mono --- pyproject.toml | 2 +- uv.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 59d4d107a..fce85989e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ license = "MIT" readme = "README.rst" dependencies = [ - "clr_loader>=0.3.0,<0.4.0" + "clr_loader>=0.3.1,<0.4.0" ] requires-python = ">=3.10, <3.15" diff --git a/uv.lock b/uv.lock index 8f5ccb4c4..6ae72a583 100644 --- a/uv.lock +++ b/uv.lock @@ -90,14 +90,14 @@ wheels = [ [[package]] name = "clr-loader" -version = "0.3.0" +version = "0.3.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "cffi" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/fe/56/0fb4f734a5b2574b9b75157eabef64e5e2ceaf44b759306034e8b1452e62/clr_loader-0.3.0.tar.gz", hash = "sha256:b880e0821cdc18f9bf9f05e5130e966cc78fa75edc7432baf4fa4711e8412b05", size = 84710, upload-time = "2026-03-03T00:41:51.314Z" } +sdist = { url = "https://files.pythonhosted.org/packages/e4/46/7eea92b6aa2d68af78e049cbecec5f757f1aad44ecdecdc16bbad7eead51/clr_loader-0.3.1.tar.gz", hash = "sha256:2e073e9aaf49d1ae2f56ecba27987ad5fb68be4bcd9dd34a5bed8f0e4e128366", size = 86805, upload-time = "2026-04-18T17:49:44.287Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/a2/07/6c965da95ef2b7410f1314cdfe462efdf9722bfd7fbfe6945564b8b0467a/clr_loader-0.3.0-py3-none-any.whl", hash = "sha256:d918467eb1077d23b48b0b7e9b6379e8fbf20b573832839a41cec1e06dad2beb", size = 57431, upload-time = "2026-03-03T00:41:06.554Z" }, + { url = "https://files.pythonhosted.org/packages/5e/da/ec1a6e36624000b6df0dd61183c42342ee5814c073315e802cadaad04d2f/clr_loader-0.3.1-py3-none-any.whl", hash = "sha256:cbad189de20d202a7d621956b0fc38049e13c9bf7ca2923441eff725cd121aa1", size = 55730, upload-time = "2026-04-18T17:49:42.99Z" }, ] [[package]] @@ -385,7 +385,7 @@ dev = [ ] [package.metadata] -requires-dist = [{ name = "clr-loader", specifier = ">=0.3.0,<0.4.0" }] +requires-dist = [{ name = "clr-loader", specifier = ">=0.3.1,<0.4.0" }] [package.metadata.requires-dev] dev = [ From 9a81dd4575da398ef79865b1a06f0b3ad1831b17 Mon Sep 17 00:00:00 2001 From: Benedikt Reinartz Date: Sat, 18 Apr 2026 19:54:45 +0200 Subject: [PATCH 2/3] Drop local install-mono copy --- .github/actions/install-mono/action.yml | 78 ------------------------- .github/workflows/main.yml | 16 +---- 2 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 .github/actions/install-mono/action.yml diff --git a/.github/actions/install-mono/action.yml b/.github/actions/install-mono/action.yml deleted file mode 100644 index f414afdc7..000000000 --- a/.github/actions/install-mono/action.yml +++ /dev/null @@ -1,78 +0,0 @@ -name: 'Install Mono' -description: 'Install Mono' -branding: - icon: package - color: blue -inputs: - arch: - description: Architecture to install for - required: true -runs: - using: "composite" - steps: - # Windows Cache - - name: Cache setup on Windows - if: runner.os == 'Windows' - run: | - mkdir -p .choco-cache - choco config set cacheLocation $(pwd)/.choco-cache - shell: bash - - - name: Cache on Windows - if: runner.os == 'Windows' - uses: actions/cache@v5 - with: - path: .choco-cache - key: mono-${{ runner.os }}-${{ inputs.arch }} - - # macOS Cache - - name: Set Homebrew Cache Path - if: runner.os == 'macOS' - run: | - mkdir -p .brew-cache - echo "HOMEBREW_CACHE=$(pwd)/.brew-cache" >> $GITHUB_ENV - shell: bash - - - name: Cache Homebrew on macOS - if: runner.os == 'macOS' - uses: actions/cache@v5 - with: - path: .brew-cache - key: mono-brew-${{ runner.os }}-${{ inputs.arch }} - - # =================================== - - - name: Install on Linux - if: runner.os == 'Linux' - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: mono-runtime-sgen - - # =================================== - - - name: Install on Windows (x86) - if: runner.os == 'Windows' && inputs.arch == 'x86' - run: choco install --x86 -y mono - shell: sh - - - name: Install on Windows - if: runner.os == 'Windows' && inputs.arch != 'x86' - run: choco install -y mono - shell: sh - - # =================================== - # - - name: Install on macOS (x86_64) - if: runner.os == 'macOS' && inputs.arch == 'x64' - run: | - arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - arch -x86_64 /usr/local/bin/brew install --ignore-dependencies mono - shell: sh - - - name: Install on macOS (arm64) - if: runner.os == 'macOS' && inputs.arch != 'x64' - run: | - brew update - brew install --ignore-dependencies mono - shell: sh - diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b2fd96863..8ead06fba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,20 +55,6 @@ jobs: platform: x86 python: "3.10" - # Broken ctypes find_library - - os: - category: macos - platform: arm64 - python: '3.10' - - os: - category: macos - platform: arm64 - python: '3.11' - - os: - category: macos - platform: arm64 - python: '3.12' - # Fails to find pytest - os: category: windows @@ -97,7 +83,7 @@ jobs: - run: dotnet restore - name: Install Mono - uses: ./.github/actions/install-mono + uses: pythonnet/clr-loader/.github/actions/install-mono@main with: arch: ${{ matrix.os.platform }} From da22396bddc07bea84ea05a5c2668ba80c33f8a4 Mon Sep 17 00:00:00 2001 From: Benedikt Reinartz Date: Sat, 18 Apr 2026 19:56:10 +0200 Subject: [PATCH 3/3] Update action --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3937d85e0..e892009f2 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -37,4 +37,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v5