8000 Merge pull request #25 from QuantConnect/version-bump-1-0-5-16 · saaib/pythonnet@fcd62f6 · GitHub
[go: up one dir, main page]
Skip to content

Commit fcd62f6

Browse files
jaredbroadjaredbroad
authored
Merge pull request QuantConnect#25 from QuantConnect/version-bump-1-0-5-16
Decimal Parsing Allows Numeric String in Exponential Notation and Version Bump
2 parents d047597 + 7e9c3df commit fcd62f6

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

‎.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.0.5.15
2+
current_version = 1.0.5.16
33
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
44
serialize =
55
{major}.{minor}.{patch}.{release}{dev}

‎conda.recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: pythonnet
3-
version: "1.0.5.15"
3+
version: "1.0.5.16"
44

55
build:
66
skip: True # [not win]

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ def run(self):
485485

486486
setup(
487487
name="pythonnet",
488-
version="1.0.5.15",
488+
version="1.0.5.16",
489489
description=".Net and Mono integration for Python",
490490
url='https://pythonnet.github.io/',
491491
license='MIT',

‎src/SharedAssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@
2525
// Version Information. Keeping it simple. May need to revisit for Nuget
2626
// See: https://codingforsmarties.wordpress.com/2016/01/21/how-to-version-assemblies-destined-for-nuget/
2727
// AssemblyVersion can only be numeric
28-
[assembly: AssemblyVersion("1.0.5.15")]
28+
[assembly: AssemblyVersion("1.0.5.16")]

‎src/clrmodule/ClrModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static void initclr()
5353
{
5454
#if USE_PYTHON_RUNTIME_VERSION
5555
// Has no effect until SNK works. Keep updated anyways.
56-
Version = new Version("1.0.5.15"),
56+
Version = new Version("1.0.5.16"),
5757
#endif
5858
CultureInfo = CultureInfo.InvariantCulture
5959
};

‎src/runtime/converter.cs

Lines changed: 1 addition & 1 deletion
8DD1
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
941941
op = Runtime.PyObject_Str(value);
942942
decimal m;
943943
string sm = Runtime.GetManagedString(op);
944-
if (!Decimal.TryParse(sm, NumberStyles.Number, nfi, out m))
944+
if (!Decimal.TryParse(sm, NumberStyles.Number | NumberStyles.AllowExponent, nfi, out m))
945945
{
946946
goto type_error;
947947
}

‎src/runtime/resources/clr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Code in this module gets loaded into the main clr module.
33
"""
44

5-
__version__ = "1.0.5.15"
5+
__version__ = "1.0.5.16"
66

77

88
class clrproperty(object):

0 commit comments

Comments
 (0)
0