From 22a35b3d78f986ba118e67ba1171b2a79d3b07d7 Mon Sep 17 00:00:00 2001 From: Inna Wiesel Date: Thu, 30 May 2019 12:41:52 +0300 Subject: [PATCH 1/3] Generate NuGet package during build --- appveyor.yml | 1 + setup.py | 1 + src/runtime/Python.Runtime.15.csproj | 21 ++++++++++++++------- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 74b9a9c8e..445f9bb5a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -72,6 +72,7 @@ on_finish: artifacts: - path: dist\* + - path: '.\src\runtime\bin\*.nupkg' notifications: - provider: Slack diff --git a/setup.py b/setup.py index 8528753b0..53c7f3f67 100644 --- a/setup.py +++ b/setup.py @@ -334,6 +334,7 @@ def build_extension(self, ext): ), '/p:PythonBuildDir="{}"'.format(os.path.abspath(dest_dir)), '/p:PythonInteropFile="{}"'.format(os.path.basename(interop_file)), + "/p:PackageId=pythonnet_py{0}{1}_{2}".format(PY_MAJOR, PY_MINOR, ARCH), "/verbosity:{}".format(VERBOSITY), ] diff --git a/src/runtime/Python.Runtime.15.csproj b/src/runtime/Python.Runtime.15.csproj index fb0020356..154aad323 100644 --- a/src/runtime/Python.Runtime.15.csproj +++ b/src/runtime/Python.Runtime.15.csproj @@ -7,14 +7,21 @@ net45 Python.Runtime Python.Runtime - Python.Runtime + pythonnet 2.4.1 - false - false - false - false - false - false + true + false + Python for .NET + Copyright (c) 2006-2019 the contributors of the 'Python for .NET' project + Python and CLR (.NET and Mono) cross-platform language interop + pythonnet + https://github.com/pythonnet/pythonnet/blob/master/LICENSE + https://github.com/pythonnet/pythonnet + git + https://github.com/pythonnet/pythonnet/releases/tag/v2.4.0 + python interop dynamic dlr Mono pinvoke + https://raw.githubusercontent.com/pythonnet/pythonnet/master/src/console/python-clear.ico + https://pythonnet.github.io/ bin\ false $(OutputPath)\$(AssemblyName).xml From dad124f53ef0024b9efdd8abb0a3577ef44e5a06 Mon Sep 17 00:00:00 2001 From: Inna Wiesel Date: Mon, 3 Jun 2019 21:17:50 +0300 Subject: [PATCH 2/3] Comment out PackageReleaseNotes field --- src/runtime/Python.Runtime.15.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/Python.Runtime.15.csproj b/src/runtime/Python.Runtime.15.csproj index 154aad323..a4d1773f7 100644 --- a/src/runtime/Python.Runtime.15.csproj +++ b/src/runtime/Python.Runtime.15.csproj @@ -18,7 +18,7 @@ https://github.com/pythonnet/pythonnet/blob/master/LICENSE https://github.com/pythonnet/pythonnet git - https://github.com/pythonnet/pythonnet/releases/tag/v2.4.0 + python interop dynamic dlr Mono pinvoke https://raw.githubusercontent.com/pythonnet/pythonnet/master/src/console/python-clear.ico https://pythonnet.github.io/ From c2674cd41277dae99d3d9110d412d1f7167df2cb Mon Sep 17 00:00:00 2001 From: Inna Wiesel Date: Mon, 3 Jun 2019 21:37:12 +0300 Subject: [PATCH 3/3] Update CHANGELOG and AUTHORS --- AUTHORS.md | 5 +++-- CHANGELOG.md | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 27aae63f4..ba954b47d 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -27,9 +27,10 @@ - David Lechner ([@dlech](https://github.com/dlech)) - Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse)) - He-chien Tsai ([@t3476](https://github.com/t3476)) --   Ivan Cronyn ([@cronan](https://github.com/cronan)) +- Inna Wiesel ([@inna-w](https://github.com/inna-w)) +- Ivan Cronyn ([@cronan](https://github.com/cronan)) - Jan Krivanek ([@jakrivan](https://github.com/jakrivan)) --   Jeff Reback ([@jreback](https://github.com/jreback)) +- Jeff Reback ([@jreback](https://github.com/jreback)) - Joe Frayne ([@jfrayne](https://github.com/jfrayne)) - John Burnett ([@johnburnett](https://github.com/johnburnett)) - John Wilkes ([@jbw3](https://github.com/jbw3)) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2d276e51..b5531bf47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ This document follows the conventions laid out in [Keep a CHANGELOG][]. ### Added +- Added automatic NuGet package generation in appveyor and local builds + ### Changed ### Fixed