Move libpython discovery around and update CI

filmor · filmor · commit 54a54ce7518e · 2021-01-30T20:20:42.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,33 +12,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows, ubuntu, macos]
-        pyver_minor: [6, 7, 8, 9]
+        python: ["3.6", "3.7", "3.8", "3.9"]
         platform: [x64]
         shutdown_mode: [Normal, Soft]
-        include:
-        - os: ubuntu
-          pyver_minor: 6
-          dll_suffix: m
-        - os: ubuntu
-          pyver_minor: 7
-          dll_suffix: m
-
-        - os: macos
-          dll_prefix: lib
-          dll_pyver_major: '3.'
-          dll_suffix: m
-        - os: ubuntu
-          dll_prefix: lib
-          dll_pyver_major: '3.'
-        - os: windows
-          dll_pyver_major: '3'
-
-        - os: ubuntu
-          dll_ext: .so
-        - os: windows
-          dll_ext: .dll
-        - os: macos
-          dll_ext: .dylib
 
     env:
       PYTHONNET_SHUTDOWN_MODE: ${{ matrix.SHUTDOWN_MODE }}
@@ -56,10 +32,10 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
 
-      - name: Set up Python 3.${{ matrix.pyver_minor }}
+      - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v2
         with:
-          python-version: 3.${{ matrix.pyver_minor }}
+          python-version: ${{ matrix.python }}
           architecture: ${{ matrix.platform }}
 
       - name: Install dependencies
@@ -68,31 +44,20 @@ jobs:
 
       - name: Build and Install
         run: |
-          python setup.py configure
           pip install -v .
 
-      # TODO this should be gone once clr module sets PythonDLL or preloads it
-      - name: Python Tests
-        run: pytest
-        if: ${{ matrix.os != 'macos' }}
-        env:
-          PYTHONNET_PYDLL: ${{ matrix.DLL_PREFIX }}python${{matrix.DLL_PYVER_MAJOR}}${{matrix.PYVER_MINOR}}${{matrix.DLL_SUFFIX}}${{matrix.DLL_EXT}}
+      - name: Set Python DLL path
+        run: |
+          python -m pythonnet.find_libpython --export >> $GITHUB_ENV
 
       - name: Python Tests
         run: pytest
-        if: ${{ matrix.os == 'macos' }}
 
       - name: Embedding tests
         run: dotnet test --runtime any-${{ matrix.platform }} src/embed_tests/
-        if: ${{ matrix.os != 'macos' }} # Not working right now, doesn't find libpython
-        env:
-          PYTHONNET_PYDLL: ${{ matrix.DLL_PREFIX }}python${{matrix.DLL_PYVER_MAJOR}}${{matrix.PYVER_MINOR}}${{matrix.DLL_SUFFIX}}${{matrix.DLL_EXT}}
 
       - name: Python tests run from .NET
         run: dotnet test --runtime any-${{ matrix.platform }} src/python_tests_runner/
-        if: ${{ matrix.os == 'windows' }} # Not working for others right now
-        env:
-          PYTHONNET_PYDLL: ${{ matrix.DLL_PREFIX }}python${{matrix.DLL_PYVER_MAJOR}}${{matrix.PYVER_MINOR}}${{matrix.DLL_SUFFIX}}${{matrix.DLL_EXT}}
 
       # TODO: Run perf tests
       # TODO: Run mono tests on Windows?
diff --git a/pythonnet/__init__.py b/pythonnet/__init__.py
@@ -26,7 +26,7 @@ def load():
     if _LOADED:
         return
 
-    from .util import find_libpython
+    from .find_libpython import find_libpython
     from os.path import join, dirname, basename
 
     if _RUNTIME is None:
@@ -38,15 +38,14 @@ def load():
     libpython = basename(find_libpython())
     # TODO: Add dirname of libpython to (DY)LD_LIBRARY_PATH or PATH
 
-    if _FFI is None and libpython != "__Internal" and sys.platform != "win32":
+    if _FFI is None and sys.platform != "win32":
         # Load and leak libpython handle s.t. the .NET runtime doesn't dlcloses it
         import posix
 
         import cffi
         _FFI = cffi.FFI()
         _FFI.dlopen(libpython, posix.RTLD_NODELETE | posix.RTLD_LOCAL)
 
-    print("Loading from", dll_path)
     _LOADER_ASSEMBLY = _RUNTIME.get_assembly(dll_path)
 
     func = _LOADER_ASSEMBLY["Python.Runtime.Loader.Initialize"]
diff --git a/pythonnet/find_libpython/__init__.py b/pythonnet/find_libpython/__init__.py
@@ -341,7 +341,7 @@ def print_all(items):
         print(x)
 
 
-def cli_find_libpython(cli_op, verbose):
+def cli_find_libpython(cli_op, verbose, export):
     import logging
     # Importing `logging` module here so that using `logging.debug`
     # instead of `logger.debug` outside of this function becomes an
@@ -362,7 +362,10 @@ def cli_find_libpython(cli_op, verbose):
         path = find_libpython()
         if path is None:
             return 1
-        print(path, end="")
+        if export:
+            print(f"PYTHONNET_PYDLL={path}")
+        else:
+            print(path, end="")
 
 
 def main(args=None):
@@ -386,10 +389,11 @@ def main(args=None):
         "--candidate-paths",
         action="store_const", dest="cli_op", const="candidate-paths",
         help="Print list of candidate paths of libpython.")
+    group.add_argument(
+        "--export",
+        action="store_true",
+        help="Print as an environment export expression"
+    )
 
     ns = parser.parse_args(args)
     parser.exit(cli_find_libpython(**vars(ns)))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/pythonnet/find_libpython/__main__.py b/pythonnet/find_libpython/__main__.py
@@ -0,0 +1,2 @@
+from . import main
+main()
diff --git a/setup.py b/setup.py
@@ -141,7 +141,7 @@ def install_for_development(self):
     license="MIT",
     author="The Contributors of the Python.NET Project",
     author_email="pythonnet@python.org",
-    packages=["pythonnet", "pythonnet.util"],
+    packages=["pythonnet", "pythonnet.find_libpython"],
     install_requires=["pycparser", "clr_loader"],
     long_description=long_description,
     # data_files=[("{install_platlib}", ["{build_lib}/pythonnet"])],
diff --git a/src/domain_tests/test_domain_reload.py b/src/domain_tests/test_domain_reload.py
@@ -12,7 +12,7 @@ def _run_test(testname):
     if platform.system() != 'Windows':
         args = ['mono'] + args
 
-    from pythonnet.util import find_libpython
+    from pythonnet.find_libpython import find_libpython
     libpython = find_libpython()
 
     proc = subprocess.Popen(args, env={"PYTHONNET_PYDLL": libpython})
