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

Commit653a263

Browse files
committed
Merge branch 'master' into drop-dlopen
2 parentsc6dae9e +34d8d35 commit653a263

34 files changed

+1453
-217
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: 16 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,17 @@
11
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-xenial-prod xenial main
16-
key_url:https://packages.microsoft.com/keys/microsoft.asc
17-
-sourceline:deb http://download.mono-project.com/repo/ubuntu xenial 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.2
23-
-dotnet-runtime-2.2
24-
-dotnet-sdk-2.2
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.2
49-
-dotnet-runtime-2.2
50-
-dotnet-sdk-2.2
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 xenial 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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
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))
@@ -27,17 +28,22 @@
2728
- David Lassonde ([@lassond](https://github.com/lassond))
2829
- David Lechner ([@dlech](https://github.com/dlech))
2930
- Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
31+
- Florian Treurniet ([@ftreurni](https://github.com/ftreurni))
3032
- He-chien Tsai ([@t3476](https://github.com/t3476))
3133
- Inna Wiesel ([@inna-w](https://github.com/inna-w))
3234
- Ivan Cronyn ([@cronan](https://github.com/cronan))
3335
- Jan Krivanek ([@jakrivan](https://github.com/jakrivan))
3436
- Jeff Reback ([@jreback](https://github.com/jreback))
37+
- Jeff Robbins ([@jeff17robbins](https://github.com/jeff17robbins))
3538
- Joe Frayne ([@jfrayne](https://github.com/jfrayne))
39+
- Joe Lidbetter ([@jmlidbetter](https://github.com/jmlidbetter))
40+
- Joe Savage ([@s4v4g3](https://github.com/s4v4g3))
3641
- John Burnett ([@johnburnett](https://github.com/johnburnett))
3742
- John Wilkes ([@jbw3](https://github.com/jbw3))
3843
- Luke Stratman ([@lstratman](https://github.com/lstratman))
3944
- Konstantin Posudevskiy ([@konstantin-posudevskiy](https://github.com/konstantin-posudevskiy))
4045
- Matthias Dittrich ([@matthid](https://github.com/matthid))
46+
- Mohamed Koubaa ([@koubaa](https://github.com/koubaa))
4147
- Patrick Stewart ([@patstew](https://github.com/patstew))
4248
- Raphael Nestler ([@rnestler](https://github.com/rnestler))
4349
- Rickard Holmberg ([@rickardraysearch](https://github.com/rickardraysearch))

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,25 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
1010
###Added
1111

1212
- Added automatic NuGet package generation in appveyor and local builds
13+
- Added function that sets Py_NoSiteFlag to 1.
14+
- Added support for Jetson Nano.
1315

1416
###Changed
1517

1618
- Added argument types information to "No method matches given arguments" message
1719
- Moved wheel import in setup.py inside of a try/except to prevent pip collection failures
20+
- Removes PyLong_GetMax and PyClass_New when targetting Python3
21+
- Added support for converting python iterators to C# arrays
22+
- Changed usage of obselete function GetDelegateForFunctionPointer(IntPtr, Type) to GetDelegateForFunctionPointer<TDelegate>(IntPtr)
23+
- Added support for kwarg parameters when calling .NET methods from Python
1824

1925
###Fixed
2026

27+
- Fixed runtime that fails loading when using pythonnet in an environment
28+
together with Nuitka
29+
- Fixes bug where delegates get casts (dotnetcore)
30+
- Determine size of interpreter longs at runtime
31+
2132
##[2.4.0][]
2233

2334
###Added
@@ -37,6 +48,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
3748
- Added PyObject finalizer support, Python objects referred by C# can be auto collect now ([#692][p692]).
3849
- Added detailed comments about aproaches and dangers to handle multi-app-domains ([#625][p625])
3950
- Python 3.7 support, builds and testing added. Defaults changed from Python 3.6 to 3.7 ([#698][p698])
51+
- Added support for C# types to provide`__repr__` ([#680][p680])
4052

4153
###Changed
4254

‎README.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,14 @@ projects using pythonnet can be found in the Wiki:
9595

9696
https://github.com/pythonnet/pythonnet/wiki
9797

98+
Python 3.8.0 support
99+
--------------------
100+
101+
Some features are disabled in Python 3.8.0 because of
102+
`this bug in Python<https://bugs.python.org/issue37633>`_. The error is
103+
``System.EntryPointNotFoundException : Unable to find an entry point named
104+
'Py_CompileString' in DLL 'python38'``. This will be fixed in Python 3.8.1.
105+
98106
.. |Join the chat at https://gitter.im/pythonnet/pythonnet|image::https://badges.gitter.im/pythonnet/pythonnet.svg
99107
:target:https://gitter.im/pythonnet/pythonnet?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
100108
.. |appveyor shield|image::https://img.shields.io/appveyor/ci/pythonnet/pythonnet/master.svg?label=AppVeyor
@@ -113,3 +121,8 @@ https://github.com/pythonnet/pythonnet/wiki
113121
:target:http://stackoverflow.com/questions/tagged/python.net
114122
.. |conda-forge version|image::https://img.shields.io/conda/vn/conda-forge/pythonnet.svg
115123
:target:https://anaconda.org/conda-forge/pythonnet
124+
125+
Resources
126+
---------
127+
Mailing list: https://mail.python.org/mailman/listinfo/pythondotnet
128+
Chat: https://gitter.im/pythonnet/pythonnet

‎appveyor.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,22 @@ environment:
2323
BUILD_OPTS:--xplat
2424
-PYTHON_VERSION:3.7
2525
BUILD_OPTS:--xplat
26+
-PYTHON_VERSION:3.8
27+
BUILD_OPTS:--xplat
2628
-PYTHON_VERSION:2.7
2729
-PYTHON_VERSION:3.5
2830
-PYTHON_VERSION:3.6
2931
-PYTHON_VERSION:3.7
32+
-PYTHON_VERSION:3.8
3033

3134
matrix:
3235
allow_failures:
3336
-PYTHON_VERSION:3.4
3437
BUILD_OPTS:--xplat
3538
-PYTHON_VERSION:3.4
39+
-PYTHON_VERSION:3.8
40+
BUILD_OPTS:--xplat
41+
-PYTHON_VERSION:3.8
3642

3743
init:
3844
# Update Environment Variables based on matrix/platform

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp