Skip to content

Commit 85025f8

Browse files
filmorfilmor
authored
Merge branch 'master' into PR/GetSetAttr
2 parents 41dbcb7 + f20bcf6 commit 85025f8

File tree

5 files changed

+54
-104
lines changed

5 files changed

+54
-104
lines changed

‎.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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
- Callum Noble ([@callumnoble](https://github.com/callumnoble))
2020
- Christian Heimes ([@tiran](https://github.com/tiran))
2121
- Christoph Gohlke ([@cgohlke](https://github.com/cgohlke))
22+
- Christopher Bremner ([@chrisjbremner](https://github.com/chrisjbremner))
2223
- Christopher Pow ([@christopherpow](https://github.com/christopherpow))
2324
- Daniel Fernandez ([@fdanny](https://github.com/fdanny))
2425
- Daniel Santana ([@dgsantana](https://github.com/dgsantana))
2526
- Dave Hirschfeld ([@dhirschfeld](https://github.com/dhirschfeld))
2627
- David Lassonde ([@lassond](https://github.com/lassond))
2728
- David Lechner ([@dlech](https://github.com/dlech))
2829
- Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
30+
- Florian Treurniet ([@ftreurni](https://github.com/ftreurni))
2931
- He-chien Tsai ([@t3476](https://github.com/t3476))
3032
- Inna Wiesel ([@inna-w](https://github.com/inna-w))
3133
- Ivan Cronyn ([@cronan](https://github.com/cronan))

‎CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,14 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
1515
### Changed
1616

1717
- 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
1820

1921
### Fixed
2022

23+
- Fixed runtime that fails loading when using pythonnet in an environment
24+
together with Nuitka
25+
2126
## [2.4.0][]
2227

2328
### Added
@@ -60,7 +65,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
6065
- Fixed conversion of 'float' and 'double' values ([#486][i486])
6166
- Fixed 'clrmethod' for python 2 ([#492][i492])
6267
- Fixed double calling of constructor when deriving from .NET class ([#495][i495])
63-
- Fixed `clr.GetClrType` when iterating over `System` members ([#607][p607])
68+
- Fixed `clr.GetClrType` when iterating over `System` members ([#607][p607])
6469
- Fixed `LockRecursionException` when loading assemblies ([#627][i627])
6570
- Fixed errors breaking .NET Remoting on method invoke ([#276][i276])
6671
- Fixed PyObject.GetHashCode ([#676][i676])

‎setup.py

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@
1515
import sysconfig
1616
from distutils import spawn
1717
from distutils.command import install, build, build_ext, install_data, install_lib
18-
from wheel import bdist_wheel
1918

2019
from setuptools import Extension, setup
2120

21+
try:
22+
from wheel import bdist_wheel
23+
except ImportError:
24+
bdist_wheel = None
25+
2226
# Allow config/verbosity to be set from cli
2327
# http://stackoverflow.com/a/4792601/5208670
2428
CONFIG = "Release" # Release or Debug
@@ -594,21 +598,21 @@ def run(self):
594598
_update_xlat_devtools()
595599
return install.install.run(self)
596600

601+
if bdist_wheel:
602+
class BDistWheelPythonnet(bdist_wheel.bdist_wheel):
603+
user_options = bdist_wheel.bdist_wheel.user_options + [("xplat", None, None)]
597604

598-
class BDistWheelPythonnet(bdist_wheel.bdist_wheel):
599-
user_options = bdist_wheel.bdist_wheel.user_options + [("xplat", None, None)]
605+
def initialize_options(self):
606+
bdist_wheel.bdist_wheel.initialize_options(self)
607+
self.xplat = None
600608

601-
def initialize_options(self):
602-
bdist_wheel.bdist_wheel.initialize_options(self)
603-
self.xplat = None
609+
def finalize_options(self):
610+
bdist_wheel.bdist_wheel.finalize_options(self)
604611

605-
def finalize_options(self):
606-
bdist_wheel.bdist_wheel.finalize_options(self)
607-
608-
def run(self):
609-
if self.xplat:
610-
_update_xlat_devtools()
611-
return bdist_wheel.bdist_wheel.run(self)
612+
def run(self):
613+
if self.xplat:
614+
_update_xlat_devtools()
615+
return bdist_wheel.bdist_wheel.run(self)
612616

613617
###############################################################################
614618

@@ -621,6 +625,15 @@ def run(self):
621625
if not os.path.exists(_get_interop_filename()):
622626
setup_requires.append("pycparser")
623627

628+
cmdclass={
629+
"install": InstallPythonnet,
630+
"build_ext": BuildExtPythonnet,
631+
"install_lib": InstallLibPythonnet,
632+
"install_data": InstallDataPythonnet,
633+
}
634+
if bdist_wheel:
635+
cmdclass["bdist_wheel"] = BDistWheelPythonnet
636+
624637
setup(
625638
name="pythonnet",
626639
version="2.4.1-dev",
@@ -633,13 +646,7 @@ def run(self):
633646
long_description=_get_long_description(),
634647
ext_modules=[Extension("clr", sources=list(_get_source_files()))],
635648
data_files=[("{install_platlib}", ["{build_lib}/Python.Runtime.dll"])],
636-
cmdclass={
637-
"install": InstallPythonnet,
638-
"build_ext": BuildExtPythonnet,
639-
"install_lib": InstallLibPythonnet,
640-
"install_data": InstallDataPythonnet,
641-
"bdist_wheel": BDistWheelPythonnet,
642-
},
649+
cmdclass=cmdclass,
643650
classifiers=[
644651
"Development Status :: 5 - Production/Stable",
645652
"Intended Audience :: Developers",

‎src/runtime/runtime.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ internal static void Initialize(bool initSigs = false)
205205
PyNotImplemented = PyObject_GetAttrString(op, "NotImplemented");
206206
PyBaseObjectType = PyObject_GetAttrString(op, "object");
207207

208-
PyModuleType = PyObject_Type(op);
209208
PyNone = PyObject_GetAttrString(op, "None");
210209
PyTrue = PyObject_GetAttrString(op, "True");
211210
PyFalse = PyObject_GetAttrString(op, "False");
@@ -302,6 +301,7 @@ internal static void Initialize(bool initSigs = false)
302301
dllLocal = loader.Load(_PythonDll);
303302
}
304303
_PyObject_NextNotImplemented = loader.GetFunction(dllLocal, "_PyObject_NextNotImplemented");
304+
PyModuleType = loader.GetFunction(dllLocal, "PyModule_Type");
305305

306306
if (dllLocal != IntPtr.Zero)
307307
{
@@ -777,8 +777,10 @@ public static extern int Py_Main(
777777
[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
778778
internal static extern IntPtr PyCFunction_Call(IntPtr func, IntPtr args, IntPtr kw);
779779

780+
#if PYTHON2
780781
[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
781782
internal static extern IntPtr PyClass_New(IntPtr bases, IntPtr dict, IntPtr name);
783+
#endif
782784

783785
[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
784786
internal static extern IntPtr PyInstance_New(IntPtr cls, IntPtr args, IntPtr kw);
@@ -1020,10 +1022,6 @@ internal static IntPtr PyInt_FromInt64(long value)
10201022
[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl,
10211023
EntryPoint = "PyLong_FromString")]
10221024
internal static extern IntPtr PyInt_FromString(string value, IntPtr end, int radix);
1023-
1024-
[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl,
1025-
EntryPoint = "PyLong_GetMax")]
1026-
internal static extern int PyInt_GetMax();
10271025
#elif PYTHON2
10281026
[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
10291027
private static extern IntPtr PyInt_FromLong(IntPtr value);

0 commit comments

Comments
 (0)