pytest-cmake 0.13.0__tar.gz → 1.0.0__tar.gz

{pytest_cmake-0.13.0 → pytest_cmake-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-cmake
-Version: 0.13.0
+Version: 1.0.0
 Summary: Provide CMake module for Pytest
 Project-URL: Documentation, https://python-cmake.github.io/pytest-cmake
 Project-URL: Repository, https://github.com/python-cmake/pytest-cmake
@@ -32,8 +32,6 @@ License-File: LICENSE
 Keywords: cmake,development,pytest
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
@@ -41,15 +39,16 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Build Tools
-Requires-Python: !=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,<4,>=2.7
+Requires-Python: <4,>=3.7
 Requires-Dist: pytest<9,>=4
 Description-Content-Type: text/markdown
 
 # Pytest CMake
 
 [![PyPi version](https://img.shields.io/pypi/v/pytest-cmake.svg?logo=pypi&label=PyPI&logoColor=gold)](https://pypi.python.org/pypi/pytest-cmake)
-[![CMake](https://img.shields.io/badge/CMake-3.20...3.30-blue.svg?logo=CMake&logoColor=blue)](https://cmake.org)
+[![CMake](https://img.shields.io/badge/CMake-3.20...4.1-blue.svg?logo=CMake&logoColor=blue)](https://cmake.org)
 [![Test](https://github.com/python-cmake/pytest-cmake/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/python-cmake/pytest-cmake/actions/workflows/test.yml)
 [![License](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 

{pytest_cmake-0.13.0 → pytest_cmake-1.0.0}/README.md

@@ -1,7 +1,7 @@
 # Pytest CMake
 
 [![PyPi version](https://img.shields.io/pypi/v/pytest-cmake.svg?logo=pypi&label=PyPI&logoColor=gold)](https://pypi.python.org/pypi/pytest-cmake)
-[![CMake](https://img.shields.io/badge/CMake-3.20...3.30-blue.svg?logo=CMake&logoColor=blue)](https://cmake.org)
+[![CMake](https://img.shields.io/badge/CMake-3.20...4.1-blue.svg?logo=CMake&logoColor=blue)](https://cmake.org)
 [![Test](https://github.com/python-cmake/pytest-cmake/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/python-cmake/pytest-cmake/actions/workflows/test.yml)
 [![License](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 

{pytest_cmake-0.13.0 → pytest_cmake-1.0.0}/build_config.py

@@ -33,7 +33,7 @@ class BuildConfig(BuildHookInterface):
             stream.write(
                 "include(CMakePackageConfigHelpers)\n"
                 "write_basic_package_version_file(\n"
-                f"    \"{str(version_config_path)}\"\n"
+                f"    \"{str(version_config_path.as_posix())}\"\n"
                 f"    VERSION {pytest.__version__}\n"
                 "    COMPATIBILITY AnyNewerVersion\n"
                 ")"

{pytest_cmake-0.13.0 → pytest_cmake-1.0.0}/cmake/FindPytest.cmake

@@ -17,7 +17,7 @@
 #     prepend a custom search path.
 #     (https://cmake.org/cmake/help/latest/policy/CMP0074.html)
 
-cmake_minimum_required(VERSION 3.20...3.30)
+cmake_minimum_required(VERSION 3.20...4.1)
 
 include(FindPackageHandleStandardArgs)
 
@@ -55,10 +55,34 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
 
     # Function to discover pytest tests and add them to CTest.
     function(pytest_discover_tests NAME)
+        set(_BOOL_ARGS
+          STRIP_PARAM_BRACKETS
+          INCLUDE_FILE_PATH
+          BUNDLE_TESTS
+        )
+
+        set(_SINGLE_VALUE_ARGS
+          WORKING_DIRECTORY
+          TRIM_FROM_NAME
+          TRIM_FROM_FULL_NAME
+        )
+
+        set(_MULTI_VALUE_ARGS
+          TEST_PATHS
+          LIBRARY_PATH_PREPEND
+          PYTHON_PATH_PREPEND
+          ENVIRONMENT
+          PROPERTIES
+          DEPENDS
+          EXTRA_ARGS
+          DISCOVERY_EXTRA_ARGS
+        )
+
         cmake_parse_arguments(
-            PARSE_ARGV 1 "" "STRIP_PARAM_BRACKETS;INCLUDE_FILE_PATH;BUNDLE_TESTS"
-            "WORKING_DIRECTORY;TRIM_FROM_NAME;TRIM_FROM_FULL_NAME"
-            "LIBRARY_PATH_PREPEND;PYTHON_PATH_PREPEND;ENVIRONMENT;PROPERTIES;DEPENDS;EXTRA_ARGS;DISCOVERY_EXTRA_ARGS"
+            PARSE_ARGV 1 ""
+            "${_BOOL_ARGS}"
+            "${_SINGLE_VALUE_ARGS}"
+            "${_MULTI_VALUE_ARGS}"
         )
 
         # Set platform-specific library path environment variable.
@@ -119,6 +143,7 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
             DEPENDS ${_DEPENDS}
             COMMAND ${CMAKE_COMMAND}
             -D "PYTEST_EXECUTABLE=${PYTEST_EXECUTABLE}"
+            -D "TEST_PATHS=${_TEST_PATHS}"
             -D "TEST_GROUP_NAME=${NAME}"
             -D "BUNDLE_TESTS=${_BUNDLE_TESTS}"
             -D "LIBRARY_ENV_NAME=${LIBRARY_ENV_NAME}"
@@ -139,13 +164,13 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
         # Create a custom target to run the tests.
         add_custom_target(${NAME} ALL DEPENDS ${_tests_file})
 
-          file(WRITE "${_include_file}"
-              "if(EXISTS \"${_tests_file}\")\n"
-              "    include(\"${_tests_file}\")\n"
-              "else()\n"
-              "    add_test(${NAME}_NOT_BUILT ${NAME}_NOT_BUILT)\n"
-              "endif()\n"
-          )
+        file(WRITE "${_include_file}"
+            "if(EXISTS \"${_tests_file}\")\n"
+            "    include(\"${_tests_file}\")\n"
+            "else()\n"
+            "    add_test(${NAME}_NOT_BUILT ${NAME}_NOT_BUILT)\n"
+            "endif()\n"
+        )
 
         # Register the include file to be processed for tests.
         set_property(DIRECTORY

{pytest_cmake-0.13.0 → pytest_cmake-1.0.0}/cmake/PytestAddTests.cmake

@@ -1,5 +1,5 @@
 # Wrapper used to create individual CTest tests from Pytest tests.
-cmake_minimum_required(VERSION 3.20...3.30)
+cmake_minimum_required(VERSION 3.20...4.1)
 
 if(CMAKE_SCRIPT_MODE_FILE)
 
@@ -38,14 +38,21 @@ if(CMAKE_SCRIPT_MODE_FILE)
     list(JOIN EXTRA_ARGS_WRAPPED " " EXTRA_ARGS_STR)
 
     # Macro to create individual tests with optional test properties.
-    macro(create_test NAME IDENTIFIER)
-        string(APPEND _content
-            "add_test([==[${NAME}]==] \"${PYTEST_EXECUTABLE}\" [==[${IDENTIFIER}]==] ${EXTRA_ARGS_STR} )\n"
-        )
+    macro(create_test NAME IDENTIFIERS)
+        string(APPEND _content "add_test([==[${NAME}]==] \"${PYTEST_EXECUTABLE}\"")
+
+        foreach(identifier ${IDENTIFIERS})
+            string(APPEND _content " [==[${identifier}]==]")
+        endforeach()
+
+        string(APPEND _content " ${EXTRA_ARGS_STR} )\n")
 
         # Prepare the properties for the test, including the environment settings.
         set(args "PROPERTIES ENVIRONMENT [==[${ENCODED_ENVIRONMENT}]==]")
 
+        # Add working directory
+        string(APPEND args " WORKING_DIRECTORY [==[${WORKING_DIRECTORY}]==]")
+
         # Append any additional properties, escaping complex characters if necessary.
         foreach(property ${TEST_PROPERTIES})
             if(property MATCHES "[^-./:a-zA-Z0-9_]")
@@ -61,7 +68,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
 
     # If tests are bundled together, create a single test group.
     if (BUNDLE_TESTS)
-        create_test("\${TEST_GROUP_NAME}" "\${WORKING_DIRECTORY}")
+        create_test("\${TEST_GROUP_NAME}" "\${TEST_PATHS}")
 
     else()
         # Set environment variables for collecting tests.
@@ -69,11 +76,19 @@ if(CMAKE_SCRIPT_MODE_FILE)
         set(ENV{PYTHONPATH} "${PYTHON_PATH}")
         set(ENV{PYTHONWARNINGS} "ignore")
 
+        set(_command
+            "${PYTEST_EXECUTABLE}" --collect-only -q
+            "--rootdir=${WORKING_DIRECTORY}"
+            ${DISCOVERY_EXTRA_ARGS}
+        )
+
+        foreach(test_path IN LISTS TEST_PATHS)
+            list(APPEND _command "${test_path}")
+        endforeach()
+
         # Collect tests.
         execute_process(
-            COMMAND "${PYTEST_EXECUTABLE}"
-                --collect-only -q
-                --rootdir=${WORKING_DIRECTORY} ${DISCOVERY_EXTRA_ARGS} .
+            COMMAND ${_command}
             OUTPUT_VARIABLE _output_lines
             ERROR_VARIABLE _output_lines
             OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -81,7 +96,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
         )
 
         # Check for errors during test collection.
-        string(REGEX MATCH "=+ ERRORS =+(.*)" _error "${_output_lines}")
+        string(REGEX MATCH "(=+ ERRORS =+|ERROR:).*" _error "${_output_lines}")
 
         if (_error)
             message(${_error})
@@ -141,7 +156,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
 
             # Prefix the test name with the test group name.
             set(test_name "${TEST_GROUP_NAME}.${test_name}")
-            set(test_case "${WORKING_DIRECTORY}/${line}")
+            set(test_case "${line}")
 
             # Create the test for CTest.
             create_test("\${test_name}" "\${test_case}")

{pytest_cmake-0.13.0 → pytest_cmake-1.0.0}/pyproject.toml

@@ -1,18 +1,16 @@
 [build-system]
 requires = [
-    "hatchling >= 1.4; python_version >= '3'",
-    "setuptools >= 44; python_version < '3'",
-    "cmake >= 3.20, < 3.31"
+    "hatchling >= 1.4",
+    "cmake >= 3.20, < 4.2"
 ]
-build-backend = "build_backend"
-backend-path = ["."]
+build-backend = "hatchling.build"
 
 [project]
 name = "pytest-cmake"
-version = "0.13.0"
+version = "1.0.0"
 description = "Provide CMake module for Pytest"
 readme = "README.md"
-requires-python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
+requires-python = ">=3.7, <4"
 license = {file = "LICENSE"}
 keywords = ["cmake", "pytest", "development"]
 authors = [
@@ -25,8 +23,6 @@ classifiers = [
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Build Tools",
     "License :: OSI Approved :: MIT License",
-    "Programming Language :: Python :: 2",
-    "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
@@ -34,6 +30,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 
 [project.urls]
@@ -56,4 +53,4 @@ path = "build_config.py"
 only-include = ["*.cmake"]
 
 [tool.hatch.build.targets.sdist]
-only-include = ["cmake", "build_config.py", "build_backend.py", "setup.py"]
+only-include = ["cmake", "build_config.py"]

pytest_cmake-0.13.0/build_backend.py

@@ -1,9 +0,0 @@
-"""Custom backend to ensure compatibility with Python 2.7.
-"""
-
-import sys
-
-if sys.version_info[0] < 3:
-    from setuptools.build_meta import *
-else:
-    from hatchling.build import *

pytest_cmake-0.13.0/setup.py

@@ -1,78 +0,0 @@
-"""Setuptools config only used for Python 2.7 compatibility.
-"""
-
-from setuptools import setup
-from setuptools.command.install import install
-
-import os
-import subprocess
-
-
-ROOT = os.path.dirname(os.path.realpath(__file__))
-DEPENDENCIES = ["pytest >= 4, < 9"]
-
-
-class CreateCmakeConfig(install):
-    """Custom command to create and share pytest config."""
-
-    def run(self):
-        """Execute builder."""
-        import pytest
-
-        build_path = os.path.join(ROOT, "build")
-        if not os.path.exists(build_path):
-            os.makedirs(build_path)
-
-        # CMake search procedure is limited to CMake package configuration files
-        # and does not work with modules. Hence, we are generating a
-        # configuration file based on the CMake modules created.
-        # https://cmake.org/cmake/help/latest/command/find_package.html
-        config_path = os.path.join(build_path, "PytestConfig.cmake")
-        with open(config_path, "w") as stream:
-            stream.write(
-                "include(${CMAKE_CURRENT_LIST_DIR}/FindPytest.cmake)\n"
-            )
-
-        # Generate CMake config version file for client to target a specific
-        # version of Pytest within CMake projects.
-        version_config_path = os.path.join(
-            build_path, "PytestConfigVersion.cmake"
-        )
-        script_path = os.path.join(
-            build_path, "PytestConfigVersionScript.cmake"
-        )
-        with open(script_path, "w") as stream:
-            stream.write(
-                "include(CMakePackageConfigHelpers)\n"
-                "write_basic_package_version_file(\n"
-                "    \"{path}\"\n"
-                "    VERSION {version}\n"
-                "    COMPATIBILITY AnyNewerVersion\n"
-                ")".format(
-                    path=str(version_config_path),
-                    version=pytest.__version__,
-                )
-            )
-
-        subprocess.call(["cmake", "-P", str(script_path), "-VV"])
-        return install.run(self)
-
-
-setup(
-    name="pytest-cmake",
-    version="0.13.0",
-    data_files=[
-        (
-            "share/Pytest/cmake",
-            [
-                "build/PytestConfig.cmake",
-                "build/PytestConfigVersion.cmake",
-                "cmake/FindPytest.cmake",
-                "cmake/PytestAddTests.cmake"
-            ]
-        )
-    ],
-    cmdclass={"install": CreateCmakeConfig},
-    install_requires=DEPENDENCIES,
-    setup_requires=DEPENDENCIES,
-)