From 5280205d97a3cecbf6dd82efddef2df424358979 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 8 Oct 2024 10:52:58 +0200 Subject: [PATCH 1/5] Mass update --- ports/gdal/vcpkg.json | 39 +++--- ports/py-certifi/portfile.cmake | 16 +++ ports/py-certifi/vcpkg.json | 15 +++ ports/py-contourpy/copyright | 30 +++++ ports/py-contourpy/portfile.cmake | 12 ++ ports/py-contourpy/vcpkg.json | 17 +++ ports/py-cppy/portfile.cmake | 15 +++ ports/py-cppy/vcpkg.json | 14 ++ ports/py-cycler/portfile.cmake | 15 +++ ports/py-cycler/vcpkg.json | 15 +++ ports/py-dateutil/portfile.cmake | 16 +++ ports/py-dateutil/vcpkg.json | 15 +++ ports/py-fonttools/copyright | 30 +++++ ports/py-fonttools/portfile.cmake | 12 ++ ports/py-fonttools/vcpkg.json | 17 +++ ports/py-gpep517/portfile.cmake | 2 + ports/py-gpep517/vcpkg.json | 15 ++- ports/py-kiwisolver/portfile.cmake | 33 +++++ ports/py-kiwisolver/vcpkg.json | 15 +++ ports/py-matplotlib/portfile.cmake | 55 ++++++++ ports/py-matplotlib/vcpkg.json | 38 ++++++ ports/py-meson/portfile.cmake | 28 ++++ ports/py-meson/vcpkg-port-config.cmake | 3 + ports/py-meson/vcpkg.json | 33 +++++ .../vcpkg_mesonpy_prepare_build_options.cmake | 121 ++++++++++++++++++ ports/py-packaging/portfile.cmake | 8 +- ports/py-packaging/vcpkg.json | 9 +- ports/py-pillow/portfile.cmake | 28 ++++ ports/py-pillow/vcpkg.json | 31 +++++ ports/py-pip/portfile.cmake | 4 +- ports/py-pip/vcpkg.json | 3 +- ports/py-ply/portfile.cmake | 2 +- ports/py-ply/vcpkg.json | 2 +- ports/py-psycopg2/portfile.cmake | 8 +- ports/py-psycopg2/vcpkg.json | 42 +++--- ports/py-pyproject-metadata/portfile.cmake | 15 +++ ports/py-pyproject-metadata/vcpkg.json | 14 ++ ports/py-pyqt-builder/portfile.cmake | 6 +- ports/py-pyqt-builder/vcpkg.json | 2 +- ports/py-pyyaml/vcpkg.json | 36 +++--- ports/py-qscintilla/vcpkg.json | 6 +- ports/py-semantic-version/portfile.cmake | 12 ++ ports/py-semantic-version/vcpkg.json | 14 ++ ports/py-setuptools-scm/portfile.cmake | 43 +++++++ ports/py-setuptools-scm/vcpkg.json | 22 ++++ ports/py-sip/portfile.cmake | 2 +- ports/py-sip/vcpkg.json | 1 + ports/py-six/portfile.cmake | 15 +++ ports/py-six/vcpkg.json | 14 ++ ports/py-tomli/portfile.cmake | 15 +++ ports/py-tomli/vcpkg.json | 10 ++ ports/py-typing-extensions/portfile.cmake | 15 +++ ports/py-typing-extensions/vcpkg.json | 14 ++ ports/py-wheel/portfile.cmake | 8 +- ports/py-wheel/vcpkg.json | 7 +- ports/swig/vcpkg.json | 33 +++-- versions/baseline.json | 86 +++++++++++-- versions/g-/gdal.json | 5 + versions/p-/py-certifi.json | 9 ++ versions/p-/py-contourpy.json | 9 ++ versions/p-/py-cppy.json | 9 ++ versions/p-/py-cycler.json | 9 ++ versions/p-/py-dateutil.json | 9 ++ versions/p-/py-fonttools.json | 9 ++ versions/p-/py-gpep517.json | 5 + versions/p-/py-kiwisolver.json | 9 ++ versions/p-/py-matplotlib.json | 9 ++ versions/p-/py-meson.json | 9 ++ versions/p-/py-packaging.json | 5 + versions/p-/py-pillow.json | 9 ++ versions/p-/py-pip.json | 5 + versions/p-/py-ply.json | 5 + versions/p-/py-psycopg2.json | 5 + versions/p-/py-pyproject-metadata.json | 9 ++ versions/p-/py-pyqt-builder.json | 5 + versions/p-/py-pyyaml.json | 5 + versions/p-/py-qscintilla.json | 5 + versions/p-/py-semantic-version.json | 9 ++ versions/p-/py-setuptools-scm.json | 9 ++ versions/p-/py-sip.json | 5 + versions/p-/py-six.json | 9 ++ versions/p-/py-tomli.json | 9 ++ versions/p-/py-typing-extensions.json | 9 ++ versions/p-/py-wheel.json | 5 + versions/s-/swig.json | 5 + 85 files changed, 1230 insertions(+), 122 deletions(-) create mode 100755 ports/py-certifi/portfile.cmake create mode 100755 ports/py-certifi/vcpkg.json create mode 100755 ports/py-contourpy/copyright create mode 100755 ports/py-contourpy/portfile.cmake create mode 100755 ports/py-contourpy/vcpkg.json create mode 100755 ports/py-cppy/portfile.cmake create mode 100755 ports/py-cppy/vcpkg.json create mode 100755 ports/py-cycler/portfile.cmake create mode 100755 ports/py-cycler/vcpkg.json create mode 100755 ports/py-dateutil/portfile.cmake create mode 100755 ports/py-dateutil/vcpkg.json create mode 100755 ports/py-fonttools/copyright create mode 100755 ports/py-fonttools/portfile.cmake create mode 100755 ports/py-fonttools/vcpkg.json create mode 100755 ports/py-kiwisolver/portfile.cmake create mode 100755 ports/py-kiwisolver/vcpkg.json create mode 100755 ports/py-matplotlib/portfile.cmake create mode 100755 ports/py-matplotlib/vcpkg.json create mode 100755 ports/py-meson/portfile.cmake create mode 100755 ports/py-meson/vcpkg-port-config.cmake create mode 100755 ports/py-meson/vcpkg.json create mode 100755 ports/py-meson/vcpkg_mesonpy_prepare_build_options.cmake create mode 100755 ports/py-pillow/portfile.cmake create mode 100755 ports/py-pillow/vcpkg.json create mode 100755 ports/py-pyproject-metadata/portfile.cmake create mode 100755 ports/py-pyproject-metadata/vcpkg.json create mode 100755 ports/py-semantic-version/portfile.cmake create mode 100755 ports/py-semantic-version/vcpkg.json create mode 100755 ports/py-setuptools-scm/portfile.cmake create mode 100755 ports/py-setuptools-scm/vcpkg.json create mode 100755 ports/py-six/portfile.cmake create mode 100755 ports/py-six/vcpkg.json create mode 100755 ports/py-tomli/portfile.cmake create mode 100755 ports/py-tomli/vcpkg.json create mode 100755 ports/py-typing-extensions/portfile.cmake create mode 100755 ports/py-typing-extensions/vcpkg.json create mode 100644 versions/p-/py-certifi.json create mode 100644 versions/p-/py-contourpy.json create mode 100644 versions/p-/py-cppy.json create mode 100644 versions/p-/py-cycler.json create mode 100644 versions/p-/py-dateutil.json create mode 100644 versions/p-/py-fonttools.json create mode 100644 versions/p-/py-kiwisolver.json create mode 100644 versions/p-/py-matplotlib.json create mode 100644 versions/p-/py-meson.json create mode 100644 versions/p-/py-pillow.json create mode 100644 versions/p-/py-pyproject-metadata.json create mode 100644 versions/p-/py-semantic-version.json create mode 100644 versions/p-/py-setuptools-scm.json create mode 100644 versions/p-/py-six.json create mode 100644 versions/p-/py-tomli.json create mode 100644 versions/p-/py-typing-extensions.json diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 2bc8553..e0cbea9 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gdal", "version-semver": "3.9.2", + "port-version": 1, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, @@ -41,25 +42,6 @@ "default-features" ], "features": { - "python": { - "description": "Build python bindings", - "dependencies": [ - "python3", - "py-numpy", - { - "name": "swig", - "host": true - }, - { - "name": "py-setuptools", - "host": true - }, - { - "name": "vcpkg-python-scripts", - "host": true - } - ] - }, "aws-ec2-windows": { "description": "Optimized detection of AWS EC2 Windows hosts", "dependencies": [ @@ -269,6 +251,25 @@ "libpq" ] }, + "python": { + "description": "Build python bindings", + "dependencies": [ + "py-numpy", + { + "name": "py-setuptools", + "host": true + }, + "python3", + { + "name": "swig", + "host": true + }, + { + "name": "vcpkg-python-scripts", + "host": true + } + ] + }, "qhull": { "description": "Use QHULL library", "dependencies": [ diff --git a/ports/py-certifi/portfile.cmake b/ports/py-certifi/portfile.cmake new file mode 100755 index 0000000..606d10c --- /dev/null +++ b/ports/py-certifi/portfile.cmake @@ -0,0 +1,16 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO certifi/python-certifi + REF 2024.02.02 + SHA512 e62f1741fd9bb10a976f5e864a4946f00e1df1b92082e66fe146ee3275036c365d1e98ed023614a1da07ab2a7a58bc333c77c71586ea50a992eb7d5b54a515e5 + HEAD_REF main +) + +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_python_test_import(MODULE "certifi") diff --git a/ports/py-certifi/vcpkg.json b/ports/py-certifi/vcpkg.json new file mode 100755 index 0000000..4b8296e --- /dev/null +++ b/ports/py-certifi/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "py-certifi", + "version-date": "2024-02-02", + "description": "A carefully curated collection of Root Certificates for validating the trustworthiness of SSL certificates while verifying the identity of TLS hosts.", + "homepage": "https://github.com/certifi/python-certifi", + "license": null, + "dependencies": [ + "py-semantic-version", + { + "name": "py-setuptools", + "host": true + }, + "vcpkg-python-scripts" + ] +} diff --git a/ports/py-contourpy/copyright b/ports/py-contourpy/copyright new file mode 100755 index 0000000..ca18bc8 --- /dev/null +++ b/ports/py-contourpy/copyright @@ -0,0 +1,30 @@ +# Copyright (C) 2001-2022 +# David M. Beazley (Dabeaz LLC) +# All rights reserved. +# +# Latest version: https://github.com/dabeaz/ply +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# * Neither the name of David Beazley or Dabeaz LLC may be used to +# endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/ports/py-contourpy/portfile.cmake b/ports/py-contourpy/portfile.cmake new file mode 100755 index 0000000..997a1f1 --- /dev/null +++ b/ports/py-contourpy/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_pythonhosted( + OUT_SOURCE_PATH SOURCE_PATH + PACKAGE_NAME contourpy + VERSION ${VERSION} + SHA512 1804b5512cbccef38e86a1d28c91e7a19a72cf9baeaede0873abd7ed7c46f78e3a81a1e7fa87b91cbeef96d55930db6527fbbff905803ad393170e3ed709e0b0 +) + +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_install_copyright(FILE_LIST "${CURRENT_PORT_DIR}/copyright") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/py-contourpy/vcpkg.json b/ports/py-contourpy/vcpkg.json new file mode 100755 index 0000000..50238ae --- /dev/null +++ b/ports/py-contourpy/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "py-contourpy", + "version": "1.3.0", + "description": "Python library for calculating contours in 2D quadrilateral grids", + "homepage": "https://contourpy.readthedocs.io/", + "dependencies": [ + { + "name": "py-setuptools", + "host": true + }, + "python3", + { + "name": "vcpkg-python-scripts", + "host": true + } + ] +} diff --git a/ports/py-cppy/portfile.cmake b/ports/py-cppy/portfile.cmake new file mode 100755 index 0000000..d4f8963 --- /dev/null +++ b/ports/py-cppy/portfile.cmake @@ -0,0 +1,15 @@ +set(name cppy-${VERSION}) +set(wheelname ${name}-py3-none-any.whl) + +vcpkg_download_distfile( + wheel + URLS https://github.com/nucleic/cppy/releases/download/${VERSION}/${wheelname} + FILENAME ${wheelname} + SHA512 033dc1fca6e0c6b75017d64b92208b32da35a1106d9d1fff6520ee27e5472d69be3ba77c22ce46b4d68e21a4166871519ed1f4aebbb130e5d579af6472b20efb +) + +vcpkg_python_install_wheel(WHEEL "${wheel}") + +vcpkg_install_copyright(FILE_LIST "${CURRENT_PACKAGES_DIR}/${PYTHON3_SITE}/${name}.dist-info/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/py-cppy/vcpkg.json b/ports/py-cppy/vcpkg.json new file mode 100755 index 0000000..778bb32 --- /dev/null +++ b/ports/py-cppy/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "py-cppy", + "version": "1.2.1", + "description": "A collection of C++ headers which make it easier to write Python C extension modules", + "homepage": "https://cppy.readthedocs.io/en/latest/", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "py-setuptools", + "host": true + }, + "vcpkg-python-scripts" + ] +} diff --git a/ports/py-cycler/portfile.cmake b/ports/py-cycler/portfile.cmake new file mode 100755 index 0000000..0d08daa --- /dev/null +++ b/ports/py-cycler/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO matplotlib/cycler + REF v${VERSION} + SHA512 f1d264de9c5e63515649aefb5937ef7a85d781c07b1c7c8fe291c969565abb18eb48d6d62f77d278746c60900c93700cbb095d280e09de768aedc2463e60d9a2 + HEAD_REF main +) + +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_python_test_import(MODULE "cycler") diff --git a/ports/py-cycler/vcpkg.json b/ports/py-cycler/vcpkg.json new file mode 100755 index 0000000..d264190 --- /dev/null +++ b/ports/py-cycler/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "py-cycler", + "version": "0.12.1", + "description": "cycler: composable cycles", + "homepage": "https://matplotlib.org/cycler/", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "py-setuptools", + "host": true + }, + "python3", + "vcpkg-python-scripts" + ] +} diff --git a/ports/py-dateutil/portfile.cmake b/ports/py-dateutil/portfile.cmake new file mode 100755 index 0000000..6752ab3 --- /dev/null +++ b/ports/py-dateutil/portfile.cmake @@ -0,0 +1,16 @@ +string(REGEX REPLACE "^py-" "" package "${PORT}") +vcpkg_from_pythonhosted( + OUT_SOURCE_PATH SOURCE_PATH + PACKAGE_NAME python-${package} + VERSION ${VERSION} + SHA512 7dd550d646477c8c3953a42aabe4c0aa3f4d1f74f6fed018a1a429270f41aa2c6832df264e67510d380d149eaa436c1b613544c8026c180c2241f15205ca6d36 +) + +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +string(REGEX REPLACE "-" "_" test_package "${package}") +vcpkg_python_test_import(MODULE "${test_package}") diff --git a/ports/py-dateutil/vcpkg.json b/ports/py-dateutil/vcpkg.json new file mode 100755 index 0000000..303b93d --- /dev/null +++ b/ports/py-dateutil/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "py-dateutil", + "version": "2.9.0", + "description": "Useful extensions to the standard Python datetime features", + "homepage": "https://github.com/dateutil/dateutil", + "license": null, + "dependencies": [ + { + "name": "py-setuptools", + "host": true + }, + "py-six", + "vcpkg-python-scripts" + ] +} diff --git a/ports/py-fonttools/copyright b/ports/py-fonttools/copyright new file mode 100755 index 0000000..ca18bc8 --- /dev/null +++ b/ports/py-fonttools/copyright @@ -0,0 +1,30 @@ +# Copyright (C) 2001-2022 +# David M. Beazley (Dabeaz LLC) +# All rights reserved. +# +# Latest version: https://github.com/dabeaz/ply +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# * Neither the name of David Beazley or Dabeaz LLC may be used to +# endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/ports/py-fonttools/portfile.cmake b/ports/py-fonttools/portfile.cmake new file mode 100755 index 0000000..ab09c94 --- /dev/null +++ b/ports/py-fonttools/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_pythonhosted( + OUT_SOURCE_PATH SOURCE_PATH + PACKAGE_NAME fonttools + VERSION ${VERSION} + SHA512 c031bef5cb8850f7d30bbd64b746e5ff4e15d3a11ebc0fc2365bcfcb9c173e09d520a3c82b05aa76d6a8fcb404037f070f937f25baeacf88e98673857aed9700 +) + +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_install_copyright(FILE_LIST "${CURRENT_PORT_DIR}/copyright") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/py-fonttools/vcpkg.json b/ports/py-fonttools/vcpkg.json new file mode 100755 index 0000000..6834b64 --- /dev/null +++ b/ports/py-fonttools/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "py-fonttools", + "version": "4.53.1", + "description": "A library to manipulate font files from Python.", + "homepage": "https://github.com/fonttools/fonttools", + "dependencies": [ + { + "name": "py-setuptools", + "host": true + }, + "python3", + { + "name": "vcpkg-python-scripts", + "host": true + } + ] +} diff --git a/ports/py-gpep517/portfile.cmake b/ports/py-gpep517/portfile.cmake index 32149ba..23ed05c 100644 --- a/ports/py-gpep517/portfile.cmake +++ b/ports/py-gpep517/portfile.cmake @@ -12,3 +12,5 @@ file(COPY "${SOURCE_PATH}/gpep517" DESTINATION "${CURRENT_PACKAGES_DIR}/${PYTHON vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_python_test_import(MODULE "gpep517") diff --git a/ports/py-gpep517/vcpkg.json b/ports/py-gpep517/vcpkg.json index 65f7473..ce55b91 100644 --- a/ports/py-gpep517/vcpkg.json +++ b/ports/py-gpep517/vcpkg.json @@ -1,16 +1,23 @@ { "name": "py-gpep517", "version": "16", + "port-version": 1, "description": "Python package builder and installer for non-pip-centric world", "homepage": "https://github.com/projg2/gpep517", "license": "MIT", "dependencies": [ - "py-flit-core", - "py-installer", - "python3", { - "name": "vcpkg-python-scripts", + "name": "py-flit-core", "host": true + }, + { + "name": "py-installer", + "host": true + }, + { + "name": "python3", + "host": true, + "default-features": false } ] } diff --git a/ports/py-kiwisolver/portfile.cmake b/ports/py-kiwisolver/portfile.cmake new file mode 100755 index 0000000..c80dcfc --- /dev/null +++ b/ports/py-kiwisolver/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nucleic/kiwi + REF ${VERSION} + SHA512 889e106c27915cb773bc13969605812c1ca01a139e992d2b3517eb20989ae41392bfdcdd63184a7777b13eff5109d167869087ea09149b1527e56a3455213b14 + HEAD_REF master +) + + +file(WRITE "${SOURCE_PATH}/py/src/version.h" +"\n\ +/* ----------------------------------------------------------------------------\n\ +| Copyright (c) 2013-2021, Nucleic Development Team.\n\ +|\n\ +| Distributed under the terms of the Modified BSD License.\n\ +|\n\ +| The full license is in the file LICENSE, distributed with this software.\n\ +| ---------------------------------------------------------------------------*/\n\ +\n\ +#pragma once\n\ +\n\ +#define PY_KIWI_VERSION \"${VERSION}\"\n\ +\n" +) + +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_python_test_import(MODULE "kiwisolver") + diff --git a/ports/py-kiwisolver/vcpkg.json b/ports/py-kiwisolver/vcpkg.json new file mode 100755 index 0000000..fee233c --- /dev/null +++ b/ports/py-kiwisolver/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "py-kiwisolver", + "version": "1.4.5", + "description": "Efficient C++ implementation of the Cassowary constraint solving algorithm", + "homepage": "https://kiwisolver.readthedocs.io/en/latest/", + "license": null, + "dependencies": [ + "py-cppy", + { + "name": "py-setuptools", + "host": true + }, + "vcpkg-python-scripts" + ] +} diff --git a/ports/py-matplotlib/portfile.cmake b/ports/py-matplotlib/portfile.cmake new file mode 100755 index 0000000..95042fb --- /dev/null +++ b/ports/py-matplotlib/portfile.cmake @@ -0,0 +1,55 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO matplotlib/matplotlib + REF v${VERSION} + SHA512 39b5dc1dd1423309375f9407010470f6cfd8f052d81c8393fe0beef90d911b00170c3953d910c7c70abd37395dd7623d1e4c49ebd231416aaf58057af4d3df0c + HEAD_REF main +) + +set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig;${CURRENT_INSTALLED_DIR}/share/pkgconfig") +set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") + +set(PYTHON3 "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${VCPKG_HOST_EXECUTABLE_SUFFIX}") +vcpkg_mesonpy_prepare_build_options(OUTPUT meson_opts) + +z_vcpkg_setup_pkgconfig_path(CONFIG "RELEASE") + +list(APPEND meson_opts "--python.platlibdir" "${CURRENT_INSTALLED_DIR}/lib") +list(JOIN meson_opts "\",\"" meson_opts) + +vcpkg_python_build_and_install_wheel( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --config-json "{\"setup-args\" : [\"-Dsystem-freetype=true\", \"-Dsystem-qhull=true\", \"${meson_opts}\" ] }" + #-Csetup-args=-Dsystem-freetype=true -Csetup-args=-Dsystem-qhull=true +) + +file(GLOB licenses "${SOURCE_PATH}/LICENSE/*") + +vcpkg_install_copyright(FILE_LIST ${licenses}) +string(REPLACE "." ";" version_list "${VERSION}") +list(GET version_list 0 version_major) +list(GET version_list 1 version_minor) +list(GET version_list 2 version_patch) +file(WRITE "${CURRENT_PACKAGES_DIR}/${PYTHON3_SITE}/matplotlib/_version.py" +"\n\ +TYPE_CHECKING = False\n\ +if TYPE_CHECKING:\n\ + from typing import Tuple, Union\n\ + VERSION_TUPLE = Tuple[Union[int, str], ...]\n\ +else:\n\ + VERSION_TUPLE = object\n\ +\n\ +version: str\n\ +__version__: str\n\ +__version_tuple__: VERSION_TUPLE\n\ +version_tuple: VERSION_TUPLE\n\ +\n\ +__version__ = version = '${VERSION}'\n\ +__version_tuple__ = version_tuple = (${version_major}, ${version_minor}, ${version_patch})\n\ +\n\ +") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_python_test_import(MODULE "matplotlib") diff --git a/ports/py-matplotlib/vcpkg.json b/ports/py-matplotlib/vcpkg.json new file mode 100755 index 0000000..305d9ac --- /dev/null +++ b/ports/py-matplotlib/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "py-matplotlib", + "version": "3.9.2", + "description": "Matplotlib is a comprehensive library for creating static, animated, and interactive visualizations in Python.", + "homepage": "https://matplotlib.org/stable/", + "license": null, + "dependencies": [ + "freetype", + "numpy", + "py-certifi", + "py-cycler", + "py-dateutil", + "py-fonttools", + "py-kiwisolver", + { + "name": "py-meson", + "host": true + }, + "py-pillow", + "py-pyparsing", + { + "name": "py-setuptools-scm", + "host": true + }, + { + "name": "pybind11", + "features": [ + "scripts" + ] + }, + "qhull", + "vcpkg-python-scripts", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/ports/py-meson/portfile.cmake b/ports/py-meson/portfile.cmake new file mode 100755 index 0000000..e427f8f --- /dev/null +++ b/ports/py-meson/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mesonbuild/meson-python + REF ${VERSION} + SHA512 f1fce89bb0a3d279b9900c4ecec78e5f24da92d72f64ebf6c27648b4201a75a65204c3fac08aaa3e8d70dbeef245c3235e39994c7c0b9cba27c0df528211c7f7 + HEAD_REF main +) + +#vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x) + +set(VCPKG_BUILD_TYPE release) + +vcpkg_configure_meson(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_install_meson() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/python3/Lib") +file(RENAME "${CURRENT_PACKAGES_DIR}/Lib/site-packages/" "${CURRENT_PACKAGES_DIR}/${PYTHON3_SITE}/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/Lib") + +vcpkg_python_test_import(MODULE "mesonpy") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg_mesonpy_prepare_build_options.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file diff --git a/ports/py-meson/vcpkg-port-config.cmake b/ports/py-meson/vcpkg-port-config.cmake new file mode 100755 index 0000000..fdf574e --- /dev/null +++ b/ports/py-meson/vcpkg-port-config.cmake @@ -0,0 +1,3 @@ +# Overwrite builtin scripts +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-tool-meson/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_mesonpy_prepare_build_options.cmake") diff --git a/ports/py-meson/vcpkg.json b/ports/py-meson/vcpkg.json new file mode 100755 index 0000000..5ba6c81 --- /dev/null +++ b/ports/py-meson/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "py-meson", + "version": "0.15.0", + "description": "Meson PEP 517 Python build backend", + "homepage": "https://github.com/mesonbuild/meson-python", + "license": "MIT", + "dependencies": [ + { + "name": "py-pyproject-metadata", + "host": true + }, + { + "name": "py-setuptools", + "host": true + }, + { + "name": "py-tomli", + "host": true + }, + { + "name": "python3", + "default-features": false, + "features": [ + "extensions" + ] + }, + "vcpkg-python-scripts", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/ports/py-meson/vcpkg_mesonpy_prepare_build_options.cmake b/ports/py-meson/vcpkg_mesonpy_prepare_build_options.cmake new file mode 100755 index 0000000..f3cea16 --- /dev/null +++ b/ports/py-meson/vcpkg_mesonpy_prepare_build_options.cmake @@ -0,0 +1,121 @@ +function(vcpkg_mesonpy_prepare_build_options) + cmake_parse_arguments(PARSE_ARGV 0 arg + "" + "OUTPUT" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;LANGUAGES;ADDITIONAL_BINARIES;ADDITIONAL_NATIVE_BINARIES;ADDITIONAL_CROSS_BINARIES;ADDITIONAL_PROPERTIES" + ) + if(NOT arg_LANGUAGES) + set(arg_LANGUAGES C CXX) + endif() + if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + z_vcpkg_select_default_vcpkg_chainload_toolchain() + endif() + z_vcpkg_get_cmake_vars(cmake_vars_file) + debug_message("Including cmake vars from: ${cmake_vars_file}") + include("${cmake_vars_file}") + + set(ENV{MESON} "${SCRIPT_MESON}") + + get_filename_component(CMAKE_PATH "${CMAKE_COMMAND}" DIRECTORY) + vcpkg_add_to_path("${CMAKE_PATH}") # Make CMake invokeable for Meson + + vcpkg_find_acquire_program(NINJA) + get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) + vcpkg_add_to_path(PREPEND "${NINJA_PATH}") # Prepend to use the correct ninja. + + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}") + + set(buildname "RELEASE") + vcpkg_list(APPEND buildtypes "${buildname}") + set(path_suffix_${buildname} "") + set(suffix_${buildname} "rel") + set(meson_input_file_${buildname} "${CURRENT_BUILDTREES_DIR}/meson-${TARGET_TRIPLET}-${suffix_${buildname}}.log") + + vcpkg_list(APPEND arg_OPTIONS --backend ninja --wrap-mode nodownload -Dbuildtype=plain -Doptimization=plain) + + z_vcpkg_get_build_and_host_system(MESON_HOST_MACHINE MESON_BUILD_MACHINE IS_CROSS) + + if(IS_CROSS) + # VCPKG_CROSSCOMPILING is not used since it regresses a lot of ports in x64-windows-x triplets + # For consistency this should proably be changed in the future? + vcpkg_list(APPEND arg_OPTIONS --native "${SCRIPTS}/buildsystems/meson/none.txt") + vcpkg_list(APPEND arg_OPTIONS_DEBUG --cross "${meson_input_file_DEBUG}") + vcpkg_list(APPEND arg_OPTIONS_RELEASE --cross "${meson_input_file_RELEASE}") + else() + vcpkg_list(APPEND arg_OPTIONS_DEBUG --native "${meson_input_file_DEBUG}") + vcpkg_list(APPEND arg_OPTIONS_RELEASE --native "${meson_input_file_RELEASE}") + endif() + + # User provided cross/native files + if(VCPKG_MESON_NATIVE_FILE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE}") + endif() + if(VCPKG_MESON_NATIVE_FILE_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE_RELEASE}") + endif() + if(VCPKG_MESON_NATIVE_FILE_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG --native "${VCPKG_MESON_NATIVE_FILE_DEBUG}") + endif() + if(VCPKG_MESON_CROSS_FILE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE --cross "${VCPKG_MESON_CROSS_FILE}") + endif() + if(VCPKG_MESON_CROSS_FILE_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE --cross "${VCPKG_MESON_CROSS_FILE_RELEASE}") + endif() + if(VCPKG_MESON_CROSS_FILE_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG --cross "${VCPKG_MESON_CROSS_FILE_DEBUG}") + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(MESON_DEFAULT_LIBRARY shared) + else() + set(MESON_DEFAULT_LIBRARY static) + endif() + + vcpkg_list(APPEND arg_OPTIONS --libdir lib) # else meson install into an architecture describing folder + vcpkg_list(APPEND arg_OPTIONS_DEBUG -Ddebug=true --prefix "${CURRENT_PACKAGES_DIR}/debug" --includedir ../include) + vcpkg_list(APPEND arg_OPTIONS_RELEASE -Ddebug=false --prefix "${CURRENT_PACKAGES_DIR}") + + # select meson cmd-line options + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_list(APPEND arg_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}/share']") + vcpkg_list(APPEND arg_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/share']") + else() + vcpkg_list(APPEND arg_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}']") + vcpkg_list(APPEND arg_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}']") + endif() + + # Allow overrides / additional configuration variables from triplets + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS) + vcpkg_list(APPEND arg_OPTIONS ${VCPKG_MESON_CONFIGURE_OPTIONS}) + endif() + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE ${VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE}) + endif() + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG ${VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG}) + endif() + + # configure build + foreach(buildtype IN LISTS buildtypes) + message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}}") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}") + #setting up PKGCONFIG + if(NOT arg_NO_PKG_CONFIG) + z_vcpkg_setup_pkgconfig_path(CONFIG "${buildtype}") + endif() + + z_vcpkg_meson_setup_variables(${buildtype}) + configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../vcpkg-tool-meson/meson.template.in" "${meson_input_file_${buildtype}}" @ONLY) + + message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}} done") + + if(NOT arg_NO_PKG_CONFIG) + z_vcpkg_restore_pkgconfig_path() + endif() + endforeach() + + set("${arg_OUTPUT}" ${arg_OPTIONS} ${arg_OPTIONS_RELEASE} PARENT_SCOPE) +endfunction() \ No newline at end of file diff --git a/ports/py-packaging/portfile.cmake b/ports/py-packaging/portfile.cmake index ae28b9b..7d85415 100644 --- a/ports/py-packaging/portfile.cmake +++ b/ports/py-packaging/portfile.cmake @@ -1,13 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pypa/packaging - REF d563917280d65a6ce2e622bd3d07438e1ee259f3 - SHA512 eb556564096e05880413114437d857a062b12c3485f9833af5bd18a387f53b8727cf43a723e4562dacb6ed24e1e66d57978061fb474c074ceb2b287d46149e8a + REF ${VERSION} + SHA512 45836ea0e7531c485a7d5e568f9740c7f075ff1b72a0d60422c5b76c031866428ff2137d9bd153790a9fcfff6bd4a7555bc40555409ad46debae7f1c9c1fe129 HEAD_REF main ) -vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x) +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_python_test_import(MODULE "packaging") diff --git a/ports/py-packaging/vcpkg.json b/ports/py-packaging/vcpkg.json index 8e76973..d881c2b 100644 --- a/ports/py-packaging/vcpkg.json +++ b/ports/py-packaging/vcpkg.json @@ -1,16 +1,11 @@ { "name": "py-packaging", "version": "24.1", + "port-version": 1, "description": "Core utilities for Python packages", "homepage": "https://packaging.pypa.io/", "license": "MIT", "dependencies": [ - "py-flit-core", - "py-gpep517", - "python3", - { - "name": "vcpkg-python-scripts", - "host": true - } + "vcpkg-python-scripts" ] } diff --git a/ports/py-pillow/portfile.cmake b/ports/py-pillow/portfile.cmake new file mode 100755 index 0000000..0d63365 --- /dev/null +++ b/ports/py-pillow/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO python-pillow/Pillow + REF ${VERSION} + SHA512 835a8766c384ec3fcf67b42c9bbad35dad0848cc5bd9eba1b0768a864e174a1d9c4a5e989f22496a40f2c29dd7f492f6f80465903fe872b10749cfa0340e1bc5 + HEAD_REF master +) + +set(ENV{PKG_CONFIG} "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf") +set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig") +set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") +set(ENV{INCLIB} "${CURRENT_INSTALLED_DIR}/lib;$ENV{INCLIB}") +set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib;$ENV{LIB}") + +vcpkg_python_build_and_install_wheel( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --config-json "{\"raqm\": \"disable\", \"xcb\": \"disable\"}" + #-C raqm=disable # linkage issues. Without pc file missing linkage to harfbuzz fribidi +) + + + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_python_test_import(MODULE "PIL") diff --git a/ports/py-pillow/vcpkg.json b/ports/py-pillow/vcpkg.json new file mode 100755 index 0000000..c946d45 --- /dev/null +++ b/ports/py-pillow/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "py-pillow", + "version": "10.4.0", + "description": "Python Imaging Library", + "homepage": "https://python-pillow.org/", + "license": null, + "dependencies": [ + "freetype", + "lcms", + "libjpeg-turbo", + "libraqm", + { + "name": "libwebp", + "features": [ + "libwebpmux" + ] + }, + "openjpeg", + { + "name": "pkgconf", + "host": true + }, + { + "name": "py-setuptools", + "host": true + }, + "tiff", + "vcpkg-python-scripts", + "zlib" + ] +} diff --git a/ports/py-pip/portfile.cmake b/ports/py-pip/portfile.cmake index 05b0f19..e337b4e 100644 --- a/ports/py-pip/portfile.cmake +++ b/ports/py-pip/portfile.cmake @@ -2,10 +2,10 @@ vcpkg_from_pythonhosted( OUT_SOURCE_PATH SOURCE_PATH PACKAGE_NAME pip VERSION ${VERSION} - SHA512 b2d8bcff02fe196163e88e02702861bfccba202e5c71d8c6843eeebc84066efa6987574e26a89ff25f096645e99c824dde585fbae415b66d5eb88657bb4d9cb4 + SHA512 42da0dc6ccf5759fea20fd6f54db272aae7afb2d997c84e1d817e3c95437ba073f4f15cb511e5275cf4f35a82828bb0259c5ffe381d278dc75c2bc8f82dfa404 ) -vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x) +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/py-pip/vcpkg.json b/ports/py-pip/vcpkg.json index 8deed5b..9a0d779 100644 --- a/ports/py-pip/vcpkg.json +++ b/ports/py-pip/vcpkg.json @@ -1,7 +1,6 @@ { "name": "py-pip", - "version": "23.3.2", - "port-version": 1, + "version": "24.2", "description": "Tool for installing and managing Python packages", "homepage": "https://pypi.org/project/setuptools", "dependencies": [ diff --git a/ports/py-ply/portfile.cmake b/ports/py-ply/portfile.cmake index 01c67de..26c5ef3 100644 --- a/ports/py-ply/portfile.cmake +++ b/ports/py-ply/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_pythonhosted( SHA512 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008 ) -vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x) +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") vcpkg_install_copyright(FILE_LIST "${CURRENT_PORT_DIR}/copyright") diff --git a/ports/py-ply/vcpkg.json b/ports/py-ply/vcpkg.json index 521bad9..15bd661 100644 --- a/ports/py-ply/vcpkg.json +++ b/ports/py-ply/vcpkg.json @@ -1,7 +1,7 @@ { "name": "py-ply", "version": "3.11", - "port-version": 1, + "port-version": 2, "description": "Python Lex & Yacc", "homepage": "https://www.dabeaz.com/ply/", "dependencies": [ diff --git a/ports/py-psycopg2/portfile.cmake b/ports/py-psycopg2/portfile.cmake index 75266cd..7582f91 100644 --- a/ports/py-psycopg2/portfile.cmake +++ b/ports/py-psycopg2/portfile.cmake @@ -5,9 +5,13 @@ vcpkg_from_pythonhosted( SHA512 a691fd09762221e854861dedce37b05e5354e0701feea470a6d5046960056ef02a8c9ecfa751adeba485271ea7d5834643b7d3a3c3f3270087f5ed9c68509f5f ) -vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/tools/libpq/bin") +vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/tools/libpq") -vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x) +set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") + +vcpkg_python_build_and_install_wheel( + SOURCE_PATH "${SOURCE_PATH}" +) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/py-psycopg2/vcpkg.json b/ports/py-psycopg2/vcpkg.json index b05c665..c0f758e 100644 --- a/ports/py-psycopg2/vcpkg.json +++ b/ports/py-psycopg2/vcpkg.json @@ -1,18 +1,24 @@ -{ - "name": "py-psycopg2", - "version": "2.9.9", - "description": "Python-PostgreSQL Database Adapter", - "homepage": "https://psycopg.org/", - "dependencies": [ - { - "name": "py-setuptools", - "host": true - }, - "python3", - "libpq", - { - "name": "vcpkg-python-scripts", - "host": true - } - ] -} +{ + "name": "py-psycopg2", + "version": "2.9.9", + "port-version": 1, + "description": "Python-PostgreSQL Database Adapter", + "homepage": "https://psycopg.org/", + "dependencies": [ + { + "name": "libpq", + "features": [ + "client" + ] + }, + { + "name": "py-setuptools", + "host": true + }, + "python3", + { + "name": "vcpkg-python-scripts", + "host": true + } + ] +} diff --git a/ports/py-pyproject-metadata/portfile.cmake b/ports/py-pyproject-metadata/portfile.cmake new file mode 100755 index 0000000..30de60a --- /dev/null +++ b/ports/py-pyproject-metadata/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO FFY00/python-pyproject-metadata + REF ${VERSION} + SHA512 8d8c7839a318acce64b0cf15b3adbc49c2f309b453135b55f2d7942967ba8bbd4f85696d0f3c651e1246c50e33657e6108f0f05ac20b4a9162cdb2875269c548 + HEAD_REF main +) + +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_python_test_import(MODULE "pyproject_metadata") diff --git a/ports/py-pyproject-metadata/vcpkg.json b/ports/py-pyproject-metadata/vcpkg.json new file mode 100755 index 0000000..04e4420 --- /dev/null +++ b/ports/py-pyproject-metadata/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "py-pyproject-metadata", + "version": "0.8.0", + "description": "PEP 621 metadata parsing", + "homepage": "https://pep621.readthedocs.io/", + "license": "MIT", + "dependencies": [ + { + "name": "py-setuptools", + "host": true + }, + "vcpkg-python-scripts" + ] +} diff --git a/ports/py-pyqt-builder/portfile.cmake b/ports/py-pyqt-builder/portfile.cmake index 2effe25..a72bf40 100644 --- a/ports/py-pyqt-builder/portfile.cmake +++ b/ports/py-pyqt-builder/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_from_pythonhosted( OUT_SOURCE_PATH SOURCE_PATH PACKAGE_NAME PyQt-builder - FILE_NAME pyqt_builder + FILENAME pyqt_builder VERSION ${VERSION} - SHA512 64fc969799a12a176eb730fdc4581f18293dceb8edff20db0177ce409fe7e712cdfb07449b6c4abdd33f1fd9aabe8bee248fe9aeb5373df533d805f9d2a0c6a5 + SHA512 8f92feeed1112e47845dd716de68dab2d0620e53bccdb7eb35d57e737110ef9f5e0fe338f064db21e052870b5c0a0c459ebe7d2933cd4854eebf63a1bc517652 PATCHES libpath.patch ) -vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x) +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/py-pyqt-builder/vcpkg.json b/ports/py-pyqt-builder/vcpkg.json index 483034f..48491ea 100644 --- a/ports/py-pyqt-builder/vcpkg.json +++ b/ports/py-pyqt-builder/vcpkg.json @@ -1,6 +1,6 @@ { "name": "py-pyqt-builder", - "version": "1.16.2", + "version": "1.16.4", "description": "PyQt-builder is the PEP 517 compliant build system for PyQt and projects that extend PyQt. It extends the SIP build system and uses Qt’s qmake to perform the actual compilation and installation of extension modules.", "homepage": "https://www.riverbankcomputing.com/software/pyqt-builder", "dependencies": [ diff --git a/ports/py-pyyaml/vcpkg.json b/ports/py-pyyaml/vcpkg.json index dc1e492..35dabdd 100644 --- a/ports/py-pyyaml/vcpkg.json +++ b/ports/py-pyyaml/vcpkg.json @@ -1,18 +1,18 @@ -{ - "name": "py-pyyaml", - "version": "6.0.1", - "port-version": 1, - "description": "YAML parser and emitter for Python", - "homepage": "https://pyyaml.org/", - "dependencies": [ - { - "name": "py-setuptools", - "host": true - }, - "python3", - { - "name": "vcpkg-python-scripts", - "host": true - } - ] -} +{ + "name": "py-pyyaml", + "version": "6.0.1", + "port-version": 2, + "description": "YAML parser and emitter for Python", + "homepage": "https://pyyaml.org/", + "dependencies": [ + { + "name": "py-setuptools", + "host": true + }, + "python3", + { + "name": "vcpkg-python-scripts", + "host": true + } + ] +} diff --git a/ports/py-qscintilla/vcpkg.json b/ports/py-qscintilla/vcpkg.json index 37894df..d85895b 100644 --- a/ports/py-qscintilla/vcpkg.json +++ b/ports/py-qscintilla/vcpkg.json @@ -1,17 +1,15 @@ { "name": "py-qscintilla", "version": "2.14.1", - "port-version": 1, + "port-version": 2, "description": "Python bindings for QScintilla, which is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)", "homepage": "https://www.riverbankcomputing.com/software/qscintilla", "license": "GPL-3.0-or-later", "supports": "!xbox", "dependencies": [ - { - "name": "qscintilla" - }, "py-pyqt6", "python3", + "qscintilla", { "name": "vcpkg-python-scripts", "host": true diff --git a/ports/py-semantic-version/portfile.cmake b/ports/py-semantic-version/portfile.cmake new file mode 100755 index 0000000..d85329a --- /dev/null +++ b/ports/py-semantic-version/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_download_distfile( + wheel + URLS https://files.pythonhosted.org/packages/6a/23/8146aad7d88f4fcb3a6218f41a60f6c2d4e3a72de72da1825dc7c8f7877c/semantic_version-2.10.0-py2.py3-none-any.whl + FILENAME semantic_version-2.10.0-py2.py3-none-any.whl + SHA512 7c9196e00a22bd8a156ed4681a1257a264d2b24ff34c812a3e425edf8f53a76d84450c14f5a9056688797255f6a41655ff2ce1ebcbfc1190009556a4649fafba +) + +vcpkg_python_install_wheel(WHEEL "${wheel}") + +vcpkg_install_copyright(FILE_LIST "${CURRENT_PACKAGES_DIR}/${PYTHON3_SITE}/semantic_version-2.10.0.dist-info/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/py-semantic-version/vcpkg.json b/ports/py-semantic-version/vcpkg.json new file mode 100755 index 0000000..3e75020 --- /dev/null +++ b/ports/py-semantic-version/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "py-semantic-version", + "version": "2.10.0", + "description": "About Semantic version comparison for Python (see http://semver.org/)", + "homepage": "https://python-markdown.github.io/", + "license": "BSD-2-Clause", + "dependencies": [ + { + "name": "py-setuptools", + "host": true + }, + "vcpkg-python-scripts" + ] +} diff --git a/ports/py-setuptools-scm/portfile.cmake b/ports/py-setuptools-scm/portfile.cmake new file mode 100755 index 0000000..e809a35 --- /dev/null +++ b/ports/py-setuptools-scm/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pypa/setuptools_scm + REF "v${VERSION}" + SHA512 bf128de2880b1fac93c5cb820ea5e7bb57daaa404a4f6544139d20829f4dcf7d26c66c4af078ce5cd792442a3e7f31674a7e1b3a71d3fc9894302c8014513322 + HEAD_REF master +) + +vcpkg_find_acquire_program(GIT) +cmake_path(GET GIT PARENT_PATH GIT_DIR) +vcpkg_add_to_path("${GIT_DIR}") + +vcpkg_get_mecurial(HG) +cmake_path(GET HG PARENT_PATH HG_DIR) +vcpkg_add_to_path("${HG_DIR}") + +set(git_working_directory "${SOURCE_PATH}") +set(giturl "https://github.com/pypa/setuptools_scm.git") + +#unset(PYTHON3) +#x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES setuptools_scm[toml]) + +vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${GIT}" init "${git_working_directory}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "git-init-${TARGET_TRIPLET}" +) +vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${GIT}" fetch "${giturl}" "${ref}" --depth 1 -n + WORKING_DIRECTORY "${git_working_directory}" + LOGNAME "git-fetch-${TARGET_TRIPLET}" +) + +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") #OPTIONS -Cconfig=toml -Cextras=toml)#-C--build-option=[toml]) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + + +vcpkg_python_test_import(MODULE "setuptools_scm") diff --git a/ports/py-setuptools-scm/vcpkg.json b/ports/py-setuptools-scm/vcpkg.json new file mode 100755 index 0000000..ee60c3f --- /dev/null +++ b/ports/py-setuptools-scm/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "py-setuptools-scm", + "version": "8.1.0", + "description": "the blessed package to manage your versions by scm tags", + "homepage": "https://github.com/pypa/setuptools_scm", + "license": "MIT", + "dependencies": [ + { + "name": "py-packaging", + "host": true + }, + { + "name": "py-setuptools", + "host": true + }, + "py-tomli", + "py-typing-extensions", + "vcpkg-get-python-packages", + "vcpkg-python-scripts", + "vcpkg-tool-mecurial" + ] +} diff --git a/ports/py-sip/portfile.cmake b/ports/py-sip/portfile.cmake index 6cccc8e..d9081a3 100644 --- a/ports/py-sip/portfile.cmake +++ b/ports/py-sip/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_pythonhosted( SHA512 8a0ff1c16ead4c2b1c53963a015fb3d149362f649eeec2523e6b243945493f28f5ecf29aabbf5cee5f7909ded40d64a1f469d2d0c1b3c33244e6213ab23ec733 ) -vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x) +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/py-sip/vcpkg.json b/ports/py-sip/vcpkg.json index 5d9cb60..8c92af7 100644 --- a/ports/py-sip/vcpkg.json +++ b/ports/py-sip/vcpkg.json @@ -1,6 +1,7 @@ { "name": "py-sip", "version": "6.8.3", + "port-version": 1, "description": "A tool that makes it easy to create Python bindings for C and C++ libraries", "homepage": "https://www.riverbankcomputing.com/software/sip", "dependencies": [ diff --git a/ports/py-six/portfile.cmake b/ports/py-six/portfile.cmake new file mode 100755 index 0000000..fbc1a83 --- /dev/null +++ b/ports/py-six/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO benjaminp/six + REF ${VERSION} + SHA512 630179b9994e10573225dcfa4ff7a40449a58bbe57ccff06434fa40ded10c6e3e1d72a230860a8e6c839c7c17357aca9e1f38aede9566782339331eef65fed3a + HEAD_REF master +) + +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_python_test_import(MODULE "six") diff --git a/ports/py-six/vcpkg.json b/ports/py-six/vcpkg.json new file mode 100755 index 0000000..48d398f --- /dev/null +++ b/ports/py-six/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "py-six", + "version": "1.16.0", + "description": "Python 2 and 3 compatibility library ", + "homepage": "https://github.com/benjaminp/six", + "license": null, + "dependencies": [ + { + "name": "py-setuptools", + "host": true + }, + "vcpkg-python-scripts" + ] +} diff --git a/ports/py-tomli/portfile.cmake b/ports/py-tomli/portfile.cmake new file mode 100755 index 0000000..d74d59e --- /dev/null +++ b/ports/py-tomli/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hukkin/tomli + REF 36ef51d6a5a55e0eca077b58695390d041061bd4 + SHA512 fe47a06dddad298dd64975f7618e7c8d03de83a8f4b44da868abd78e062138ad9df18fbc810e55e4cb240fac2c3c023b18ee4e87cab5e93cd776b34fac497bdf + HEAD_REF main +) + +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_python_test_import(MODULE "tomli") diff --git a/ports/py-tomli/vcpkg.json b/ports/py-tomli/vcpkg.json new file mode 100755 index 0000000..eaedfb0 --- /dev/null +++ b/ports/py-tomli/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "py-tomli", + "version": "2.0.1", + "description": "A simple, correct Python build frontend ", + "homepage": "py-build.readthedocs.io/en/stable/", + "license": "MIT", + "dependencies": [ + "vcpkg-python-scripts" + ] +} diff --git a/ports/py-typing-extensions/portfile.cmake b/ports/py-typing-extensions/portfile.cmake new file mode 100755 index 0000000..2b1e835 --- /dev/null +++ b/ports/py-typing-extensions/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO python/typing_extensions + REF ${VERSION} + SHA512 2d4f19adc5ec9f40502ea6a5c6077b01ea41439fee2b92cd14907e0d093c0f51f4daaba7a2163b5fa14d99413aeb30cad1ef439bb45af6d53634d5ea4ee8a2f4 + HEAD_REF main +) + +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_python_test_import(MODULE "typing_extensions") diff --git a/ports/py-typing-extensions/vcpkg.json b/ports/py-typing-extensions/vcpkg.json new file mode 100755 index 0000000..cf03918 --- /dev/null +++ b/ports/py-typing-extensions/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "py-typing-extensions", + "version": "4.11.0", + "description": "Backported and experimental type hints for Python", + "homepage": "https://github.com/python/typing_extensions", + "license": null, + "dependencies": [ + { + "name": "py-setuptools", + "host": true + }, + "vcpkg-python-scripts" + ] +} diff --git a/ports/py-wheel/portfile.cmake b/ports/py-wheel/portfile.cmake index 38e5743..b7a1258 100644 --- a/ports/py-wheel/portfile.cmake +++ b/ports/py-wheel/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pypa/wheel - REF 0.41.3 - SHA512 8bb1af302d3a80b4497a9f9399bfedfc5b72c405fb4512dc8ceba81233dc9e9ed7e38c09c1135e1522a0618c41562221ba2d12d9de341d5a5d7174b1b82a7325 + REF ${VERSION} + SHA512 16e556272f6d47d33f2be39efc3c0882c8da90aa2945ec3574105df21ed2cb090390f7736d05a319a008f4842b3f109abea5e7607064ee80e663d499c2e67308 HEAD_REF main ) -vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x) +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") @@ -15,3 +15,5 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) endif() set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_python_test_import(MODULE "wheel") diff --git a/ports/py-wheel/vcpkg.json b/ports/py-wheel/vcpkg.json index dec3c1b..f8f2e0f 100644 --- a/ports/py-wheel/vcpkg.json +++ b/ports/py-wheel/vcpkg.json @@ -1,14 +1,11 @@ { "name": "py-wheel", - "version": "0.41.3", + "version": "0.43.0", "description": "The official binary distribution format for Python", "homepage": "https://github.com/pypa/wheel", "license": "MIT", "dependencies": [ "py-gpep517", - { - "name": "vcpkg-python-scripts", - "host": true - } + "vcpkg-python-scripts" ] } diff --git a/ports/swig/vcpkg.json b/ports/swig/vcpkg.json index e8b511a..6502e7e 100644 --- a/ports/swig/vcpkg.json +++ b/ports/swig/vcpkg.json @@ -1,19 +1,18 @@ { - "name": "swig", - "version": "4.2.1", - "description": "SWIG is a software development tool that connects programs written in C and C++ with a variety of high-level programming languages.", - "homepage": "http://www.swig.org/", - "dependencies": - [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "pcre2" - ] + "name": "swig", + "version": "4.2.1", + "port-version": 1, + "description": "SWIG is a software development tool that connects programs written in C and C++ with a variety of high-level programming languages.", + "homepage": "http://www.swig.org/", + "dependencies": [ + "pcre2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } - diff --git a/versions/baseline.json b/versions/baseline.json index e8c59b8..18efe60 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2,7 +2,7 @@ "default": { "gdal": { "baseline": "3.9.2", - "port-version": 0 + "port-version": 1 }, "py-add-vcpkg-dll-path": { "baseline": "2024-03-13", @@ -12,41 +12,81 @@ "baseline": "0.10.0", "port-version": 1 }, + "py-certifi": { + "baseline": "2024-02-02", + "port-version": 0 + }, + "py-contourpy": { + "baseline": "1.3.0", + "port-version": 0 + }, + "py-cppy": { + "baseline": "1.2.1", + "port-version": 0 + }, + "py-cycler": { + "baseline": "0.12.1", + "port-version": 0 + }, "py-cython": { "baseline": "3.0.5", "port-version": 0 }, + "py-dateutil": { + "baseline": "2.9.0", + "port-version": 0 + }, "py-flit-core": { "baseline": "3.9.0", "port-version": 1 }, + "py-fonttools": { + "baseline": "4.53.1", + "port-version": 0 + }, "py-gpep517": { "baseline": "16", - "port-version": 0 + "port-version": 1 }, "py-installer": { "baseline": "0.7.0", "port-version": 1 }, + "py-kiwisolver": { + "baseline": "1.4.5", + "port-version": 0 + }, + "py-matplotlib": { + "baseline": "3.9.2", + "port-version": 0 + }, + "py-meson": { + "baseline": "0.15.0", + "port-version": 0 + }, "py-numpy": { "baseline": "1.26.4", "port-version": 0 }, "py-packaging": { "baseline": "24.1", + "port-version": 1 + }, + "py-pillow": { + "baseline": "10.4.0", "port-version": 0 }, "py-pip": { - "baseline": "23.3.2", - "port-version": 1 + "baseline": "24.2", + "port-version": 0 }, "py-ply": { "baseline": "3.11", - "port-version": 1 + "port-version": 2 }, "py-psycopg2": { "baseline": "2.9.9", - "port-version": 0 + "port-version": 1 }, "py-pyparsing": { "baseline": "3.1.1", @@ -56,8 +96,12 @@ "baseline": "1.0.0", "port-version": 0 }, + "py-pyproject-metadata": { + "baseline": "0.8.0", + "port-version": 0 + }, "py-pyqt-builder": { - "baseline": "1.16.2", + "baseline": "1.16.4", "port-version": 0 }, "py-pyqt6": { @@ -70,22 +114,42 @@ }, "py-pyyaml": { "baseline": "6.0.1", - "port-version": 1 + "port-version": 2 }, "py-qscintilla": { "baseline": "2.14.1", - "port-version": 1 + "port-version": 2 + }, + "py-semantic-version": { + "baseline": "2.10.0", + "port-version": 0 }, "py-setuptools": { "baseline": "70.1.1", "port-version": 0 }, + "py-setuptools-scm": { + "baseline": "8.1.0", + "port-version": 0 + }, "py-sip": { "baseline": "6.8.3", + "port-version": 1 + }, + "py-six": { + "baseline": "1.16.0", + "port-version": 0 + }, + "py-tomli": { + "baseline": "2.0.1", + "port-version": 0 + }, + "py-typing-extensions": { + "baseline": "4.11.0", "port-version": 0 }, "py-wheel": { - "baseline": "0.41.3", + "baseline": "0.43.0", "port-version": 0 }, "python3": { @@ -94,7 +158,7 @@ }, "swig": { "baseline": "4.2.1", - "port-version": 0 + "port-version": 1 }, "vcpkg-python-scripts": { "baseline": "2024-05-12", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index d9e246c..83989c4 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5d7632dc4f28923bcdfe937c272066e17f9ebc0", + "version-semver": "3.9.2", + "port-version": 1 + }, { "git-tree": "acfbe7bf9ae7c25409a966a467a866dfcad7aabe", "version-semver": "3.9.2", diff --git a/versions/p-/py-certifi.json b/versions/p-/py-certifi.json new file mode 100644 index 0000000..39f971c --- /dev/null +++ b/versions/p-/py-certifi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7f35ac9a6d1007aeb7d5a916192d20bf70753067", + "version-date": "2024-02-02", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-contourpy.json b/versions/p-/py-contourpy.json new file mode 100644 index 0000000..632a559 --- /dev/null +++ b/versions/p-/py-contourpy.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "08e6f5cb8a4e00e3e55b593656e7b20702ecca90", + "version": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-cppy.json b/versions/p-/py-cppy.json new file mode 100644 index 0000000..9b053ea --- /dev/null +++ b/versions/p-/py-cppy.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "53aa01248bb3b8ba945ea320b32e525d3872f2dd", + "version": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-cycler.json b/versions/p-/py-cycler.json new file mode 100644 index 0000000..96d09bb --- /dev/null +++ b/versions/p-/py-cycler.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "91e75195c4108f7a876fed0bcd4dfd48c897427d", + "version": "0.12.1", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-dateutil.json b/versions/p-/py-dateutil.json new file mode 100644 index 0000000..6252901 --- /dev/null +++ b/versions/p-/py-dateutil.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "57971053e0b1d5b5eb77f5f4f3db09a6bf637d37", + "version": "2.9.0", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-fonttools.json b/versions/p-/py-fonttools.json new file mode 100644 index 0000000..7cce759 --- /dev/null +++ b/versions/p-/py-fonttools.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cf2aca18033802fdb9fafd3ce2b664063709f307", + "version": "4.53.1", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-gpep517.json b/versions/p-/py-gpep517.json index 187b38d..807c67f 100644 --- a/versions/p-/py-gpep517.json +++ b/versions/p-/py-gpep517.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "116735b4f4c500d9bfad30e31946bf409b15be6e", + "version": "16", + "port-version": 1 + }, { "git-tree": "2fde4789076abd32f82dc3d5ac7e397d961804dc", "version": "16", diff --git a/versions/p-/py-kiwisolver.json b/versions/p-/py-kiwisolver.json new file mode 100644 index 0000000..07fad9b --- /dev/null +++ b/versions/p-/py-kiwisolver.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "60c9c0fd58c1291e45e25a8bd208f0732941f14f", + "version": "1.4.5", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-matplotlib.json b/versions/p-/py-matplotlib.json new file mode 100644 index 0000000..b992832 --- /dev/null +++ b/versions/p-/py-matplotlib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f3192febdadd86034af1079e4d8bdbbe64c1d9cd", + "version": "3.9.2", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-meson.json b/versions/p-/py-meson.json new file mode 100644 index 0000000..a5d2a05 --- /dev/null +++ b/versions/p-/py-meson.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "037e6e158549e2b6eb20bf2d74553bb922fcb0c7", + "version": "0.15.0", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-packaging.json b/versions/p-/py-packaging.json index 0f69da6..c7e8cf9 100644 --- a/versions/p-/py-packaging.json +++ b/versions/p-/py-packaging.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "652d911b4c695efac951b69b8d2c557460e60174", + "version": "24.1", + "port-version": 1 + }, { "git-tree": "aeb9810063cd7c1705b4e25bab9dec1f94281db1", "version": "24.1", diff --git a/versions/p-/py-pillow.json b/versions/p-/py-pillow.json new file mode 100644 index 0000000..bf8ae6a --- /dev/null +++ b/versions/p-/py-pillow.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "31af612d5e9c9d27e70b8b4763d539b6e44eb556", + "version": "10.4.0", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-pip.json b/versions/p-/py-pip.json index b2fea93..6433282 100644 --- a/versions/p-/py-pip.json +++ b/versions/p-/py-pip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9633538a6eda37fdf9909907ebe7121df8ddbc3", + "version": "24.2", + "port-version": 0 + }, { "git-tree": "588ce55dc845965037534a398d7699518f3617ec", "version": "23.3.2", diff --git a/versions/p-/py-ply.json b/versions/p-/py-ply.json index 8e368d6..9792c13 100644 --- a/versions/p-/py-ply.json +++ b/versions/p-/py-ply.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ca95db286d87d7d28ecca72cba40db1a7748efa", + "version": "3.11", + "port-version": 2 + }, { "git-tree": "7079844274bd5b57b0f2a2a5abbb57a3e482d256", "version": "3.11", diff --git a/versions/p-/py-psycopg2.json b/versions/p-/py-psycopg2.json index 2c95ec6..0c4368b 100644 --- a/versions/p-/py-psycopg2.json +++ b/versions/p-/py-psycopg2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb539d44d3100730f03dd219e73e4cc40a417e6d", + "version": "2.9.9", + "port-version": 1 + }, { "git-tree": "03b1bd4daa11a0fe6490938d15f1b56e94aab779", "version": "2.9.9", diff --git a/versions/p-/py-pyproject-metadata.json b/versions/p-/py-pyproject-metadata.json new file mode 100644 index 0000000..2066623 --- /dev/null +++ b/versions/p-/py-pyproject-metadata.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0ca95a8aed50455b3e96c940b73c663834fe0e66", + "version": "0.8.0", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-pyqt-builder.json b/versions/p-/py-pyqt-builder.json index da3cf1f..dbe2c32 100644 --- a/versions/p-/py-pyqt-builder.json +++ b/versions/p-/py-pyqt-builder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d375c0f3d6ac75743817ef3dda46fbd598d9875d", + "version": "1.16.4", + "port-version": 0 + }, { "git-tree": "de33c3055de8537c3e6cccb3da9c583e35f25c3b", "version": "1.16.2", diff --git a/versions/p-/py-pyyaml.json b/versions/p-/py-pyyaml.json index 773bc23..5d7ee1b 100644 --- a/versions/p-/py-pyyaml.json +++ b/versions/p-/py-pyyaml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7316cb8b9b8287d225630805efe108d2ad549ff7", + "version": "6.0.1", + "port-version": 2 + }, { "git-tree": "e3f18e832ae1b0ed4893d7718d5956a837a99e3e", "version": "6.0.1", diff --git a/versions/p-/py-qscintilla.json b/versions/p-/py-qscintilla.json index cd38832..6ee3574 100644 --- a/versions/p-/py-qscintilla.json +++ b/versions/p-/py-qscintilla.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb37a436f8616e809216cfd2cb5d75c2a8eef768", + "version": "2.14.1", + "port-version": 2 + }, { "git-tree": "3f7eb28aeecd682d47bf0686e4f5123f1ddbdf5f", "version": "2.14.1", diff --git a/versions/p-/py-semantic-version.json b/versions/p-/py-semantic-version.json new file mode 100644 index 0000000..4b662d8 --- /dev/null +++ b/versions/p-/py-semantic-version.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "897dd1e85d2d4bca32205cc5fde7b1dc8faf545f", + "version": "2.10.0", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-setuptools-scm.json b/versions/p-/py-setuptools-scm.json new file mode 100644 index 0000000..3970fd1 --- /dev/null +++ b/versions/p-/py-setuptools-scm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4e7e8adcf5671707cafc11cf56bfb5ce7840f95a", + "version": "8.1.0", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-sip.json b/versions/p-/py-sip.json index 655a025..33b3dfb 100644 --- a/versions/p-/py-sip.json +++ b/versions/p-/py-sip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa3c66f6c4bbc17ad954c85269e8cdbd4bd7a3bc", + "version": "6.8.3", + "port-version": 1 + }, { "git-tree": "58743eb1d7613465a1960ae160b1ea965cecd4ab", "version": "6.8.3", diff --git a/versions/p-/py-six.json b/versions/p-/py-six.json new file mode 100644 index 0000000..3a241e9 --- /dev/null +++ b/versions/p-/py-six.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f7d7747024bf3f2dc4191f01e497c9820c99d503", + "version": "1.16.0", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-tomli.json b/versions/p-/py-tomli.json new file mode 100644 index 0000000..cc17b5e --- /dev/null +++ b/versions/p-/py-tomli.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "60151223a49632b9d2513f0fc8e09fc49eaecf17", + "version": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-typing-extensions.json b/versions/p-/py-typing-extensions.json new file mode 100644 index 0000000..d4efddd --- /dev/null +++ b/versions/p-/py-typing-extensions.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "aba47534f6c676b9c01a3f8f28a45e165fda2b41", + "version": "4.11.0", + "port-version": 0 + } + ] +} diff --git a/versions/p-/py-wheel.json b/versions/p-/py-wheel.json index 9d5c478..a47d3dc 100644 --- a/versions/p-/py-wheel.json +++ b/versions/p-/py-wheel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c00fe255ec228429b9c0a50de748cc3b9240afee", + "version": "0.43.0", + "port-version": 0 + }, { "git-tree": "b1bbc78a08b86e729626345064c5fb73b41b7c1e", "version": "0.41.3", diff --git a/versions/s-/swig.json b/versions/s-/swig.json index 922b55f..1a874fb 100644 --- a/versions/s-/swig.json +++ b/versions/s-/swig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7aae28ecae0e399d61a9fc59dedd49170a096850", + "version": "4.2.1", + "port-version": 1 + }, { "git-tree": "231e8c3749cee1780cc5b0cf8d41e6525b606f80", "version": "4.2.1", From 1cab5316e21dd5a8fc18f7d4a6a54a9b16289a81 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 8 Oct 2024 11:20:37 +0200 Subject: [PATCH 2/5] v db --- versions/g-/gdal.json | 2 +- versions/p-/py-pyyaml.json | 2 +- versions/p-/py-qscintilla.json | 2 +- versions/s-/swig.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 83989c4..57c2758 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d5d7632dc4f28923bcdfe937c272066e17f9ebc0", + "git-tree": "81c0c54fde11318dc0de522cd52bbb60a991d445", "version-semver": "3.9.2", "port-version": 1 }, diff --git a/versions/p-/py-pyyaml.json b/versions/p-/py-pyyaml.json index 5d7ee1b..3a2adad 100644 --- a/versions/p-/py-pyyaml.json +++ b/versions/p-/py-pyyaml.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7316cb8b9b8287d225630805efe108d2ad549ff7", + "git-tree": "d856508907cfd33d3b996a98ade19c45d45ecb80", "version": "6.0.1", "port-version": 2 }, diff --git a/versions/p-/py-qscintilla.json b/versions/p-/py-qscintilla.json index 6ee3574..6d27406 100644 --- a/versions/p-/py-qscintilla.json +++ b/versions/p-/py-qscintilla.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fb37a436f8616e809216cfd2cb5d75c2a8eef768", + "git-tree": "518ac4cc6a7c89ad11473f1dfea6ac68aa73d23f", "version": "2.14.1", "port-version": 2 }, diff --git a/versions/s-/swig.json b/versions/s-/swig.json index 1a874fb..bf677ea 100644 --- a/versions/s-/swig.json +++ b/versions/s-/swig.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7aae28ecae0e399d61a9fc59dedd49170a096850", + "git-tree": "b6e4bbc9060509083f6beac1b2dc38aeb74fc7d8", "version": "4.2.1", "port-version": 1 }, From c516b6249009805eceba4e0f0d17be31627337e5 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 8 Oct 2024 11:48:03 +0200 Subject: [PATCH 3/5] fix deps --- ports/py-gpep517/vcpkg.json | 3 ++- ports/py-packaging/vcpkg.json | 1 + versions/p-/py-gpep517.json | 2 +- versions/p-/py-packaging.json | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/py-gpep517/vcpkg.json b/ports/py-gpep517/vcpkg.json index ce55b91..c3f7621 100644 --- a/ports/py-gpep517/vcpkg.json +++ b/ports/py-gpep517/vcpkg.json @@ -18,6 +18,7 @@ "name": "python3", "host": true, "default-features": false - } + }, + "vcpkg-python-scripts" ] } diff --git a/ports/py-packaging/vcpkg.json b/ports/py-packaging/vcpkg.json index d881c2b..f9730ab 100644 --- a/ports/py-packaging/vcpkg.json +++ b/ports/py-packaging/vcpkg.json @@ -6,6 +6,7 @@ "homepage": "https://packaging.pypa.io/", "license": "MIT", "dependencies": [ + "py-gpep517", "vcpkg-python-scripts" ] } diff --git a/versions/p-/py-gpep517.json b/versions/p-/py-gpep517.json index 807c67f..ca96179 100644 --- a/versions/p-/py-gpep517.json +++ b/versions/p-/py-gpep517.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "116735b4f4c500d9bfad30e31946bf409b15be6e", + "git-tree": "ce8c23505cd84726cbfcc875b6fcb0c39178d4df", "version": "16", "port-version": 1 }, diff --git a/versions/p-/py-packaging.json b/versions/p-/py-packaging.json index c7e8cf9..ddac0d7 100644 --- a/versions/p-/py-packaging.json +++ b/versions/p-/py-packaging.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "652d911b4c695efac951b69b8d2c557460e60174", + "git-tree": "1e53beca15ae2aaac882f4a6233918f1614f839f", "version": "24.1", "port-version": 1 }, From d1eb4c9e07c8015244d29dc610054d5a938db372 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 8 Oct 2024 12:53:05 +0200 Subject: [PATCH 4/5] Update vcpkg_python_functions --- ports/vcpkg-python-scripts/vcpkg.json | 2 +- .../vcpkg_python_functions.cmake | 88 ++++++++++++------- versions/baseline.json | 2 +- versions/v-/vcpkg-python-scripts.json | 5 ++ 4 files changed, 64 insertions(+), 33 deletions(-) diff --git a/ports/vcpkg-python-scripts/vcpkg.json b/ports/vcpkg-python-scripts/vcpkg.json index 92bf92c..6a2106c 100644 --- a/ports/vcpkg-python-scripts/vcpkg.json +++ b/ports/vcpkg-python-scripts/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-python-scripts", "version-date": "2024-05-12", - "port-version": 1, + "port-version": 2, "documentation": "https://vcpkg.io/en/docs/README.html", "license": "MIT", "supports": "native", diff --git a/ports/vcpkg-python-scripts/vcpkg_python_functions.cmake b/ports/vcpkg-python-scripts/vcpkg_python_functions.cmake index 6c468f0..4bc5ffa 100644 --- a/ports/vcpkg-python-scripts/vcpkg_python_functions.cmake +++ b/ports/vcpkg-python-scripts/vcpkg_python_functions.cmake @@ -1,11 +1,14 @@ set(ENV{SETUPTOOLS_SCM_PRETEND_VERSION} "${VERSION}") +set(ENV{PDM_BUILD_SCM_VERSION} "${VERSION}") + +set(z_vcpkg_python_func_python "${PYTHON3}") function(vcpkg_from_pythonhosted) cmake_parse_arguments( PARSE_ARGV 0 "arg" "" - "OUT_SOURCE_PATH;PACKAGE_NAME;FILE_NAME;VERSION;SHA512" + "OUT_SOURCE_PATH;PACKAGE_NAME;VERSION;SHA512;FILENAME" "PATCHES") if(DEFINED arg_UNPARSED_ARGUMENTS) @@ -21,13 +24,13 @@ function(vcpkg_from_pythonhosted) if(NOT DEFINED arg_VERSION) message(FATAL_ERROR "VERSION must be specified.") endif() - if(NOT DEFINED arg_FILE_NAME) - set(arg_FILE_NAME ${arg_PACKAGE_NAME}) + if(NOT DEFINED arg_FILENAME) + set(arg_FILENAME "${arg_PACKAGE_NAME}") endif() - + string(SUBSTRING "${arg_PACKAGE_NAME}" 0 1 _PACKAGE_PREFIX) vcpkg_download_distfile(ARCHIVE - URLS "https://files.pythonhosted.org/packages/source/${_PACKAGE_PREFIX}/${arg_PACKAGE_NAME}/${arg_FILE_NAME}-${arg_VERSION}.tar.gz" + URLS "https://files.pythonhosted.org/packages/source/${_PACKAGE_PREFIX}/${arg_PACKAGE_NAME}/${arg_FILENAME}-${arg_VERSION}.tar.gz" FILENAME "${arg_PACKAGE_NAME}-${arg_VERSION}.tar.gz" SHA512 ${arg_SHA512} ) @@ -45,26 +48,54 @@ function(vcpkg_python_build_wheel) cmake_parse_arguments( PARSE_ARGV 0 "arg" - "ISOLATE" + "" "SOURCE_PATH;OUTPUT_WHEEL" - "OPTIONS" + "OPTIONS;ENVIRONMENT" ) - set(build_ops "${arg_OPTIONS}") + # These are common variables used by python backends + set(ENV{SETUPTOOLS_SCM_PRETEND_VERSION} "${VERSION}") + set(ENV{PDM_BUILD_SCM_VERSION} "${VERSION}") - if(NOT arg_ISOLATE) - list(APPEND build_ops "-n") - endif() + set(build_ops "${arg_OPTIONS}") set(z_vcpkg_wheeldir "${CURRENT_PACKAGES_DIR}/wheels") file(MAKE_DIRECTORY "${z_vcpkg_wheeldir}") message(STATUS "Building python wheel!") - vcpkg_execute_required_process(COMMAND "${PYTHON3}" -m gpep517 build-wheel --wheel-dir "${z_vcpkg_wheeldir}" --output-fd 1 + + list(JOIN arg_ENVIRONMENT " " env) + if(CMAKE_HOST_WIN32) + set(env "") + set(env_backup_vars "") + foreach(envvarline IN LISTS arg_ENVIRONMENT) + if(envvarline MATCHES "([^=]+)=(.+)") + list(APPEND env_backup_vars "${CMAKE_MATCH_1}") + if(DEFINED ENV{${CMAKE_MATCH_1}}) + set(env_bak_${CMAKE_MATCH_1} "$ENV{${CMAKE_MATCH_1}}") + endif() + set(ENV{${CMAKE_MATCH_1}} "${CMAKE_MATCH_2}") + else() + message(FATAL_ERROR "'${envvarline}' is not a valid line for setting an environment variable!") + endif() + endforeach() + endif() + + vcpkg_execute_required_process( + COMMAND ${env} "${z_vcpkg_python_func_python}" -m gpep517 build-wheel --wheel-dir "${z_vcpkg_wheeldir}" --output-fd 1 ${build_ops} LOGNAME "python-build-${TARGET_TRIPLET}" WORKING_DIRECTORY "${arg_SOURCE_PATH}" ) + + foreach(env_var IN LISTS env_backup_vars) + if(DEFINED env_bak_${env_var}) + set(ENV{${env_var}} "${env_bak_${env_var}}") + else() + unset(ENV{${env_var}}) + endif() + endforeach() + message(STATUS "Finished building python wheel!") file(GLOB WHEEL "${z_vcpkg_wheeldir}/*.whl") @@ -89,7 +120,7 @@ function(vcpkg_python_install_wheel) endif() message(STATUS "Installing python wheel:'${arg_WHEEL}'") - vcpkg_execute_required_process(COMMAND "${PYTHON3}" -m installer + vcpkg_execute_required_process(COMMAND "${z_vcpkg_python_func_python}" -m installer --prefix "${install_prefix}" --destdir "${CURRENT_PACKAGES_DIR}" "${arg_WHEEL}" LOGNAME "python-installer-${TARGET_TRIPLET}" @@ -117,24 +148,19 @@ function(vcpkg_python_build_and_install_wheel) cmake_parse_arguments( PARSE_ARGV 0 "arg" - "ISOLATE" + "" "SOURCE_PATH" - "OPTIONS" + "OPTIONS;ENVIRONMENT" + ) + vcpkg_python_build_wheel( + OUTPUT_WHEEL wheel + ENVIRONMENT ${arg_ENVIORNMENT} + SOURCE_PATH "${arg_SOURCE_PATH}" + OPTIONS ${arg_OPTIONS} + ) + vcpkg_python_install_wheel( + WHEEL "${wheel}" ) - - set(ENV{SETUPTOOLS_SCM_PRETEND_VERSION} "${VERSION}") - - if("-x" IN_LIST arg_OPTIONS) - message(WARNING "Python wheel will be ignoring dependencies") - endif() - - set(opts "") - if(arg_ISOLATE) - set(opts ISOLATE) - endif() - - vcpkg_python_build_wheel(${opts} SOURCE_PATH "${arg_SOURCE_PATH}" OUTPUT_WHEEL WHEEL OPTIONS ${arg_OPTIONS}) - vcpkg_python_install_wheel(WHEEL "${WHEEL}") endfunction() function(vcpkg_python_test_import) @@ -150,13 +176,13 @@ function(vcpkg_python_test_import) set(RELATIVE_SITE_PACKAGES_DIR "${PYTHON3_SITEPACKAGES}") cmake_path(RELATIVE_PATH RELATIVE_SITE_PACKAGES_DIR BASE_DIRECTORY "${CURRENT_INSTALLED_DIR}") - + set(INSTALLED_DLL_DIR "${CURRENT_INSTALLED_DIR}/bin") set(PACKAGE_DLL_DIR "${CURRENT_PACKAGES_DIR}/bin") set(PACKAGE_SITE_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}/${RELATIVE_SITE_PACKAGES_DIR}") configure_file("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-python-scripts/import_test.py.in" "${CURRENT_BUILDTREES_DIR}/import_test.py" @ONLY) - vcpkg_execute_required_process(COMMAND "${PYTHON3}" "${CURRENT_BUILDTREES_DIR}/import_test.py" + vcpkg_execute_required_process(COMMAND "${z_vcpkg_python_func_python}" "${CURRENT_BUILDTREES_DIR}/import_test.py" LOGNAME "python-test-import-${TARGET_TRIPLET}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" ) diff --git a/versions/baseline.json b/versions/baseline.json index 18efe60..cf471c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -162,7 +162,7 @@ }, "vcpkg-python-scripts": { "baseline": "2024-05-12", - "port-version": 1 + "port-version": 2 } } } diff --git a/versions/v-/vcpkg-python-scripts.json b/versions/v-/vcpkg-python-scripts.json index 197cc26..16060ce 100644 --- a/versions/v-/vcpkg-python-scripts.json +++ b/versions/v-/vcpkg-python-scripts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "affc5263ff69b940637952d599d1f08cc36b4949", + "version-date": "2024-05-12", + "port-version": 2 + }, { "git-tree": "c7850a0f4e5997e36ea01128e363567db479f41e", "version-date": "2024-05-12", From d279fe340eeb6b8459277c2e3d95b0d69946c976 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 8 Oct 2024 15:51:03 +0200 Subject: [PATCH 5/5] Fix options --- ports/py-meson/portfile.cmake | 4 +--- ports/py-pyyaml/portfile.cmake | 2 +- versions/p-/py-meson.json | 2 +- versions/p-/py-pyyaml.json | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ports/py-meson/portfile.cmake b/ports/py-meson/portfile.cmake index e427f8f..7bcbd54 100755 --- a/ports/py-meson/portfile.cmake +++ b/ports/py-meson/portfile.cmake @@ -6,8 +6,6 @@ vcpkg_from_github( HEAD_REF main ) -#vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x) - set(VCPKG_BUILD_TYPE release) vcpkg_configure_meson(SOURCE_PATH "${SOURCE_PATH}") @@ -25,4 +23,4 @@ vcpkg_python_test_import(MODULE "mesonpy") configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg_mesonpy_prepare_build_options.cmake" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/py-pyyaml/portfile.cmake b/ports/py-pyyaml/portfile.cmake index 2d98912..841dce8 100644 --- a/ports/py-pyyaml/portfile.cmake +++ b/ports/py-pyyaml/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_pythonhosted( cy-me-a-river.patch ) -vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x) +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/versions/p-/py-meson.json b/versions/p-/py-meson.json index a5d2a05..68704d5 100644 --- a/versions/p-/py-meson.json +++ b/versions/p-/py-meson.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "037e6e158549e2b6eb20bf2d74553bb922fcb0c7", + "git-tree": "492c2cf2e21e3339e428c8ac609d556f87847d27", "version": "0.15.0", "port-version": 0 } diff --git a/versions/p-/py-pyyaml.json b/versions/p-/py-pyyaml.json index 3a2adad..446952b 100644 --- a/versions/p-/py-pyyaml.json +++ b/versions/p-/py-pyyaml.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d856508907cfd33d3b996a98ade19c45d45ecb80", + "git-tree": "3ffce016706b9faa8fca31f5015ec69bcef52953", "version": "6.0.1", "port-version": 2 },