From 82b96759a49282f4b16afcb9390b13f444b82eb5 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 9 Oct 2024 09:05:41 +0200 Subject: [PATCH 1/2] Fix cython non-windows installation --- ports/py-cython/portfile.cmake | 4 ++-- ports/py-cython/vcpkg.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/py-cython/portfile.cmake b/ports/py-cython/portfile.cmake index 96be858..fb21ede 100644 --- a/ports/py-cython/portfile.cmake +++ b/ports/py-cython/portfile.cmake @@ -11,8 +11,8 @@ vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") if(NOT VCPKG_TARGET_IS_WINDOWS) - vcpkg_copy_tools(TOOL_NAMES cygdb cython cythonize DESTINATION "${CURRENT_PACKAGES_DIR}/${VCPKG_PYTHON3_SCRIPTS}" AUTO_CLEAN) + vcpkg_copy_tools(TOOL_NAMES cygdb cython cythonize DESTINATION "${CURRENT_PACKAGES_DIR}/tools/python3" AUTO_CLEAN) endif() set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) \ No newline at end of file +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) diff --git a/ports/py-cython/vcpkg.json b/ports/py-cython/vcpkg.json index ac4c3ef..59b9afb 100644 --- a/ports/py-cython/vcpkg.json +++ b/ports/py-cython/vcpkg.json @@ -1,6 +1,7 @@ { "name": "py-cython", "version": "3.0.5", + "port-version": 1, "description": "Cython is a Python compiler that makes writing C extensions for Python as easy as Python itself. Cython is based on Pyrex, but supports more cutting edge functionality and optimizations.", "homepage": "https://cython.org/", "license": "Apache-2.0", From 2ff98d43c4eb1a90c5c1d394a7014534ad9fd1f1 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 9 Oct 2024 09:06:19 +0200 Subject: [PATCH 2/2] Enable numpy tesst --- .github/workflows/macos.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 5560d8e..d0f396d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -68,6 +68,7 @@ jobs: VCPKG_OPTIONS="--overlay-ports="${{ github.workspace }}/ports" --host-triplet=${{ matrix.triplet }} --triplet=${{ matrix.triplet }} --x-buildtrees-root=${{ env.buildtrees }}" ./vcpkg/vcpkg install $VCPKG_OPTIONS py-pip ./vcpkg/vcpkg install $VCPKG_OPTIONS py-sip + ./vcpkg/vcpkg install $VCPKG_OPTIONS py-numpy # ./vcpkg/vcpkg install $VCPKG_OPTIONS py-pyqt6 - name: 📑 Upload logs