From 73bf84ed7d37a748da1d81c057753ee6b0508863 Mon Sep 17 00:00:00 2001 From: Benedikt Reinartz Date: Fri, 3 May 2019 09:37:43 +0200 Subject: [PATCH] Back to dev version for 2.4.1 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- src/SharedAssemblyInfo.cs | 2 +- src/clrmodule/ClrModule.cs | 2 +- src/clrmodule/clrmodule.15.csproj | 2 +- src/console/Console.15.csproj | 2 +- src/embed_tests/Python.EmbeddingTest.15.csproj | 2 +- src/runtime/Python.Runtime.15.csproj | 2 +- src/runtime/resources/clr.py | 2 +- src/testing/Python.Test.15.csproj | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 289b864..f2d276e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ This project adheres to [Semantic Versioning][]. This document follows the conventions laid out in [Keep a CHANGELOG][]. +## [unreleased][] + +### Added + +### Changed + +### Fixed + ## [2.4.0][] ### Added diff --git a/setup.py b/setup.py index 7b12997..beb930a 100644 --- a/setup.py +++ b/setup.py @@ -622,7 +622,7 @@ if not os.path.exists(_get_interop_filename()): setup( name="pythonnet", - version="2.4.0", + version="2.4.1-dev", 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 669a437..dc72b0b 100644 --- a/src/SharedAssemblyInfo.cs +++ b/src/SharedAssemblyInfo.cs @@ -25,4 +25,4 @@ using System.Runtime.InteropServices; // 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("2.4.0")] +[assembly: AssemblyVersion("2.4.1")] diff --git a/src/clrmodule/ClrModule.cs b/src/clrmodule/ClrModule.cs index 3bb3a53..7fc654f 100644 --- a/src/clrmodule/ClrModule.cs +++ b/src/clrmodule/ClrModule.cs @@ -53,7 +53,7 @@ public class clrModule { #if USE_PYTHON_RUNTIME_VERSION // Has no effect until SNK works. Keep updated anyways. - Version = new Version("2.4.0"), + Version = new Version("2.4.1"), #endif CultureInfo = CultureInfo.InvariantCulture }; diff --git a/src/clrmodule/clrmodule.15.csproj b/src/clrmodule/clrmodule.15.csproj index 2585ffd..326620c 100644 --- a/src/clrmodule/clrmodule.15.csproj +++ b/src/clrmodule/clrmodule.15.csproj @@ -9,7 +9,7 @@ clrmodule clrmodule clrmodule - 2.4.0 + 2.4.1 false false false diff --git a/src/console/Console.15.csproj b/src/console/Console.15.csproj index ec50080..4e765fe 100644 --- a/src/console/Console.15.csproj +++ b/src/console/Console.15.csproj @@ -8,7 +8,7 @@ nPython Python.Runtime nPython - 2.4.0 + 2.4.1 false false false diff --git a/src/embed_tests/Python.EmbeddingTest.15.csproj b/src/embed_tests/Python.EmbeddingTest.15.csproj index a741a58..4f6b2de 100644 --- a/src/embed_tests/Python.EmbeddingTest.15.csproj +++ b/src/embed_tests/Python.EmbeddingTest.15.csproj @@ -10,7 +10,7 @@ Python.EmbeddingTest Python.EmbeddingTest Python.EmbeddingTest - 2.4.0 + 2.4.1 false false false diff --git a/src/runtime/Python.Runtime.15.csproj b/src/runtime/Python.Runtime.15.csproj index 29177b7..fb00203 100644 --- a/src/runtime/Python.Runtime.15.csproj +++ b/src/runtime/Python.Runtime.15.csproj @@ -8,7 +8,7 @@ Python.Runtime Python.Runtime Python.Runtime - 2.4.0 + 2.4.1 false false false diff --git a/src/runtime/resources/clr.py b/src/runtime/resources/clr.py index ddb0d94..4526522 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__ = "2.4.0" +__version__ = "2.4.1" class clrproperty(object): diff --git a/src/testing/Python.Test.15.csproj b/src/testing/Python.Test.15.csproj index da20ed2..8c23fe4 100644 --- a/src/testing/Python.Test.15.csproj +++ b/src/testing/Python.Test.15.csproj @@ -7,7 +7,7 @@ Python.Test Python.Test Python.Test - 2.4.0 + 2.4.1 bin\ false $(OutputPath)\$(AssemblyName).xml