diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 79ba2389..642ec9b8 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -85,6 +85,7 @@ jobs: VCPKG_OPTIONS="--overlay-ports="${{ github.workspace }}/ports" --host-triplet=${{ matrix.triplet }} --triplet=${{ matrix.triplet }} --x-buildtrees-root=${{ env.buildtrees }} --recurse" ./vcpkg/vcpkg install $VCPKG_OPTIONS py-duckdb ./vcpkg/vcpkg install $VCPKG_OPTIONS py-pip + ./vcpkg/vcpkg install $VCPKG_OPTIONS py-importlib-resources ./vcpkg/vcpkg install $VCPKG_OPTIONS py-pydantic ./vcpkg/vcpkg install $VCPKG_OPTIONS py-sip ./vcpkg/vcpkg install $VCPKG_OPTIONS py-numpy diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index aca42718..766fd062 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -80,6 +80,7 @@ jobs: $VCPKG_OPTIONS \ 'py-pyqt6[qtdeclarative,qt3d]' \ py-pyyaml \ + py-importlib-resources \ py-numpy \ gdal[python] \ py-qscintilla \ diff --git a/ports/py-adbc-driver-manager/vcpkg.json b/ports/py-adbc-driver-manager/vcpkg.json index 9a0d0198..818993bf 100644 --- a/ports/py-adbc-driver-manager/vcpkg.json +++ b/ports/py-adbc-driver-manager/vcpkg.json @@ -1,14 +1,24 @@ { "name": "py-adbc-driver-manager", "version": "1.12.0", + "port-version": 1, "description": "A generic entrypoint for ADBC drivers.", "homepage": "https://arrow.apache.org/adbc/", "license": "Apache-2.0", "dependencies": [ + { + "name": "arrow", + "default-features": false, + "features": [ + "dataset", + "python" + ] + }, { "name": "py-cython", "host": true }, + "py-importlib-resources", { "name": "py-setuptools", "host": true @@ -25,16 +35,7 @@ ], "features": { "dbapi": { - "description": "DBAPI 2.0-compatible interface", - "dependencies": [ - { - "name": "arrow", - "default-features": false, - "features": [ - "python" - ] - } - ] + "description": "DBAPI 2.0-compatible interface" } } } diff --git a/ports/py-importlib-resources/portfile.cmake b/ports/py-importlib-resources/portfile.cmake new file mode 100644 index 00000000..673ff906 --- /dev/null +++ b/ports/py-importlib-resources/portfile.cmake @@ -0,0 +1,17 @@ +set(VCPKG_BUILD_TYPE release) + +vcpkg_from_pythonhosted( + OUT_SOURCE_PATH SOURCE_PATH + PACKAGE_NAME importlib-resources + VERSION ${VERSION} + SHA512 8bc2ea45bf4d5e7e10a42abd79276c1c66229cd5a04375488e7c62d05b1743e60ce7fafb1552014f6a7dfe70969995b7a8bc12118ff051c95180ffa0e90b9190 + FILENAME importlib_resources +) + +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +vcpkg_python_test_import(MODULE "importlib_resources") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/py-importlib-resources/vcpkg.json b/ports/py-importlib-resources/vcpkg.json new file mode 100644 index 00000000..851f646f --- /dev/null +++ b/ports/py-importlib-resources/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "py-importlib-resources", + "version": "7.1.0", + "description": "Read resources from Python packages.", + "homepage": "https://github.com/python/importlib_resources", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "py-gpep517", + "host": true + }, + { + "name": "py-setuptools", + "host": true + }, + { + "name": "py-setuptools-scm", + "host": true + }, + "python3", + { + "name": "vcpkg-python-scripts", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index a1709d4b..06c0e5e7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10,7 +10,7 @@ }, "py-adbc-driver-manager": { "baseline": "1.12.0", - "port-version": 0 + "port-version": 1 }, "py-adbc-postgresql": { "baseline": "1.12.0", @@ -164,6 +164,10 @@ "baseline": "3.20", "port-version": 0 }, + "py-importlib-resources": { + "baseline": "7.1.0", + "port-version": 0 + }, "py-installer": { "baseline": "0.7.0", "port-version": 1 diff --git a/versions/p-/py-adbc-driver-manager.json b/versions/p-/py-adbc-driver-manager.json index 58337431..6d9b0742 100644 --- a/versions/p-/py-adbc-driver-manager.json +++ b/versions/p-/py-adbc-driver-manager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72ace36d2046c7740fe0887b9323596556cb1b75", + "version": "1.12.0", + "port-version": 1 + }, { "git-tree": "6c64caf8d84abe3ed4e68c5fbbd975cea38a0cb6", "version": "1.12.0", diff --git a/versions/p-/py-importlib-resources.json b/versions/p-/py-importlib-resources.json new file mode 100644 index 00000000..b2f7711a --- /dev/null +++ b/versions/p-/py-importlib-resources.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "eecd0866402c408c8e379a6aed13bde0a13c4f88", + "version": "7.1.0", + "port-version": 0 + } + ] +}