From a5988684227699116d6b34fb15b6d68f2031a341 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:05:29 -0500 Subject: [PATCH 1/2] Try setting macos deployment target --- rust/.github/workflows/build.yml.jinja | 2 ++ rust/pyproject.toml.jinja | 3 +++ 2 files changed, 5 insertions(+) diff --git a/rust/.github/workflows/build.yml.jinja b/rust/.github/workflows/build.yml.jinja index d099fcf..cb2a20c 100644 --- a/rust/.github/workflows/build.yml.jinja +++ b/rust/.github/workflows/build.yml.jinja @@ -117,6 +117,8 @@ jobs: run: | make dist-py-wheel make dist-check + env: + MACOS_DEPLOYMENT_TARGET: 10.12 if: matrix.os != 'ubuntu-latest' - uses: actions/upload-artifact@v4 diff --git a/rust/pyproject.toml.jinja b/rust/pyproject.toml.jinja index 3965b53..5db1dbb 100644 --- a/rust/pyproject.toml.jinja +++ b/rust/pyproject.toml.jinja @@ -115,6 +115,9 @@ exclude_also = [ ignore_errors = true fail_under = 50 +[tool.maturin] +include = [{ path = "rust/**/*", format = "sdist" }] + [tool.pytest.ini_options] addopts = ["-vvv", "--junitxml=junit.xml"] asyncio_mode = "strict" From f890aad6fefae100dd687bfcd235b7a0874da8bf Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:07:03 -0500 Subject: [PATCH 2/2] add rust dependabot --- rust/.github/dependabot.yml | 9 +++++++++ rust/.github/workflows/build.yml.jinja | 2 +- rust/pyproject.toml.jinja | 4 +--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/rust/.github/dependabot.yml b/rust/.github/dependabot.yml index 42cac77..39e4d07 100644 --- a/rust/.github/dependabot.yml +++ b/rust/.github/dependabot.yml @@ -14,3 +14,12 @@ updates: labels: - "lang: python" - "part: dependencies" + + - package-ecosystem: "cargo" + directory: "/" + schedule: + interval: "monthly" + labels: + - "lang: rust" + - "part: dependencies" + diff --git a/rust/.github/workflows/build.yml.jinja b/rust/.github/workflows/build.yml.jinja index cb2a20c..a7ec976 100644 --- a/rust/.github/workflows/build.yml.jinja +++ b/rust/.github/workflows/build.yml.jinja @@ -118,7 +118,7 @@ jobs: make dist-py-wheel make dist-check env: - MACOS_DEPLOYMENT_TARGET: 10.12 + CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=11.0 if: matrix.os != 'ubuntu-latest' - uses: actions/upload-artifact@v4 diff --git a/rust/pyproject.toml.jinja b/rust/pyproject.toml.jinja index 5db1dbb..565d073 100644 --- a/rust/pyproject.toml.jinja +++ b/rust/pyproject.toml.jinja @@ -96,6 +96,7 @@ archs = "x86_64" [tool.cibuildwheel.macos] archs = "x86_64 arm64" +environment = {MACOS_DEPLOYMENT_TARGET=11.0} [tool.cibuildwheel.windows] environment = {PATH="$UserProfile\\.cargo\bin;$PATH"} @@ -115,9 +116,6 @@ exclude_also = [ ignore_errors = true fail_under = 50 -[tool.maturin] -include = [{ path = "rust/**/*", format = "sdist" }] - [tool.pytest.ini_options] addopts = ["-vvv", "--junitxml=junit.xml"] asyncio_mode = "strict"