Auto-detect python version and require at least Python 3.9 (#55)

openvmp · Jan 13, 2024 · 0d9e17e · 0d9e17e
1 parent ed8fbf9
commit 0d9e17e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 12 deletions.
diff --git a/partcad-cli/pyproject.toml b/partcad-cli/pyproject.toml
@@ -4,7 +4,7 @@ version = "0.3.2"
 description = "Command-line interface to PartCAD"
 readme = "README.md"
 keywords = ["cadquery", "build123d", "cad", "design", "openscad", "step", "stl"]
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 license = {file = "LICENSE.txt"}
 authors = [
   {name = "Roman Kuzmenko", email = "openvmp@proton.me" }

diff --git a/partcad/pyproject.toml b/partcad/pyproject.toml
@@ -4,7 +4,7 @@ version = "0.3.2"
 description = "Package manager for CAD models and a modelling framework"
 readme = "README.md"
 keywords = ["cadquery", "build123d", "cad", "design", "openscad", "step", "stl"]
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 license = {file = "LICENSE.txt"}
 authors = [
   {name = "Roman Kuzmenko", email = "openvmp@proton.me" }

diff --git a/partcad/src/partcad/project_config.py b/partcad/src/partcad/project_config.py
@@ -70,9 +70,12 @@ def __init__(self, import_config_name, config_path=DEFAULT_CONFIG_FILENAME):
 
         # option: "pythonVersion"
         # description: the version of python to use in sandboxed environments if any
-        # values: string
-        # default: "3.10"
+        # values: string (e.g. "3.10")
+        # default: <The major and minor version of the current interpreter>
         if "pythonVersion" == self.config_obj:
             self.python_version = self.config_obj["pythonVersion"]
         else:
-            self.python_version = "3.10"
+            self.python_version = "%d.%d" % (
+                sys.version_info.major,
+                sys.version_info.minor,
+            )
diff --git a/partcad/src/partcad/runtime_python.py b/partcad/src/partcad/runtime_python.py
@@ -10,13 +10,16 @@
 import os
 import pathlib
 import subprocess
+import sys
 
 
 from . import runtime
 
 
 class PythonRuntime(runtime.Runtime):
-    def __init__(self, ctx, sandbox, version="3.10"):
+    def __init__(self, ctx, sandbox, version=None):
+        if version is None:
+            version = "%d.%d" % (sys.version_info.major, sys.version_info.minor)
         super().__init__(ctx, "python-" + sandbox + "-" + version)
         self.version = version
 

diff --git a/partcad/src/partcad/runtime_python_conda.py b/partcad/src/partcad/runtime_python_conda.py
@@ -14,7 +14,7 @@
 
 
 class CondaPythonRuntime(runtime_python.PythonRuntime):
-    def __init__(self, ctx, version="3.10"):
+    def __init__(self, ctx, version=None):
         super().__init__(ctx, "conda", version)
 
         if not self.initialized:

diff --git a/partcad/src/partcad/runtime_python_none.py b/partcad/src/partcad/runtime_python_none.py
@@ -12,7 +12,7 @@
 
 
 class NonePythonRuntime(runtime_python.PythonRuntime):
-    def __init__(self, ctx, version="3.10"):
+    def __init__(self, ctx, version=None):
         super().__init__(ctx, "none", version)
 
         if not self.initialized:

diff --git a/partcad/src/partcad/runtime_python_pypy.py b/partcad/src/partcad/runtime_python_pypy.py
@@ -14,7 +14,7 @@
 
 
 class PyPyPythonRuntime(runtime_python.PythonRuntime):
-    def __init__(self, ctx, version="3.10"):
+    def __init__(self, ctx, version=None):
         super().__init__(ctx, "pypy", version)
 
         if not self.initialized:

diff --git a/partcad/tests/unit/test_runtime_python.py b/partcad/tests/unit/test_runtime_python.py
@@ -11,12 +11,12 @@
 import partcad as pc
 
 
-def test_runtime_python_version_3_7():
+def test_runtime_python_version_3_9():
     ctx = pc.Context("partcad/tests")
-    runtime = ctx.get_python_runtime("3.7")
+    runtime = ctx.get_python_runtime("3.9")
     version_string, errors = runtime.run(["--version"])
     assert errors == ""
-    assert version_string.startswith("Python 3.7")
+    assert version_string.startswith("Python 3.9")
 
 
 def test_runtime_python_version_3_10():