From 7e0ca0a819deb59fd4aeb7ca1ba899f5ba92551d Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Mon, 29 Apr 2024 19:23:34 -0400 Subject: [PATCH 1/7] support `python -m cmake` --- src/cmake/__main__.py | 4 ++++ tests/test_cmake.py | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 src/cmake/__main__.py diff --git a/src/cmake/__main__.py b/src/cmake/__main__.py new file mode 100644 index 00000000..eef3a7e4 --- /dev/null +++ b/src/cmake/__main__.py @@ -0,0 +1,4 @@ +from cmake import cmake + +if __name__ == "__main__": + cmake() \ No newline at end of file diff --git a/tests/test_cmake.py b/tests/test_cmake.py index b6ab3ad1..58736778 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -71,3 +71,9 @@ def test_cmake_script(tool): assert len(scripts) == 1 output = subprocess.check_output([str(scripts[0]), "--version"]).decode("ascii") assert output.splitlines()[0] == f"{tool} version {expected_version}" + + +def test_cmake_module(): + expected_version = "3.29.2" + output = subprocess.check_output([sys.executable, "-m", "cmake", "--version"]).decode("ascii") + assert output.splitlines()[0] == f"cmake version {expected_version}" From ee1a5c880491fa7cbb444e4bfe827736e0a69a17 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 23:25:06 +0000 Subject: [PATCH 2/7] style: pre-commit fixes --- src/cmake/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmake/__main__.py b/src/cmake/__main__.py index eef3a7e4..23d232d4 100644 --- a/src/cmake/__main__.py +++ b/src/cmake/__main__.py @@ -1,4 +1,4 @@ from cmake import cmake if __name__ == "__main__": - cmake() \ No newline at end of file + cmake() From 624da4fc214c5c61e44f6aa46a3965be0dbcf4c4 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Mon, 29 Apr 2024 19:26:36 -0400 Subject: [PATCH 3/7] rename test method --- tests/test_cmake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_cmake.py b/tests/test_cmake.py index 58736778..10f16f18 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -73,7 +73,7 @@ def test_cmake_script(tool): assert output.splitlines()[0] == f"{tool} version {expected_version}" -def test_cmake_module(): +def test_cmake_init(): expected_version = "3.29.2" output = subprocess.check_output([sys.executable, "-m", "cmake", "--version"]).decode("ascii") assert output.splitlines()[0] == f"cmake version {expected_version}" From 1f3e41f9c463f2f045c903e8e82d98551f5e46b7 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Mon, 29 Apr 2024 19:41:33 -0400 Subject: [PATCH 4/7] rename test method name --- tests/test_cmake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_cmake.py b/tests/test_cmake.py index 10f16f18..51a045d9 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -73,7 +73,7 @@ def test_cmake_script(tool): assert output.splitlines()[0] == f"{tool} version {expected_version}" -def test_cmake_init(): +def test_cmake_main(): expected_version = "3.29.2" output = subprocess.check_output([sys.executable, "-m", "cmake", "--version"]).decode("ascii") assert output.splitlines()[0] == f"cmake version {expected_version}" From 975edcf41b81f6fe8222ca5af48393a0e71e41ae Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 14 Jun 2024 15:20:25 -0400 Subject: [PATCH 5/7] Apply suggestions from code review --- tests/test_cmake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_cmake.py b/tests/test_cmake.py index 51a045d9..bda00187 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -75,5 +75,5 @@ def test_cmake_script(tool): def test_cmake_main(): expected_version = "3.29.2" - output = subprocess.check_output([sys.executable, "-m", "cmake", "--version"]).decode("ascii") + output = subprocess.run([sys.executable, "-m", "cmake", "--version"], text=True, capture_output=True).stdout assert output.splitlines()[0] == f"cmake version {expected_version}" From 5552196b45920a777dfd82ffdf827d30100af44c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 19:21:44 +0000 Subject: [PATCH 6/7] style: pre-commit fixes --- tests/test_cmake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_cmake.py b/tests/test_cmake.py index bda00187..44652789 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -75,5 +75,5 @@ def test_cmake_script(tool): def test_cmake_main(): expected_version = "3.29.2" - output = subprocess.run([sys.executable, "-m", "cmake", "--version"], text=True, capture_output=True).stdout + output = subprocess.run([sys.executable, "-m", "cmake", "--version"], text=True, capture_output=True, check=False).stdout assert output.splitlines()[0] == f"cmake version {expected_version}" From 28e122d4fdf0b5e3575883b0df93b02bc1b8ca0a Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Fri, 14 Jun 2024 15:38:45 -0400 Subject: [PATCH 7/7] bump to 3.29.5 --- tests/test_cmake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_cmake.py b/tests/test_cmake.py index 44652789..8a3a0a50 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -74,6 +74,6 @@ def test_cmake_script(tool): def test_cmake_main(): - expected_version = "3.29.2" + expected_version = "3.29.5" output = subprocess.run([sys.executable, "-m", "cmake", "--version"], text=True, capture_output=True, check=False).stdout assert output.splitlines()[0] == f"cmake version {expected_version}"