X Tutup
Skip to content

Commit 3ffde81

Browse files
yagwebyagweb
committed
Merge branch 'master' of https://github.com/pythonnet/pythonnet 
2 parents bf59f56 + 1463538 commit 3ffde81

Some content is hidden

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

47 files changed

+1996
-692
lines changed

‎.editorconfig‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@ indent_size = 2
1919
[*.{csproj,pyproj,config}]
2020
indent_size = 2
2121

22+
# .NET formatting settings
23+
[*.{cs,vb}]
24+
dotnet_sort_system_directives_first = true
25+
dotnet_separate_import_directive_groups = true
26+
27+
[*.cs]
28+
csharp_new_line_before_open_brace = true
29+
csharp_new_line_before_else = true
30+
csharp_new_line_before_catch = true
31+
csharp_new_line_before_finally = true
32+
2233
# Solution
2334
[*.sln]
2435
indent_style = tab

‎.travis.yml‎

Lines changed: 17 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,17 @@
1-
dist: trusty
1+
dist: xenial
22
sudo: false
33
language: python
4-
5-
matrix:
6-
include:
7-
# --------------------- XPLAT builds ------------------------
8-
- python: 2.7
9-
env: &xplat-env
10-
- BUILD_OPTS=--xplat
11-
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
12-
addons: &xplat-addons
13-
apt:
14-
sources:
15-
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
16-
key_url: https://packages.microsoft.com/keys/microsoft.asc
17-
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
18-
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
19-
packages:
20-
- mono-devel
21-
- ca-certificates-mono
22-
- dotnet-hostfxr-2.0.0
23-
- dotnet-runtime-2.0.0
24-
- dotnet-sdk-2.0.0
25-
26-
- python: 3.5
27-
env: *xplat-env
28-
addons: *xplat-addons
29-
30-
- python: 3.6
31-
env: *xplat-env
32-
addons: *xplat-addons
33-
34-
- python: 3.7
35-
env: *xplat-env
36-
dist: xenial
37-
sudo: true
38-
addons: &xplat-addons-xenial
39-
apt:
40-
sources:
41-
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main
42-
key_url: https://packages.microsoft.com/keys/microsoft.asc
43-
- sourceline: deb https://download.mono-project.com/repo/ubuntu stable-xenial main
44-
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
45-
packages:
46-
- mono-devel
47-
- ca-certificates-mono
48-
- dotnet-hostfxr-2.0.0
49-
- dotnet-runtime-2.0.0
50-
- dotnet-sdk-2.0.0
51-
52-
# --------------------- Classic builds ------------------------
53-
- python: 2.7
54-
env: &classic-env
55-
- BUILD_OPTS=
56-
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
57-
58-
- python: 3.5
59-
env: *classic-env
60-
61-
- python: 3.6
62-
env: *classic-env
63-
64-
- python: 3.7
65-
env: *classic-env
66-
dist: xenial
67-
sudo: true
68-
addons:
69-
apt:
70-
sources:
71-
- sourceline: deb http://download.mono-project.com/repo/ubuntu xenial main
72-
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
73-
packages:
74-
- mono-devel
75-
- ca-certificates-mono
4+
python:
5+
- 2.7
6+
- 3.5
7+
- 3.6
8+
- 3.7
769

7710
env:
11+
matrix:
12+
- BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp2.0_publish/
13+
- BUILD_OPTS="" NUNIT_PATH="./packages/NUnit.*/tools/nunit3-console.exe" RUN_TESTS="mono $NUNIT_PATH" EMBED_TESTS_PATH=""
14+
7815
global:
7916
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
8017
- SEGFAULT_SIGNALS=all
@@ -84,11 +21,16 @@ env:
8421
addons:
8522
apt:
8623
sources:
87-
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
24+
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main
25+
key_url: https://packages.microsoft.com/keys/microsoft.asc
26+
- sourceline: deb http://download.mono-project.com/repo/ubuntu stable-xenial/snapshots/5.20 main
8827
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
8928
packages:
9029
- mono-devel
9130
- ca-certificates-mono
31+
- dotnet-hostfxr-2.2
32+
- dotnet-runtime-2.2
33+
- dotnet-sdk-2.2
9234

9335
before_install:
9436
# Set-up dll path for embedded tests
@@ -102,13 +44,9 @@ install:
10244

10345
script:
10446
- python -m pytest
105-
- mono $NUNIT_PATH src/embed_tests/bin/Python.EmbeddingTest.dll
106-
- if [[ $BUILD_OPTS == --xplat ]]; then dotnet src/embed_tests/bin/netcoreapp2.0_publish/Python.EmbeddingTest.dll; fi
47+
- $RUN_TESTS src/embed_tests/bin/$EMBED_TESTS_PATH/Python.EmbeddingTest.dll
10748

10849
after_script:
109-
# Uncomment if need to geninterop, ie. py37 final
110-
# - python tools/geninterop/geninterop.py
111-
11250
# Waiting on mono-coverage, SharpCover or xr.Baboon
11351
- coverage xml -i
11452
- codecov --file coverage.xml --flags setup_linux

‎AUTHORS.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,37 @@
1212

1313
## Contributors
1414

15+
- Alex Helms ([@alexhelms](https://github.com/alexhelms))
1516
- Alexandre Catarino([@AlexCatarino](https://github.com/AlexCatarino))
1617
- Arvid JB ([@ArvidJB](https://github.com/ArvidJB))
1718
- Benoît Hudson ([@benoithudson](https://github.com/benoithudson))
1819
- Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich))
1920
- Callum Noble ([@callumnoble](https://github.com/callumnoble))
2021
- Christian Heimes ([@tiran](https://github.com/tiran))
2122
- Christoph Gohlke ([@cgohlke](https://github.com/cgohlke))
23+
- Christopher Bremner ([@chrisjbremner](https://github.com/chrisjbremner))
2224
- Christopher Pow ([@christopherpow](https://github.com/christopherpow))
2325
- Daniel Fernandez ([@fdanny](https://github.com/fdanny))
2426
- Daniel Santana ([@dgsantana](https://github.com/dgsantana))
2527
- Dave Hirschfeld ([@dhirschfeld](https://github.com/dhirschfeld))
2628
- David Lassonde ([@lassond](https://github.com/lassond))
2729
- David Lechner ([@dlech](https://github.com/dlech))
2830
- Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
31+
- Florian Treurniet ([@ftreurni](https://github.com/ftreurni))
2932
- He-chien Tsai ([@t3476](https://github.com/t3476))
30-
-   Ivan Cronyn ([@cronan](https://github.com/cronan))
33+
- Inna Wiesel ([@inna-w](https://github.com/inna-w))
34+
- Ivan Cronyn ([@cronan](https://github.com/cronan))
3135
- Jan Krivanek ([@jakrivan](https://github.com/jakrivan))
32-
-   Jeff Reback ([@jreback](https://github.com/jreback))
36+
- Jeff Reback ([@jreback](https://github.com/jreback))
3337
- Joe Frayne ([@jfrayne](https://github.com/jfrayne))
38+
- Joe Lidbetter ([@jmlidbetter](https://github.com/jmlidbetter))
39+
- Joe Savage ([@s4v4g3](https://github.com/s4v4g3))
3440
- John Burnett ([@johnburnett](https://github.com/johnburnett))
3541
- John Wilkes ([@jbw3](https://github.com/jbw3))
3642
- Luke Stratman ([@lstratman](https://github.com/lstratman))
3743
- Konstantin Posudevskiy ([@konstantin-posudevskiy](https://github.com/konstantin-posudevskiy))
3844
- Matthias Dittrich ([@matthid](https://github.com/matthid))
45+
- Mohamed Koubaa ([@koubaa](https://github.com/koubaa))
3946
- Patrick Stewart ([@patstew](https://github.com/patstew))
4047
- Raphael Nestler ([@rnestler](https://github.com/rnestler))
4148
- Rickard Holmberg ([@rickardraysearch](https://github.com/rickardraysearch))

‎CHANGELOG.md‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,28 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
77

88
## [unreleased][]
99

10-
- Look for installed Windows 10 sdk's during installation instead of relying on specific versions.
10+
### Added
11+
12+
- Added automatic NuGet package generation in appveyor and local builds
13+
- Added function that sets Py_NoSiteFlag to 1.
14+
15+
### Changed
16+
17+
- Added argument types information to "No method matches given arguments" message
18+
- Moved wheel import in setup.py inside of a try/except to prevent pip collection failures
19+
- Removes PyLong_GetMax and PyClass_New when targetting Python3
20+
- Added support for converting python iterators to C# arrays
21+
- Changed usage of obselete function GetDelegateForFunctionPointer(IntPtr, Type) to GetDelegateForFunctionPointer<TDelegate>(IntPtr)
22+
- Added support for kwarg parameters when calling .NET methods from Python
23+
24+
### Fixed
25+
26+
- Fixed runtime that fails loading when using pythonnet in an environment
27+
together with Nuitka
28+
- Fixes bug where delegates get casts (dotnetcore)
29+
- Determine size of interpreter longs at runtime
30+
31+
## [2.4.0][]
1132

1233
### Added
1334

@@ -26,13 +47,15 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
2647
- Added PyObject finalizer support, Python objects referred by C# can be auto collect now ([#692][p692]).
2748
- Added detailed comments about aproaches and dangers to handle multi-app-domains ([#625][p625])
2849
- Python 3.7 support, builds and testing added. Defaults changed from Python 3.6 to 3.7 ([#698][p698])
50+
- Added support for C# types to provide `__repr__` ([#680][p680])
2951

3052
### Changed
31-
- PythonException included C# call stack
3253

54+
- PythonException included C# call stack
3355
- Reattach python exception traceback information (#545)
3456
- 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])
3557
- Refactored MethodBinder.Bind in preparation to make it extensible (#829)
58+
- Look for installed Windows 10 sdk's during installation instead of relying on specific versions.
3659

3760
### Fixed
3861

@@ -48,7 +71,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
4871
- Fixed conversion of 'float' and 'double' values ([#486][i486])
4972
- Fixed 'clrmethod' for python 2 ([#492][i492])
5073
- Fixed double calling of constructor when deriving from .NET class ([#495][i495])
51-
- Fixed `clr.GetClrType` when iterating over `System` members ([#607][p607])
74+
- Fixed `clr.GetClrType` when iterating over `System` members ([#607][p607])
5275
- Fixed `LockRecursionException` when loading assemblies ([#627][i627])
5376
- Fixed errors breaking .NET Remoting on method invoke ([#276][i276])
5477
- Fixed PyObject.GetHashCode ([#676][i676])

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2006-2017 the contributors of the "Python for .NET" project
3+
Copyright (c) 2006-2019 the contributors of the "Python for .NET" project
44

55
Permission is hereby granted, free of charge, to any person obtaining a
66
copy of this software and associated documentation files (the "Software"),

‎README.md‎

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

0 commit comments

Comments
 (0)
X Tutup