8000 Merge pull request #21 from QuantConnect/revert-20-update · losttech/pythonnet@69b7f6a · GitHub
[go: up one dir, main page]
Skip to content

Commit 69b7f6a

Browse files
jaredbroadjaredbroad
authored
Merge pull request pythonnet#21 from QuantConnect/revert-20-update
Revert "Rebase to pythonnet master"
2 parents b64fa5f + 54f284b commit 69b7f6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+220
-1701
lines changed

‎.travis.yml

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ matrix:
2222
- dotnet-hostfxr-2.0.0
2323
- dotnet-runtime-2.0.0
2424
- dotnet-sdk-2.0.0
25-
2625
- python: 3.4
2726
env: *xplat-env
2827
addons: *xplat-addons
@@ -34,24 +33,9 @@ matrix:
3433
- python: 3.6
3534
env: *xplat-env
3635
addons: *xplat-addons
37-
38-
- python: 3.7
36+
- python: "3.7-dev"
3937
env: *xplat-env
40-
dist: xenial
41-
sudo: true
42-
addons: &xplat-addons-xenial
43-
apt:
44-
sources:
45-
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main
46-
key_url: https://packages.microsoft.com/keys/microsoft.asc
47-
- sourceline: deb https://download.mono-project.com/repo/ubuntu stable-xenial main
48-
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
49-
packages:
50-
- mono-devel
51-
- ca-certificates-mono
52-
- dotnet-hostfxr-2.0.0
53-
- dotnet-runtime-2.0.0
54-
- dotnet-sdk-2.0.0
38+
addons: *xplat-addons
5539

5640
# --------------------- Classic builds ------------------------
5741
- python: 2.7
@@ -68,18 +52,15 @@ matrix:
6852
- python: 3.6
6953
env: *classic-env
7054

71-
- python: 3.7
55+
- python: "3.7-dev"
56+
env: *classic-env
57+
58+
allow_failures:
59+
- python: "3.7-dev"
60+
env: *xplat-env
61+
62+
- python: "3.7-dev"
7263
env: *classic-env
73-
dist: xenial
74-
sudo: true
75-
addons:
76-
apt:
77-
sources:
78-
- sourceline: deb http://download.mono-project.com/repo/ubuntu xenial main
79-
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
80-
packages:
81-
- mono-devel
82-
- ca-certificates-mono
8364

8465
env:
8566
global:

‎AUTHORS.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
- Alexandre Catarino([@AlexCatarino](https://github.com/AlexCatarino))
1616
- Arvid JB ([@ArvidJB](https://github.com/ArvidJB))
17-
- Benoît Hudson ([@benoithudson](https://github.com/benoithudson))
1817
- Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich))
1918
- Callum Noble ([@callumnoble](https://github.com/callumnoble))
2019
- Christian Heimes ([@tiran](https://github.com/tiran))
@@ -23,12 +22,10 @@
2322
- Daniel Fernandez ([@fdanny](https://github.com/fdanny))
2423
- Daniel Santana ([@dgsantana](https://github.com/dgsantana))
2524
- Dave Hirschfeld ([@dhirschfeld](https://github.com/dhirschfeld))
26-
- David Lassonde ([@lassond](https://github.com/lassond))
2725
- David Lechner ([@dlech](https://github.com/dlech))
2826
- Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
2927
- He-chien Tsai ([@t3476](https://github.com/t3476))
3028
-   Ivan Cronyn ([@cronan](https://github.com/cronan))
31-
- Jan Krivanek ([@jakrivan](https://github.com/jakrivan))
3229
-   Jeff Reback ([@jreback](https://github.com/jreback))
3330
- Joe Frayne ([@jfrayne](https://github.com/jfrayne))
3431
- John Burnett ([@johnburnett](https://github.com/johnburnett))
@@ -42,8 +39,6 @@
4239
- Sam Winstanley ([@swinstanley](https://github.com/swinstanley))
4340
- Sean Freitag ([@cowboygneox](https://github.com/cowboygneox))
4441
- Serge Weinstock ([@sweinst](https://github.com/sweinst))
45-
- Simon Mourier ([@smourier](https://github.com/smourier))
46-
- Viktoria Kovescses ([@vkovec](https://github.com/vkovec))
4742
- Ville M. Vainio ([@vivainio](https://github.com/vivainio))
4843
- Virgil Dupras ([@hsoft](https://github.com/hsoft))
4944
- Wenguang Yang ([@yagweb](https://github.com/yagweb))

‎CHANGELOG.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,23 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
88
## [unreleased][]
99

1010
### Added
11-
1211
- Added support for embedding python into dotnet core 2.0 (NetStandard 2.0)
1312
- Added new build system (pythonnet.15.sln) based on dotnetcore-sdk/xplat(crossplatform msbuild).
1413
Currently there two side-by-side build systems that produces the same output (net40) from the same sources.
1514
After a some transition time, current (mono/ msbuild 14.0) build system will be removed.
1615
- NUnit upgraded to 3.7 (eliminates travis-ci random bug)
17-
- Added C# `PythonEngine.AddShutdownHandler` to help client code clean up on shutdown.
1816
- Added `clr.GetClrType` ([#432][i432])([#433][p433])
1917
- Allowed passing `None` for nullable args ([#460][p460])
2018
- Added keyword arguments based on C# syntax for calling CPython methods ([#461][p461])
2119
- Catches exceptions thrown in C# iterators (yield returns) and rethrows them in python ([#475][i475])([#693][p693])
2220
- Implemented GetDynamicMemberNames() for PyObject to allow dynamic object members to be visible in the debugger ([#443][i443])([#690][p690])
2321
- Incorporated reference-style links to issues and pull requests in the CHANGELOG ([#608][i608])
24-
- Added detailed comments about aproaches and dangers to handle multi-app-domains ([#625][p625])
25-
- Python 3.7 support, builds and testing added. Defaults changed from Python 3.6 to 3.7 ([#698][p698])
2622

2723
### Changed
2824

29-
- Reattach python exception traceback information (#545)
30-
- PythonEngine.Intialize will now call `Py_InitializeEx` with a default value of 0, so signals will not be configured by default on embedding. This is different from the previous behaviour, where `Py_Initialize` was called instead, which sets initSigs to 1. ([#449][i449])
31-
3225
### Fixed
3326

34-
- Fixed secondary PythonEngine.Initialize call, all sensitive static variables now reseted.
35-
This is a hidden bug. Once python cleaning up enough memory, objects from previous engine run becomes corrupted. ([#534][p534])
3627
- Fixed Visual Studio 2017 compat ([#434][i434]) for setup.py
37-
- Fixed crashes when integrating pythonnet in Unity3d ([#714][i714]),
38-
related to unloading the Application Domain
39-
- Fixed interop methods with Py_ssize_t. NetCoreApp 2.0 is more sensitive than net40 and requires this fix. ([#531][p531])
4028
- Fixed crash on exit of the Python interpreter if a python class
4129
derived from a .NET class has a `__namespace__` or `__assembly__`
4230
attribute ([#481][i481])
@@ -48,8 +36,6 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
4836
- Fixed errors breaking .NET Remoting on method invoke ([#276][i276])
4937
- Fixed PyObject.GetHashCode ([#676][i676])
5038
- Fix memory leaks due to spurious handle incrementation ([#691][i691])
51-
- Fix spurious assembly loading exceptions from private types ([#703][i703])
52-
- Fix inheritance of non-abstract base methods ([#755][i755])
5339

5440

5541
## [2.3.0][] - 2017-03-11
@@ -607,7 +593,6 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
607593

608594
[1.0.0]: https://github.com/pythonnet/pythonnet/releases/tag/1.0
609595

610-
[i714]: https://github.com/pythonnet/pythonnet/issues/714
611596
[i608]: https://github.com/pythonnet/pythonnet/issues/608
612597
[i443]: https://github.com/pythonnet/pythonnet/issues/443
613598
[p690]: https://github.com/pythonnet/pythonnet/pull/690
@@ -698,9 +683,4 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
698683
[p225]: https://github.com/pythonnet/pythonnet/pull/225
699684
[p78]: https://github.com/pythonnet/pythonnet/pull/78
700685
[p163]: https://github.com/pythonnet/pythonnet/pull/163
701-
[p625]: https://github.com/pythonnet/pythonnet/pull/625
702686
[i131]: https://github.com/pythonnet/pythonnet/issues/131
703-
[p531]: https://github.com/pythonnet/pythonnet/pull/531
704-
[i755]: https://github.com/pythonnet/pythonnet/pull/755
705-
[p534]: https://github.com/pythonnet/pythonnet/pull/534
706-
[i449]: https://github.com/pythonnet/pythonnet/issues/449

‎NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
44
<add key="dot-net MyGet Feed" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" protocolVersion="3"/>

‎appveyor.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,10 @@ environment:
2323
BUILD_OPTS: --xplat
2424
- PYTHON_VERSION: 3.6
2525
BUILD_OPTS: --xplat
26-
- PYTHON_VERSION: 3.7
27-
BUILD_OPTS: --xplat
2826
- PYTHON_VERSION: 2.7
2927
- PYTHON_VERSION: 3.4
3028
- PYTHON_VERSION: 3.5
3129
- PYTHON_VERSION: 3.6
32-
- PYTHON_VERSION: 3.7
33-
34-
matrix:
35-
allow_failures:
36-
- PYTHON_VERSION: 3.4
37-
BUILD_OPTS: --xplat
38-
- PYTHON_VERSION: 3.4
3930

4031
init:
4132
# Update Environment Variables based on matrix/platform

‎setup.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# Allow config/verbosity to be set from cli
2323
# http://stackoverflow.com/a/4792601/5208670
2424
CONFIG = "Release" # Release or Debug
25-
VERBOSITY = "normal" # quiet, minimal, normal, detailed, diagnostic
25+
VERBOSITY = "minimal" # quiet, minimal, normal, detailed, diagnostic
2626

2727
is_64bits = sys.maxsize > 2**32
2828
DEVTOOLS = "MsDev" if sys.platform == "win32" else "Mono"
@@ -329,16 +329,9 @@ def _install_packages(self):
329329
self.debug_print("Updating NuGet: {0}".format(cmd))
330330
subprocess.check_call(cmd, shell=use_shell)
331331

332-
try:
333-
# msbuild=14 is mainly for Mono issues
334-
cmd = "{0} restore pythonnet.sln -MSBuildVersion 14 -o packages".format(nuget)
335-
self.debug_print("Installing packages: {0}".format(cmd))
336-
subprocess.check_call(cmd, shell=use_shell)
337-
except:
338-
# when only VS 2017 is installed do not specify msbuild version
339-
cmd = "{0} restore pythonnet.sln -o packages".format(nuget)
340-
self.debug_print("Installing packages: {0}".format(cmd))
341-
subprocess.check_call(cmd, shell=use_shell)
332+
cmd = "{0} restore pythonnet.sln -o packages".format(nuget)
333+
self.debug_print("Installing packages: {0}".format(cmd))
334+
subprocess.check_call(cmd, shell=use_shell)
342335

343336
def _find_msbuild_tool(self, tool="msbuild.exe", use_windows_sdk=False):
344337
"""Return full path to one of the Microsoft build tools"""
@@ -523,10 +516,10 @@ def run(self):
523516
'Programming Language :: Python :: 2',
524517
'Programming Language :: Python :: 2.7',
525518
'Programming Language :: Python :: 3',
519+
'Programming Language :: Python :: 3.3',
526520
'Programming Language :: Python :: 3.4',
527521
'Programming Language :: Python :: 3.5',
528522
'Programming Language :: Python :: 3.6',
529-
'Programming Language :: Python :: 3.7',
530523
'Operating System :: Microsoft :: Windows',
531524
'Operating System :: POSIX :: Linux',
532525
'Operating System :: MacOS :: MacOS X',

‎src/embed_tests/GlobalTestsSetup.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/embed_tests/Python.EmbeddingTest.15.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<BaseDefineConstants>XPLAT</BaseDefineConstants>
3030
<DefineConstants>$(DefineConstants);$(CustomDefineConstants);$(BaseDefineConstants);</DefineConstants>
3131
<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.0'">$(DefineConstants);NETCOREAPP</DefineConstants>
32-
<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);NETSTANDARD</DefineConstants>
3332
<DefineConstants Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(CustomDefineConstants)' != '' AND $(Configuration.Contains('Debug'))">$(DefineConstants);TRACE;DEBUG</DefineConstants>
3433
<FrameworkPathOverride Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.5\1.0.1\lib\net45\</FrameworkPathOverride>
3534
</PropertyGroup>

‎src/embed_tests/Python.EmbeddingTest.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -86,7 +86,6 @@
8686
<Compile Include="pyrunstring.cs" />
8787
<Compile Include="TestConverter.cs" />
8888
<Compile Include="TestCustomMarshal.cs" />
89-
<Compile Include="TestDomainReload.cs" />
9089
<Compile Include="TestExample.cs" />
9190
<Compile Include="TestPyAnsiString.cs" />
9291
<Compile Include="TestPyFloat.cs" />
@@ -104,8 +103,6 @@
104103
<Compile Include="TestPyWith.cs" />
105104
<Compile Include="TestRuntime.cs" />
106105
<Compile Include="TestPyScope.cs" />
107-
<Compile Include="TestTypeManager.cs" />
108-
<Compile Include="GlobalTestsSetup.cs" />
109106
</ItemGroup>
110107
<ItemGroup>
111108
<ProjectReference Include="..\runtime\Python.Runtime.csproj">
@@ -125,4 +122,4 @@
125122
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
126123
<!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
127124
</Target>
128-
</Project>
125+
</Project>

‎src/embed_tests/TestConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using NUnit.Framework;
1+
using NUnit.Framework;
22
using Python.Runtime;
33

44
namespace Python.EmbeddingTest

0 commit comments

Comments
 (0)
0