New ports urllib3 and markupsafe

.github/workflows/macos.yml

@@ -70,6 +70,8 @@ jobs:
           ./vcpkg/vcpkg install $VCPKG_OPTIONS py-sip
           ./vcpkg/vcpkg install $VCPKG_OPTIONS py-numpy
           ./vcpkg/vcpkg install $VCPKG_OPTIONS py-psycopg2
+          ./vcpkg/vcpkg install $VCPKG_OPTIONS py-urllib3
+          ./vcpkg/vcpkg install $VCPKG_OPTIONS py-markupsafe
           # ./vcpkg/vcpkg install $VCPKG_OPTIONS py-pyqt6
 
       - name: 📑 Upload logs

.github/workflows/windows.yml

@@ -57,7 +57,7 @@ jobs:
 
       - name: 🌋 Build
         run: |
-          .\vcpkg\vcpkg.exe install --overlay-ports="${{ github.workspace }}/ports" --triplet=${{ matrix.triplet }} --x-buildtrees-root=C:/vcpkg-build py-pyqt6 py-pyyaml py-numpy gdal[python] py-qscintilla py-psycopg2
+          .\vcpkg\vcpkg.exe install --overlay-ports="${{ github.workspace }}/ports" --triplet=${{ matrix.triplet }} --x-buildtrees-root=C:/vcpkg-build py-pyqt6 py-pyyaml py-numpy gdal[python] py-qscintilla py-psycopg2 py-urllib3 py-markupsafe
 
       - name: 📑 Upload logs
         uses: actions/upload-artifact@v4

ports/py-hatch-vcs/portfile.cmake

@@ -0,0 +1,16 @@
+set(VCPKG_BUILD_TYPE release)
+
+vcpkg_from_pythonhosted(
+    OUT_SOURCE_PATH SOURCE_PATH
+    PACKAGE_NAME    hatch_vcs
+    VERSION         ${VERSION}
+    SHA512          8689d3939b384b66c8153b88e82c55c4ec59a971dae6138c8d70995d332d62c870d611f0be5d2e47640f6c80cb55d1d8e556d6b3f0085f94dd505aaf7fdb93bd
+)
+
+vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+
+vcpkg_python_test_import(MODULE "hatch_vcs")
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

ports/py-hatch-vcs/vcpkg.json

@@ -0,0 +1,17 @@
+{
+  "name": "py-hatch-vcs",
+  "version": "0.4.0",
+  "description": "Hatch plugin for versioning with your preferred VCS",
+  "homepage": "https://github.com/ofek/hatch-vcs",
+  "dependencies": [
+    {
+      "name": "py-setuptools",
+      "host": true
+    },
+    "python3",
+    {
+      "name": "vcpkg-python-scripts",
+      "host": true
+    }
+  ]
+}

ports/py-hatchling/portfile.cmake

@@ -0,0 +1,16 @@
+set(VCPKG_BUILD_TYPE release)
+
+vcpkg_from_pythonhosted(
+    OUT_SOURCE_PATH SOURCE_PATH
+    PACKAGE_NAME    hatchling
+    VERSION         ${VERSION}
+    SHA512          fc1580225700695258dfad35e4c3cf86d210ebe196b52760afa49fb95ffaccb90742ded67dcd3a2c50cdb7672dfdb1701c6bb2c0c57957f9c62184a3c8c7d00c
+)
+
+vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+
+vcpkg_python_test_import(MODULE "hatchling")
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

ports/py-hatchling/vcpkg.json

@@ -0,0 +1,20 @@
+{
+  "name": "py-hatchling",
+  "version": "1.25.0",
+  "description": "Modern, extensible Python build backend",
+  "homepage": "https://hatch.pypa.io/latest/",
+  "dependencies": [
+    "py-pathspec",
+    "py-pluggy",
+    {
+      "name": "py-setuptools",
+      "host": true
+    },
+    "py-trove-classifiers",
+    "python3",
+    {
+      "name": "vcpkg-python-scripts",
+      "host": true
+    }
+  ]
+}

ports/py-markupsafe/portfile.cmake

@@ -0,0 +1,16 @@
+set(VCPKG_BUILD_TYPE release)
+
+vcpkg_from_pythonhosted(
+    OUT_SOURCE_PATH SOURCE_PATH
+    PACKAGE_NAME    markupsafe
+    VERSION         ${VERSION}
+    SHA512          1d5342766fae024a243e12a2ad384724ec2a9ea5dfd4af1651725ef5201bcec5ca2e520720a05d05d3ca91fcdbf78e00afec6a70a73146ab29e29c6989559651
+)
+
+vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+
+vcpkg_python_test_import(MODULE "markupsafe")
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

ports/py-markupsafe/vcpkg.json

@@ -0,0 +1,17 @@
+{
+  "name": "py-markupsafe",
+  "version": "3.0.1",
+  "description": "Safely add untrusted strings to HTML/XML markup.",
+  "homepage": "https://markupsafe.palletsprojects.com/",
+  "dependencies": [
+    {
+      "name": "py-setuptools",
+      "host": true
+    },
+    "python3",
+    {
+      "name": "vcpkg-python-scripts",
+      "host": true
+    }
+  ]
+}

ports/py-pathspec/portfile.cmake

@@ -0,0 +1,16 @@
+set(VCPKG_BUILD_TYPE release)
+
+vcpkg_from_pythonhosted(
+    OUT_SOURCE_PATH SOURCE_PATH
+    PACKAGE_NAME    pathspec
+    VERSION         ${VERSION}
+    SHA512          19d1a8ae5936e76eacd691b0e2fb33d0de376556751a9ae007f6b09d0aa36af7d171101df620cab3e93c9913be578ff3d6bba9d4460351ac248e5c9e015380ad
+)
+
+vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+vcpkg_python_test_import(MODULE "pathspec")
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

ports/py-pathspec/vcpkg.json

@@ -0,0 +1,17 @@
+{
+  "name": "py-pathspec",
+  "version": "0.12.1",
+  "description": "Utility library for gitignore style pattern matching of file paths.",
+  "homepage": "https://python-path-specification.readthedocs.io/en/latest/index.html",
+  "dependencies": [
+    {
+      "name": "py-setuptools",
+      "host": true
+    },
+    "python3",
+    {
+      "name": "vcpkg-python-scripts",
+      "host": true
+    }
+  ]
+}

ports/py-pluggy/portfile.cmake

@@ -0,0 +1,16 @@
+set(VCPKG_BUILD_TYPE release)
+
+vcpkg_from_pythonhosted(
+    OUT_SOURCE_PATH SOURCE_PATH
+    PACKAGE_NAME    pluggy
+    VERSION         ${VERSION}
+    SHA512          032d41e1f2bed56eff22463c4645516e9415ee253e0a3fe5ba83a8de5e21700baae1f6384c979d2c6f622e4216a2b745eec489bc04f52a576d423e771365cc7a
+)
+
+vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+vcpkg_python_test_import(MODULE "pluggy")
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

ports/py-pluggy/vcpkg.json

@@ -0,0 +1,17 @@
+{
+  "name": "py-pluggy",
+  "version": "1.5.0",
+  "description": "plugin and hook calling mechanisms for python",
+  "homepage": "https://github.com/pytest-dev/pluggy",
+  "dependencies": [
+    {
+      "name": "py-setuptools",
+      "host": true
+    },
+    "python3",
+    {
+      "name": "vcpkg-python-scripts",
+      "host": true
+    }
+  ]
+}

ports/py-setuptools-scm/portfile.cmake

@@ -10,7 +10,11 @@ vcpkg_find_acquire_program(GIT)
 cmake_path(GET GIT PARENT_PATH GIT_DIR)
 vcpkg_add_to_path("${GIT_DIR}")
 
-vcpkg_get_mecurial(HG)
+if(VCPKG_HOST_IS_WINDOWS)
+  vcpkg_get_mecurial(HG)
+else()
+  find_program(HG NAMES hg)
+endif()
 cmake_path(GET HG PARENT_PATH HG_DIR)
 vcpkg_add_to_path("${HG_DIR}")
 

ports/py-setuptools-scm/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "py-setuptools-scm",
   "version": "8.1.0",
+  "port-version": 1,
   "description": "the blessed package to manage your versions by scm tags",
   "homepage": "https://github.com/pypa/setuptools_scm",
   "license": "MIT",
@@ -17,6 +18,9 @@
     "py-typing-extensions",
     "vcpkg-get-python-packages",
     "vcpkg-python-scripts",
-    "vcpkg-tool-mecurial"
+    {
+      "name": "vcpkg-tool-mecurial",
+      "platform": "windows"
+    }
   ]
 }

ports/py-trove-classifiers/portfile.cmake

@@ -0,0 +1,16 @@
+set(VCPKG_BUILD_TYPE release)
+
+vcpkg_from_pythonhosted(
+    OUT_SOURCE_PATH SOURCE_PATH
+    PACKAGE_NAME    trove_classifiers
+    VERSION         ${VERSION}
+    SHA512          4fc6efc514638dfb2aee4fbd06f258bb9d5d9d54269e6d33f3739a63d61d6d3caa9a7124f9e5ad601714253c27b97bc9a60f3a9369f2f358ed19fbdfcefcbb10
+)
+
+vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+vcpkg_python_test_import(MODULE "trove_classifiers")
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

ports/py-trove-classifiers/vcpkg.json

@@ -0,0 +1,17 @@
+{
+  "name": "py-trove-classifiers",
+  "version": "2024.9.12",
+  "description": "Canonical source for classifiers on PyPI (pypi.org).",
+  "homepage": "https://github.com/pypa/trove-classifiers",
+  "dependencies": [
+    {
+      "name": "py-setuptools",
+      "host": true
+    },
+    "python3",
+    {
+      "name": "vcpkg-python-scripts",
+      "host": true
+    }
+  ]
+}

ports/py-urllib3/portfile.cmake

@@ -0,0 +1,16 @@
+set(VCPKG_BUILD_TYPE release)
+
+vcpkg_from_pythonhosted(
+    OUT_SOURCE_PATH SOURCE_PATH
+    PACKAGE_NAME    urllib3
+    VERSION         ${VERSION}
+    SHA512          f461cc959d675b8b13c2f40f4b021cab01ccb3a5033143f5c3eae3fce7486115994d198c78db9ef353fce47c17b25e0ecb010fbdebc1b8731d4fd708054b39cc
+)
+
+vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+
+vcpkg_python_test_import(MODULE "urllib3")
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

ports/py-urllib3/vcpkg.json

@@ -0,0 +1,29 @@
+{
+  "name": "py-urllib3",
+  "version": "2.2.3",
+  "description": "HTTP library with thread-safe connection pooling, file post, and more.",
+  "homepage": "https://github.com/urllib3/urllib3",
+  "dependencies": [
+    {
+      "name": "py-hatch-vcs",
+      "host": true
+    },
+    {
+      "name": "py-hatchling",
+      "host": true
+    },
+    {
+      "name": "py-setuptools",
+      "host": true
+    },
+    {
+      "name": "py-setuptools-scm",
+      "host": true
+    },
+    "python3",
+    {
+      "name": "vcpkg-python-scripts",
+      "host": true
+    }
+  ]
+}

versions/baseline.json

@@ -48,6 +48,14 @@
       "baseline": "16",
       "port-version": 1
     },
+    "py-hatch-vcs": {
+      "baseline": "0.4.0",
+      "port-version": 0
+    },
+    "py-hatchling": {
+      "baseline": "1.25.0",
+      "port-version": 0
+    },
     "py-installer": {
       "baseline": "0.7.0",
       "port-version": 1
@@ -56,6 +64,10 @@
       "baseline": "1.4.5",
       "port-version": 0
     },
+    "py-markupsafe": {
+      "baseline": "3.0.1",
+      "port-version": 0
+    },
     "py-matplotlib": {
       "baseline": "3.9.2",
       "port-version": 0
@@ -72,6 +84,10 @@
       "baseline": "24.1",
       "port-version": 1
     },
+    "py-pathspec": {
+      "baseline": "0.12.1",
+      "port-version": 0
+    },
     "py-pillow": {
       "baseline": "10.4.0",
       "port-version": 0
@@ -80,6 +96,10 @@
       "baseline": "24.2",
       "port-version": 0
     },
+    "py-pluggy": {
+      "baseline": "1.5.0",
+      "port-version": 0
+    },
     "py-ply": {
       "baseline": "3.11",
       "port-version": 2
@@ -130,7 +150,7 @@
     },
     "py-setuptools-scm": {
       "baseline": "8.1.0",
-      "port-version": 0
+      "port-version": 1
     },
     "py-sip": {
       "baseline": "6.8.3",
@@ -144,10 +164,18 @@
       "baseline": "2.0.1",
       "port-version": 0
     },
+    "py-trove-classifiers": {
+      "baseline": "2024.9.12",
+      "port-version": 0
+    },
     "py-typing-extensions": {
       "baseline": "4.11.0",
       "port-version": 0
     },
+    "py-urllib3": {
+      "baseline": "2.2.3",
+      "port-version": 0
+    },
     "py-wheel": {
       "baseline": "0.43.0",
       "port-version": 0

versions/p-/py-hatch-vcs.json

@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "21cc704d04b4afaea4bcbe9e220db52a009cf14a",
+      "version": "0.4.0",
+      "port-version": 0
+    }
+  ]
+}