Merge pull request #398 from vmuriart/bumpversion

vmuriart · web-flow · commit 909b7c070790 · 2017-02-21T22:43:50.000-08:00
Add bumpversion &amp; fix version numbers in code.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -0,0 +1,29 @@
+[bumpversion]
+current_version = 2.3.0.dev1
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
+serialize = 
+	{major}.{minor}.{patch}.{release}{dev}
+	{major}.{minor}.{patch}
+
+[bumpversion:part:release]
+optional_value = dummy
+values = 
+	dev
+	dummy
+
+[bumpversion:part:dev]
+
+[bumpversion:file:setup.py]
+
+[bumpversion:file:conda.recipe/meta.yaml]
+
+[bumpversion:file:src/runtime/resources/clr.py]
+
+[bumpversion:file:src/SharedAssemblyInfo.cs]
+serialize = 
+	{major}.{minor}.{patch}
+
+[bumpversion:file:src/clrmodule/ClrModule.cs]
+serialize = 
+	{major}.{minor}.{patch}
+
diff --git a/.editorconfig b/.editorconfig
@@ -22,3 +22,8 @@ indent_size = 2
 # Solution
 [*.sln]
 indent_style = tab
+
+# bumpversion reformats itself after every bump
+[.bumpversion.cfg]
+trim_trailing_whitespace = false
+indent_style = tab
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: pythonnet
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '').replace('-dev', '.dev') }}
+  version: "2.3.0.dev1"
 
 build:
   skip: True  # [not win]
diff --git a/setup.cfg b/setup.cfg
@@ -1,4 +1,8 @@
+# [bumpversion] comments. bumpversion deleted all comments on its file.
 # Don't combine `.bumpversion.cfg` with `setup.cfg`. Messes up formatting.
+# Don't use `first_value = 1`. It will break `release` bump
+# Keep `optional = dummy` needed to bump to release.
+# See: https://github.com/peritus/bumpversion/issues/59
 
 [tool:pytest]
 xfail_strict = True
diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Reflection;
+using System.Resources;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("pythonnet")]
+[assembly: AssemblyProduct("Python for .NET")]
+[assembly: AssemblyCopyright("Copyright (c) 2006-2017 the contributors of the 'Python for .NET' project")]
+[assembly: AssemblyTrademark("")]
+
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("")]
+
+[assembly: CLSCompliant(true)]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// 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.3.0")]
diff --git a/src/clrmodule/AssemblyInfo.cs b/src/clrmodule/AssemblyInfo.cs
diff --git a/src/clrmodule/ClrModule.cs b/src/clrmodule/ClrModule.cs
@@ -52,7 +52,8 @@ public static void initclr()
         var pythonRuntimeName = new AssemblyName("Python.Runtime")
         {
 #if USE_PYTHON_RUNTIME_VERSION
-            Version = new Version("4.0.0.1"),
+            // Has no effect until SNK works. Keep updated anyways.
+            Version = new Version("2.3.0"),
 #endif
             CultureInfo = CultureInfo.InvariantCulture
         };
diff --git a/src/clrmodule/Properties/AssemblyInfo.cs b/src/clrmodule/Properties/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("clrmodule")]
+[assembly: AssemblyDescription("")]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("ae10d6a4-55c2-482f-9716-9988e6c169e3")]
diff --git a/src/clrmodule/clrmodule.csproj b/src/clrmodule/clrmodule.csproj
@@ -14,6 +14,7 @@
     <NoWarn>1591</NoWarn>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
     <!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
     <RestorePackages>true</RestorePackages>
     <ErrorReport>prompt</ErrorReport>
@@ -72,7 +73,10 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="ClrModule.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/console/AssemblyInfo.cs b/src/console/AssemblyInfo.cs
diff --git a/src/console/Console.csproj b/src/console/Console.csproj
@@ -14,6 +14,7 @@
     <NoWarn>1591</NoWarn>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
     <!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
     <ApplicationIcon>python-clear.ico</ApplicationIcon>
     <ErrorReport>prompt</ErrorReport>
@@ -71,7 +72,10 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="pythonconsole.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/console/Properties/AssemblyInfo.cs b/src/console/Properties/AssemblyInfo.cs
@@ -0,0 +1,8 @@
+using System.Reflection;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Python Console")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyDefaultAlias("python.exe")]
diff --git a/src/runtime/AssemblyInfo.cs b/src/runtime/AssemblyInfo.cs
diff --git a/src/runtime/Properties/AssemblyInfo.cs b/src/runtime/Properties/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Python for .NET")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyDefaultAlias("Python.Runtime.dll")]
+
+[assembly: InternalsVisibleTo("Python.EmbeddingTest")]
diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj
@@ -14,6 +14,7 @@
     <NoWarn>1591</NoWarn>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
     <!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SignAssembly>false</SignAssembly>
@@ -73,7 +74,10 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="arrayobject.cs" />
     <Compile Include="assemblymanager.cs" />
     <Compile Include="classderived.cs" />
