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
This repository was archived by the owner on Jul 22, 2023. It is now read-only.
/pythonnetPublic archive
forked frompythonnet/pythonnet

Commit9650e8b

Browse files
committed
Fix PY27 dll mapping in Linux/macOS
On5062377 this was fixed for PY3but 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 toremap it again using the dll.config file.Closespythonnet#120
1 parent423407a commit9650e8b

File tree

5 files changed

+7
-22
lines changed

5 files changed

+7
-22
lines changed

‎.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ install:
4040

4141
script:
4242
-python -m pytest
43-
44-
-cp Python.Runtime.dll.config src/embed_tests/bin/
4543
-mono ./packages/NUnit.*/tools/nunit3-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll
4644

4745
after_script:

‎CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,14 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
4949
- Fixed fixture location for Python tests and`Embedded_Tests`
5050
- Fixed`PythonException` crash during Shutdown (#400)
5151
- 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)
5354

5455
###Removed
5556

5657
- Removed`six` dependency for`unittests` (#329)
5758
- Removed`Mono.Unix` dependency for`UCS4` (#360)
59+
- Removed need for`Python.Runtime.dll.config`
5860

5961
##[2.2.2][] - 2017-01-29
6062

@@ -64,7 +66,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
6466

6567
##[2.2.1][] - 2017-01-26
6668

67-
-`v2.2.0` had a release issue onpypi. Bumped to`v2.2.1`
69+
-`v2.2.0` had a release issue onPyPi. Bumped to`v2.2.1`
6870

6971
###Added
7072

‎Python.Runtime.dll.config

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

‎setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def _get_interop_filename():
104104

105105
def_get_source_files():
106106
"""Walk project and collect the files needed for ext_module"""
107-
forextin (".sln",".config"):
107+
forextin (".sln", ):
108108
forpathinglob.glob("*"+ext):
109109
yieldpath
110110

@@ -381,7 +381,7 @@ def run(self):
381381
data_files=[
382382
("{install_platlib}", [
383383
"{build_lib}/Python.Runtime.dll",
384-
"Python.Runtime.dll.config"]),
384+
]),
385385
],
386386
cmdclass={
387387
"build_ext":BuildExtPythonnet,

‎src/runtime/runtime.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public class Runtime
124124

125125
#ifMONO_LINUX||MONO_OSX
126126
#ifPYTHON27
127-
internalconststringdllBase="python27";
127+
internalconststringdllBase="python2.7";
128128
#elifPYTHON33
129129
internalconststringdllBase="python3.3";
130130
#elifPYTHON34

0 commit comments

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