diff --git a/.github/workflows/CI_pyFrame3DD.yml b/.github/workflows/CI_pyFrame3DD.yml index 6ffff5d..1396a64 100644 --- a/.github/workflows/CI_pyFrame3DD.yml +++ b/.github/workflows/CI_pyFrame3DD.yml @@ -35,11 +35,23 @@ jobs: python-version: ${{ matrix.python-version }} update-environment: true + - name: Editable Pip Install pyFrame3DD + env: + CC: '${{ steps.install_cc.outputs.cc }}' + CXX: '${{ steps.install_cc.outputs.cxx }}' + run: | + '${{ steps.cp.outputs.python-path }}' -m pip install --no-build-isolation -e .[test] + + - name: Editable Test run + run: | + '${{ steps.cp.outputs.python-path }}' -m pytest test + - name: Pip Install pyFrame3DD env: CC: '${{ steps.install_cc.outputs.cc }}' CXX: '${{ steps.install_cc.outputs.cxx }}' run: | + '${{ steps.cp.outputs.python-path }}' -m pip uninstall pyframe3dd '${{ steps.cp.outputs.python-path }}' -m pip install -v .[test] #- name: Setup tmate session @@ -51,18 +63,6 @@ jobs: - name: Test run run: | '${{ steps.cp.outputs.python-path }}' -m pytest test - - - name: Editable Pip Install pyFrame3DD - env: - CC: '${{ steps.install_cc.outputs.cc }}' - CXX: '${{ steps.install_cc.outputs.cxx }}' - run: | - '${{ steps.cp.outputs.python-path }}' -m pip uninstall pyframe3dd - '${{ steps.cp.outputs.python-path }}' -m pip install --no-build-isolation -e . - - - name: Editable Test run - run: | - '${{ steps.cp.outputs.python-path }}' -m pytest test build_conda: diff --git a/pyframe3dd/pyframe3dd.py b/pyframe3dd/pyframe3dd.py index cfff4d8..4605645 100644 --- a/pyframe3dd/pyframe3dd.py +++ b/pyframe3dd/pyframe3dd.py @@ -38,6 +38,7 @@ os.path.join( sysconfig.get_config_var("userbase"), "lib", "python", "site-packages", "pyframe3dd", libname), # system wide local ] +# For Meson's editable installs for p in sys.meta_path: if "_build_path" in p.__dict__: lib_opt += [os.path.join(p._build_path, "pyframe3dd", libname)]