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

Commitf836ffa

Browse files
committed
Merge remote-tracking branch 'remotes/upstream/master' into pyobject-finalizer
2 parentsb4e30ac +08344b7 commitf836ffa

22 files changed

+1046
-199
lines changed

‎.travis.yml

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ matrix:
2222
-dotnet-hostfxr-2.0.0
2323
-dotnet-runtime-2.0.0
2424
-dotnet-sdk-2.0.0
25+
2526
-python:3.4
2627
env:*xplat-env
2728
addons:*xplat-addons
@@ -33,9 +34,24 @@ matrix:
3334
-python:3.6
3435
env:*xplat-env
3536
addons:*xplat-addons
36-
-python:"3.7-dev"
37+
38+
-python:3.7
3739
env:*xplat-env
38-
addons:*xplat-addons
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
3955

4056
# --------------------- Classic builds ------------------------
4157
-python:2.7
@@ -52,15 +68,18 @@ matrix:
5268
-python:3.6
5369
env:*classic-env
5470

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"
71+
-python:3.7
6372
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
6483

6584
env:
6685
global:

‎AUTHORS.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
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))
1718
- Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich))
1819
- Callum Noble ([@callumnoble](https://github.com/callumnoble))
1920
- Christian Heimes ([@tiran](https://github.com/tiran))
@@ -22,6 +23,7 @@
2223
- Daniel Fernandez ([@fdanny](https://github.com/fdanny))
2324
- Daniel Santana ([@dgsantana](https://github.com/dgsantana))
2425
- Dave Hirschfeld ([@dhirschfeld](https://github.com/dhirschfeld))
26+
- David Lassonde ([@lassond](https://github.com/lassond))
2527
- David Lechner ([@dlech](https://github.com/dlech))
2628
- Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
2729
- He-chien Tsai ([@t3476](https://github.com/t3476))
@@ -40,6 +42,7 @@
4042
- Sam Winstanley ([@swinstanley](https://github.com/swinstanley))
4143
- Sean Freitag ([@cowboygneox](https://github.com/cowboygneox))
4244
- Serge Weinstock ([@sweinst](https://github.com/sweinst))
45+
- Viktoria Kovescses ([@vkovec](https://github.com/vkovec))
4346
- Ville M. Vainio ([@vivainio](https://github.com/vivainio))
4447
- Virgil Dupras ([@hsoft](https://github.com/hsoft))
4548
- Wenguang Yang ([@yagweb](https://github.com/yagweb))

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
2121
- Incorporated reference-style links to issues and pull requests in the CHANGELOG ([#608][i608])
2222
- Added PyObject finalizer support, Python objects referred by C# can be auto collect now ([#692][p692]).
2323
- Added detailed comments about aproaches and dangers to handle multi-app-domains ([#625][p625])
24+
- Python 3.7 support, builds and testing added. Defaults changed from Python 3.6 to 3.7 ([#698][p698])
2425

2526
###Changed
2627
- PythonException included C# call stack
2728

2829
###Fixed
2930

3031
- Fixed Visual Studio 2017 compat ([#434][i434]) for setup.py
32+
- Fixed crashes when integrating pythonnet in Unity3d ([#714][i714]),
33+
related to unloading the Application Domain
3134
- Fixed crash on exit of the Python interpreter if a python class
3235
derived from a .NET class has a`__namespace__` or`__assembly__`
3336
attribute ([#481][i481])

‎appveyor.yml

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

3134
matrix:
3235
allow_failures:

‎setup.py

Lines changed: 2 additions & 2 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="minimal"# quiet, minimal, normal, detailed, diagnostic
25+
VERBOSITY="normal"# quiet, minimal, normal, detailed, diagnostic
2626

2727
is_64bits=sys.maxsize>2**32
2828
DEVTOOLS="MsDev"ifsys.platform=="win32"else"Mono"
@@ -516,10 +516,10 @@ def run(self):
516516
'Programming Language :: Python :: 2',
517517
'Programming Language :: Python :: 2.7',
518518
'Programming Language :: Python :: 3',
519-
'Programming Language :: Python :: 3.3',
520519
'Programming Language :: Python :: 3.4',
521520
'Programming Language :: Python :: 3.5',
522521
'Programming Language :: Python :: 3.6',
522+
'Programming Language :: Python :: 3.7',
523523
'Operating System :: Microsoft :: Windows',
524524
'Operating System :: POSIX :: Linux',
525525
'Operating System :: MacOS :: MacOS X',

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

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

0 commit comments

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