From 5c35e800f7423ab9b474978ccea87f387530039d Mon Sep 17 00:00:00 2001 From: AlexCatarino Date: Wed, 20 Feb 2019 16:47:52 +0000 Subject: [PATCH 1/2] Decimal Parsing Allows Numeric String in Exponential Notation --- src/runtime/converter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs index d8ec3fcd2..a81d9fb99 100644 --- a/src/runtime/converter.cs +++ b/src/runtime/converter.cs @@ -941,7 +941,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo op = Runtime.PyObject_Str(value); decimal m; string sm = Runtime.GetManagedString(op); - if (!Decimal.TryParse(sm, NumberStyles.Number, nfi, out m)) + if (!Decimal.TryParse(sm, NumberStyles.Number | NumberStyles.AllowExponent, nfi, out m)) { goto type_error; } From 7e9c3df3a8365e744aa581c3c2700669190e054a Mon Sep 17 00:00:00 2001 From: AlexCatarino Date: Wed, 20 Feb 2019 16:54:18 +0000 Subject: [PATCH 2/2] Version bump to 1.0.5.16 Version bump to match nuget package --- .bumpversion.cfg | 2 +- conda.recipe/meta.yaml | 2 +- setup.py | 2 +- src/SharedAssemblyInfo.cs | 2 +- src/clrmodule/ClrModule.cs | 2 +- src/runtime/resources/clr.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ccb9c32e8..7ea53f6ba 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.5.15 +current_version = 1.0.5.16 parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? serialize = {major}.{minor}.{patch}.{release}{dev} diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 0b70bedc9..497adf5a0 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: pythonnet - version: "1.0.5.15" + version: "1.0.5.16" build: skip: True # [not win] diff --git a/setup.py b/setup.py index 421054d77..03fe25456 100644 --- a/setup.py +++ b/setup.py @@ -485,7 +485,7 @@ def run(self): setup( name="pythonnet", - version="1.0.5.15", + version="1.0.5.16", description=".Net and Mono integration for Python", url='https://pythonnet.github.io/', license='MIT', diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs index cc71683aa..c17676f61 100644 --- a/src/SharedAssemblyInfo.cs +++ b/src/SharedAssemblyInfo.cs @@ -25,4 +25,4 @@ // Version Information. Keeping it simple. May need to revisit for Nuget // See: https://codingforsmarties.wordpress.com/2016/01/21/how-to-version-assemblies-destined-for-nuget/ // AssemblyVersion can only be numeric -[assembly: AssemblyVersion("1.0.5.15")] +[assembly: AssemblyVersion("1.0.5.16")] diff --git a/src/clrmodule/ClrModule.cs b/src/clrmodule/ClrModule.cs index 143759f2e..b198df56b 100644 --- a/src/clrmodule/ClrModule.cs +++ b/src/clrmodule/ClrModule.cs @@ -53,7 +53,7 @@ public static void initclr() { #if USE_PYTHON_RUNTIME_VERSION // Has no effect until SNK works. Keep updated anyways. - Version = new Version("1.0.5.15"), + Version = new Version("1.0.5.16"), #endif CultureInfo = CultureInfo.InvariantCulture }; diff --git a/src/runtime/resources/clr.py b/src/runtime/resources/clr.py index f877058e8..c31118458 100644 --- a/src/runtime/resources/clr.py +++ b/src/runtime/resources/clr.py @@ -2,7 +2,7 @@ Code in this module gets loaded into the main clr module. """ -__version__ = "1.0.5.15" +__version__ = "1.0.5.16" class clrproperty(object):