Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Bumpversion#398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
vmuriart merged 3 commits intopythonnet:masterfromvmuriart:bumpversion
Feb 22, 2017
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions.bumpversion.cfg
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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}

5 changes: 5 additions & 0 deletions.editorconfig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
2 changes: 1 addition & 1 deletionconda.recipe/meta.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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]
Expand Down
4 changes: 4 additions & 0 deletionssetup.cfg
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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
Expand Down
28 changes: 28 additions & 0 deletionssrc/SharedAssemblyInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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")]
39 changes: 0 additions & 39 deletionssrc/clrmodule/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletionsrc/clrmodule/ClrModule.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
};
Expand Down
11 changes: 11 additions & 0 deletionssrc/clrmodule/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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")]
6 changes: 5 additions & 1 deletionsrc/clrmodule/clrmodule.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -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>
Expand Down
16 changes: 0 additions & 16 deletionssrc/console/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletionsrc/console/Console.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -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>
Expand Down
8 changes: 8 additions & 0 deletionssrc/console/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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")]
15 changes: 0 additions & 15 deletionssrc/runtime/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletionssrc/runtime/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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")]
6 changes: 5 additions & 1 deletionsrc/runtime/Python.Runtime.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -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" />
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp