Skip to content

Commit 2972f49

Browse files
authored
Merge pull request #958 from amos402/soft-shutdown
Add soft shutdown
2 parents c79be84 + 8d00e4c commit 2972f49

Some content is hidden

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

61 files changed

+4130
-1269
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ env:
1010
matrix:
1111
- BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp2.0_publish/ PERF_TESTS_PATH=net461/
1212
- BUILD_OPTS="" NUNIT_PATH="./packages/NUnit.*/tools/nunit3-console.exe" RUN_TESTS="mono $NUNIT_PATH" EMBED_TESTS_PATH="" PERF_TESTS_PATH=""
13+
- PYTHONNET_SHUTDOWN_MODE="Soft" BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp2.0_publish/ PERF_TESTS_PATH=net461/
14+
- PYTHONNET_SHUTDOWN_MODE="Soft" BUILD_OPTS="" NUNIT_PATH="./packages/NUnit.*/tools/nunit3-console.exe" RUN_TESTS="mono $NUNIT_PATH" EMBED_TESTS_PATH="" PERF_TESTS_PATH=""
1315

1416
global:
1517
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so

AUTHORS.md

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
- David Lassonde ([@lassond](https://github.com/lassond))
3636
- David Lechner ([@dlech](https://github.com/dlech))
3737
- Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
38+
- Félix Bourbonnais ([@BadSingleton](https://github.com/BadSingleton))
3839
- Florian Treurniet ([@ftreurni](https://github.com/ftreurni))
3940
- He-chien Tsai ([@t3476](https://github.com/t3476))
4041
- Inna Wiesel ([@inna-w](https://github.com/inna-w))
@@ -66,6 +67,7 @@
6667
- William Sardar ([@williamsardar])(https://github.com/williamsardar)
6768
- Xavier Dupré ([@sdpython](https://github.com/sdpython))
6869
- Zane Purvis ([@zanedp](https://github.com/zanedp))
70+
- ([@amos402]https://github.com/amos402)
6971
- ([@bltribble](https://github.com/bltribble))
7072
- ([@civilx64](https://github.com/civilx64))
7173
- ([@GSPP](https://github.com/GSPP))

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ This version improves performance on benchmarks significantly compared to 2.3.
113113
- 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])
114114
- Refactored MethodBinder.Bind in preparation to make it extensible (#829)
115115
- Look for installed Windows 10 sdk's during installation instead of relying on specific versions.
116+
- Remove `LoadLibrary` call. ([#880][p880])
116117

117118
### Fixed
118119

appveyor.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ environment:
1616

1717
matrix:
1818
- PYTHON_VERSION: 3.8
19-
BUILD_OPTS: --xplat
2019
- PYTHON_VERSION: 3.7
2120
BUILD_OPTS: --xplat
2221
- PYTHON_VERSION: 3.6
2322
BUILD_OPTS: --xplat
2423
- PYTHON_VERSION: 3.8
2524
- PYTHON_VERSION: 3.7
2625
- PYTHON_VERSION: 3.6
27-
26+
- PYTHON_VERSION: 3.7
27+
PYTHONNET_SHUTDOWN_MODE: Soft
28+
- PYTHON_VERSION: 3.8
29+
PYTHONNET_SHUTDOWN_MODE: Soft
2830
init:
2931
# Update Environment Variables based on matrix/platform
3032
- set PY_VER=%PYTHON_VERSION:.=%

0 commit comments

Comments
 (0)