[vcpkg-get-python-packages] Fix exported variable (#36354)

* [vcpkg-get-python-packages] Update manifest * [vcpkg-get-python-packages] Fix typos * [vcpkg-get-python-packages] Fix exported variable * [vcpkg-get-python-packages] Make python3 zip optional * versions
microsoft · Jan 31, 2024 · d5e173c · d5e173c
1 parent 3d99eb5
commit d5e173c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/ports/vcpkg-get-python-packages/vcpkg.json b/ports/vcpkg-get-python-packages/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "vcpkg-get-python-packages",
-  "version-date": "2024-01-02",
-  "documentation": "https://vcpkg.io/en/docs/README.html",
+  "version-date": "2024-01-24",
+  "documentation": "https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_get_python_packages",
   "license": "MIT",
   "supports": "native"
 }
diff --git a/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake b/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake
@@ -75,7 +75,7 @@ function(x_vcpkg_get_python_packages)
         file(MAKE_DIRECTORY "${python_dir}/DLLs")
         set(python_sub_path /Scripts)
         set(python_venv virtualenv)
-        if(arg_PYTHON_VERSION STREQUAL 3)
+        if(EXISTS "${python_dir}/python3${PYTHON_VERSION_MINOR}.zip")
             file(COPY "${python_dir}/python3${PYTHON_VERSION_MINOR}.zip" DESTINATION "${venv_path}/Scripts")
         endif()
         set(python_venv_options "--app-data" "${venv_path}/data")
@@ -90,7 +90,7 @@ function(x_vcpkg_get_python_packages)
     endif()
 
     set(ENV{PYTHONNOUSERSITE} "1")
-    message(STATUS "Setting up python virtual environmnent...")
+    message(STATUS "Setting up python virtual environment...")
     vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" -I -m "${python_venv}" ${python_venv_options} "${venv_path}"
                                    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
                                    LOGNAME "venv-setup-${TARGET_TRIPLET}")
@@ -111,7 +111,7 @@ function(x_vcpkg_get_python_packages)
                                        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
                                        LOGNAME "pip-install-packages-${TARGET_TRIPLET}")
     endif()
-    message(STATUS "Setting up python virtual environmnent...finished.")
-    set(${arg_OUT_PYTHON_VAR} "${PYTHON${arg_PYTHON_VERSION}}" PARENT_SCOPE)
-    set(${arg_OUT_PYTHON_VAR} "${PYTHON${arg_PYTHON_VERSION}}" CACHE PATH "" FORCE)
+    message(STATUS "Setting up python virtual environment... finished.")
+    set(${arg_OUT_PYTHON_VAR} "${${arg_OUT_PYTHON_VAR}}" PARENT_SCOPE)
+    set(${arg_OUT_PYTHON_VAR} "${${arg_OUT_PYTHON_VAR}}" CACHE PATH "" FORCE)
 endfunction()
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -8901,7 +8901,7 @@
       "port-version": 0
     },
     "vcpkg-get-python-packages": {
-      "baseline": "2024-01-02",
+      "baseline": "2024-01-24",
       "port-version": 0
     },
     "vcpkg-gfortran": {

diff --git a/versions/v-/vcpkg-get-python-packages.json b/versions/v-/vcpkg-get-python-packages.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9205135e78e0cad47fd43c2f7abada1f4fbbdbaa",
+      "version-date": "2024-01-24",
+      "port-version": 0
+    },
     {
       "git-tree": "b6f23effcf3057ccc837f864b9207b651209e608",
       "version-date": "2024-01-02",