Repository navigation
Commit 9650e8b
committed
Fix PY27 dll mapping in Linux/macOS
On 5062377 this was fixed for PY3
but left unchanged for PY2.
On linux/macOS the library is aliased `python2.7` while in windows its `python 27`.
Since internally it wasn't mapped to the correct library in Linux/macOS, we had to
remap it again using the dll.config file.
Closes #1201 parent 423407a commit 9650e8b
5 files changed
Lines changed: 7 additions & 22 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -40,8 +40,6 @@ install: | |||
| 40 | 40 | ||
| 41 | 41 | script: | |
| 42 | 42 | - python -m pytest | |
| 43 | - | ||
| 44 | - - cp Python.Runtime.dll.config src/embed_tests/bin/ | ||
| 45 | 43 | - mono ./packages/NUnit.*/tools/nunit3-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll | |
| 46 | 44 | ||
| 47 | 45 | after_script: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -49,12 +49,14 @@ This document follows the conventions laid out in [Keep a CHANGELOG][]. | |||
| 49 | 49 | - Fixed fixture location for Python tests and `Embedded_Tests` | |
| 50 | 50 | - Fixed `PythonException` crash during Shutdown (#400) | |
| 51 | 51 | - Fixed `AppDomain` unload during GC (#397)(#400) | |
| 52 | - - Fixed `Py_Main` & `PySys_SetArgvEx` no mem error on `UCS4/PY3` (#399) | ||
| 52 | + - Fixed `Py_Main` & `PySys_SetArgvEx` `no mem error` on `UCS4/PY3` (#399) | ||
| 53 | + - Fixed `Python.Runtime.dll.config` on macOS (#120) | ||
| 53 | 54 | ||
| 54 | 55 | ### Removed | |
| 55 | 56 | ||
| 56 | 57 | - Removed `six` dependency for `unittests` (#329) | |
| 57 | 58 | - Removed `Mono.Unix` dependency for `UCS4` (#360) | |
| 59 | + - Removed need for `Python.Runtime.dll.config` | ||
| 58 | 60 | ||
| 59 | 61 | ## [2.2.2][] - 2017-01-29 | |
| 60 | 62 | ||
@@ -64,7 +66,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][]. | |||
| 64 | 66 | ||
| 65 | 67 | ## [2.2.1][] - 2017-01-26 | |
| 66 | 68 | ||
| 67 | - - `v2.2.0` had a release issue on pypi. Bumped to `v2.2.1` | ||
| 69 | + - `v2.2.0` had a release issue on PyPi. Bumped to `v2.2.1` | ||
| 68 | 70 | ||
| 69 | 71 | ### Added | |
| 70 | 72 | ||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -104,7 +104,7 @@ def _get_interop_filename(): | |||
| 104 | 104 | ||
| 105 | 105 | def _get_source_files(): | |
| 106 | 106 | """Walk project and collect the files needed for ext_module""" | |
| 107 | - for ext in (".sln", ".config"): | ||
| 107 | + for ext in (".sln", ): | ||
| 108 | 108 | for path in glob.glob("*" + ext): | |
| 109 | 109 | yield path | |
| 110 | 110 | ||
@@ -381,7 +381,7 @@ def run(self): | |||
| 381 | 381 | data_files=[ | |
| 382 | 382 | ("{install_platlib}", [ | |
| 383 | 383 | "{build_lib}/Python.Runtime.dll", | |
| 384 | - "Python.Runtime.dll.config"]), | ||
| 384 | + ]), | ||
| 385 | 385 | ], | |
| 386 | 386 | cmdclass={ | |
| 387 | 387 | "build_ext": BuildExtPythonnet, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -124,7 +124,7 @@ public class Runtime | |||
| 124 | 124 | ||
| 125 | 125 | #if MONO_LINUX || MONO_OSX | |
| 126 | 126 | #if PYTHON27 | |
| 127 | - internal const string dllBase = "python27"; | ||
| 127 | + internal const string dllBase = "python2.7"; | ||
| 128 | 128 | #elif PYTHON33 | |
| 129 | 129 | internal const string dllBase = "python3.3"; | |
| 130 | 130 | #elif PYTHON34 | |
0 commit comments