Merge pull request #1799 from pythonnet/SupportedVersions

filmor · web-flow · commit 3cb2529386bf · 2022-05-26T21:20:39.000+02:00
`Min`/`MaxSupportedVersion` and `IsSupportedVersion` on `PythonEngine`
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@ See [Mixins/collections.py](src/runtime/Mixins/collections.py).
 and other `PyObject` derived types when called from Python.
 -   .NET classes, that have `__call__` method are callable from Python
 -   `PyIterable` type, that wraps any iterable object in Python
+-   `PythonEngine` properties for supported Python versions: `MinSupportedVersion`, `MaxSupportedVersion`, and `IsSupportedVersion`
 
 
 ### Changed
diff --git a/src/runtime/PythonEngine.cs b/src/runtime/PythonEngine.cs
@@ -127,6 +127,10 @@ public static string PythonPath
             }
         }
 
+        public static Version MinSupportedVersion => new(3, 7);
+        public static Version MaxSupportedVersion => new(3, 10, int.MaxValue, int.MaxValue);
+        public static bool IsSupportedVersion(Version version) => version >= MinSupportedVersion && version <= MaxSupportedVersion;
+
         public static string Version
         {
             get { return Marshal.PtrToStringAnsi(Runtime.Py_GetVersion()); }
diff --git a/tests/test_codec.py b/tests/test_codec.py
@@ -10,6 +10,7 @@
 
 @pytest.fixture(autouse=True)
 def reset():
+    CodecResetter.Reset()
     yield
     CodecResetter.Reset()
 
diff --git a/tests/test_conversion.py b/tests/test_conversion.py
@@ -4,7 +4,7 @@
 import pytest
 
 import System
-from Python.Test import ConversionTest, MethodResolutionInt, UnicodeString
+from Python.Test import ConversionTest, MethodResolutionInt, UnicodeString, CodecResetter
 from Python.Runtime import PyObjectConversions
 from Python.Runtime.Codecs import RawProxyEncoder
 
@@ -659,6 +659,8 @@ def CanEncode(self, clr_type):
     l.Add(42)
     assert ob.ListField.Count == 1
 
+    CodecResetter.Reset()
+
 def test_int_param_resolution_required():
     """Test resolution of `int` parameters when resolution is needed"""
 
diff --git a/tests/test_engine.py b/tests/test_engine.py
@@ -19,6 +19,14 @@ def test_multiple_calls_to_initialize():
         assert False  # Initialize() raise an exception.
 
 
+def test_supported_version():
+    major, minor, build, *_ = sys.version_info
+    ver = System.Version(major, minor, build)
+    assert PythonEngine.IsSupportedVersion(ver)
+    assert ver >= PythonEngine.MinSupportedVersion
+    assert ver <= PythonEngine.MaxSupportedVersion
+
+
 @pytest.mark.skip(reason="FIXME: test crashes")
 def test_import_module():
     """Test module import."""

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,10 @@ public static string PythonPath`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
	`130`	`+ public static Version MinSupportedVersion => new(3, 7);`
	`131`	`+ public static Version MaxSupportedVersion => new(3, 10, int.MaxValue, int.MaxValue);`
	`132`	`+ public static bool IsSupportedVersion(Version version) => version >= MinSupportedVersion && version <= MaxSupportedVersion;`
	`133`	`+`
`130`	`134`	`public static string Version`
`131`	`135`	`{`
`132`	`136`	`get { return Marshal.PtrToStringAnsi(Runtime.Py_GetVersion()); }`