From 2cb1d88b9499527192e1b027c07e7c1d66447ee8 Mon Sep 17 00:00:00 2001 From: Thibault Derousseaux <6574550+tibdex@users.noreply.github.com> Date: Tue, 14 Oct 2025 19:52:54 -0400 Subject: [PATCH 1/3] Fix Conda packages --- .github/workflows/cross-platform-build.yaml | 8 +++---- .../workflows/platform-specific-build.yaml | 22 +++++++++---------- conda.recipe/conda_build_config.yaml | 6 ----- conda.recipe/meta.yaml | 3 --- 4 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 conda.recipe/conda_build_config.yaml diff --git a/.github/workflows/cross-platform-build.yaml b/.github/workflows/cross-platform-build.yaml index 3226016f..378ee376 100644 --- a/.github/workflows/cross-platform-build.yaml +++ b/.github/workflows/cross-platform-build.yaml @@ -8,11 +8,11 @@ jobs: fail-fast: false matrix: runner: - - macos-15-intel + # - macos-15-intel - macos-26 - - ubuntu-24.04 - - ubuntu-24.04-arm64 # GitHub-hosted larger runner in the ActiveViam organization. - - windows-2025 + # - ubuntu-24.04 + # - ubuntu-24.04-arm64 # GitHub-hosted larger runner in the ActiveViam organization. + # - windows-2025 uses: ./.github/workflows/platform-specific-build.yaml with: runner: ${{ matrix.runner }} diff --git a/.github/workflows/platform-specific-build.yaml b/.github/workflows/platform-specific-build.yaml index 4ea3b34f..f1c16666 100644 --- a/.github/workflows/platform-specific-build.yaml +++ b/.github/workflows/platform-specific-build.yaml @@ -37,14 +37,14 @@ jobs: - run: rm artifact.tar shell: bash - build-python-wheel: - name: Build Python wheel on ${{ inputs.runner }} - needs: build-java-runtime - runs-on: ${{ inputs.runner }} - steps: - - uses: actions/checkout@v5 - - uses: ./.github/actions/install-java-runtime - - uses: astral-sh/setup-uv@v6 - with: - version-file: pyproject.toml - - uses: ./.github/actions/build-python-wheel + # build-python-wheel: + # name: Build Python wheel on ${{ inputs.runner }} + # needs: build-java-runtime + # runs-on: ${{ inputs.runner }} + # steps: + # - uses: actions/checkout@v5 + # - uses: ./.github/actions/install-java-runtime + # - uses: astral-sh/setup-uv@v6 + # with: + # version-file: pyproject.toml + # - uses: ./.github/actions/build-python-wheel diff --git a/conda.recipe/conda_build_config.yaml b/conda.recipe/conda_build_config.yaml deleted file mode 100644 index 67948170..00000000 --- a/conda.recipe/conda_build_config.yaml +++ /dev/null @@ -1,6 +0,0 @@ -python: - - "3.10" - - "3.11" - - "3.12" - - "3.13" - - "3.14" diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 636ca595..0ab17666 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -14,10 +14,7 @@ build: requirements: build: - - python - "uv {{ pyproject["tool"]["uv"]["required-version"] }}" - run: - - python # See https://github.com/activeviam/jdk4py/issues/34. test: source_files: From 29ef2abd31da5e6e7e4540818c368e6687bda425 Mon Sep 17 00:00:00 2001 From: Thibault Derousseaux <6574550+tibdex@users.noreply.github.com> Date: Tue, 14 Oct 2025 20:00:05 -0400 Subject: [PATCH 2/3] fixup! Fix Conda packages --- .github/workflows/test.yaml | 22 +++++++++++----------- conda.recipe/conda_build_config.yaml | 2 ++ conda.recipe/meta.yaml | 7 +++++++ 3 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 conda.recipe/conda_build_config.yaml diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 98a042bc..6c4fbccb 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,14 +7,14 @@ jobs: build: uses: ./.github/workflows/cross-platform-build.yaml - test: - name: Test - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v5 - - uses: ./.github/actions/build-java-runtime - - run: uv run ruff format --check - - run: uv run ruff check - - run: uv run ty check - # This is also tested on all supported OS/arch combinations by `conda build`. - - run: uv run pytest + # test: + # name: Test + # runs-on: ubuntu-24.04 + # steps: + # - uses: actions/checkout@v5 + # - uses: ./.github/actions/build-java-runtime + # - run: uv run ruff format --check + # - run: uv run ruff check + # - run: uv run ty check + # # This is also tested on all supported OS/arch combinations by `conda build`. + # - run: uv run pytest diff --git a/conda.recipe/conda_build_config.yaml b/conda.recipe/conda_build_config.yaml new file mode 100644 index 00000000..0c292bc9 --- /dev/null +++ b/conda.recipe/conda_build_config.yaml @@ -0,0 +1,2 @@ +python: + - "3.10" diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 0ab17666..4d3e599a 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -9,12 +9,19 @@ source: path: ../ build: + # See https://github.com/conda/conda-build/issues/3956#issuecomment-845711269. + ignore_run_exports: + - python_abi include_recipe: False script: "uv pip install ." requirements: build: + - python - "uv {{ pyproject["tool"]["uv"]["required-version"] }}" + run: + # See https://github.com/activeviam/jdk4py/issues/34. + - python test: source_files: From f8c545a34732869efbaf447f4acd2dbb2754b046 Mon Sep 17 00:00:00 2001 From: Thibault Derousseaux <6574550+tibdex@users.noreply.github.com> Date: Tue, 14 Oct 2025 20:15:43 -0400 Subject: [PATCH 3/3] fixup! Fix Conda packages --- .github/workflows/cross-platform-build.yaml | 8 +++---- .../workflows/platform-specific-build.yaml | 22 +++++++++---------- .github/workflows/test.yaml | 22 +++++++++---------- conda.recipe/conda_build_config.yaml | 4 ++++ 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/.github/workflows/cross-platform-build.yaml b/.github/workflows/cross-platform-build.yaml index 378ee376..3226016f 100644 --- a/.github/workflows/cross-platform-build.yaml +++ b/.github/workflows/cross-platform-build.yaml @@ -8,11 +8,11 @@ jobs: fail-fast: false matrix: runner: - # - macos-15-intel + - macos-15-intel - macos-26 - # - ubuntu-24.04 - # - ubuntu-24.04-arm64 # GitHub-hosted larger runner in the ActiveViam organization. - # - windows-2025 + - ubuntu-24.04 + - ubuntu-24.04-arm64 # GitHub-hosted larger runner in the ActiveViam organization. + - windows-2025 uses: ./.github/workflows/platform-specific-build.yaml with: runner: ${{ matrix.runner }} diff --git a/.github/workflows/platform-specific-build.yaml b/.github/workflows/platform-specific-build.yaml index f1c16666..4ea3b34f 100644 --- a/.github/workflows/platform-specific-build.yaml +++ b/.github/workflows/platform-specific-build.yaml @@ -37,14 +37,14 @@ jobs: - run: rm artifact.tar shell: bash - # build-python-wheel: - # name: Build Python wheel on ${{ inputs.runner }} - # needs: build-java-runtime - # runs-on: ${{ inputs.runner }} - # steps: - # - uses: actions/checkout@v5 - # - uses: ./.github/actions/install-java-runtime - # - uses: astral-sh/setup-uv@v6 - # with: - # version-file: pyproject.toml - # - uses: ./.github/actions/build-python-wheel + build-python-wheel: + name: Build Python wheel on ${{ inputs.runner }} + needs: build-java-runtime + runs-on: ${{ inputs.runner }} + steps: + - uses: actions/checkout@v5 + - uses: ./.github/actions/install-java-runtime + - uses: astral-sh/setup-uv@v6 + with: + version-file: pyproject.toml + - uses: ./.github/actions/build-python-wheel diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6c4fbccb..98a042bc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,14 +7,14 @@ jobs: build: uses: ./.github/workflows/cross-platform-build.yaml - # test: - # name: Test - # runs-on: ubuntu-24.04 - # steps: - # - uses: actions/checkout@v5 - # - uses: ./.github/actions/build-java-runtime - # - run: uv run ruff format --check - # - run: uv run ruff check - # - run: uv run ty check - # # This is also tested on all supported OS/arch combinations by `conda build`. - # - run: uv run pytest + test: + name: Test + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v5 + - uses: ./.github/actions/build-java-runtime + - run: uv run ruff format --check + - run: uv run ruff check + - run: uv run ty check + # This is also tested on all supported OS/arch combinations by `conda build`. + - run: uv run pytest diff --git a/conda.recipe/conda_build_config.yaml b/conda.recipe/conda_build_config.yaml index 0c292bc9..67948170 100644 --- a/conda.recipe/conda_build_config.yaml +++ b/conda.recipe/conda_build_config.yaml @@ -1,2 +1,6 @@ python: - "3.10" + - "3.11" + - "3.12" + - "3.13" + - "3.14"