Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for including modules from different locations #108

Merged
merged 5 commits into from
Nov 10, 2021
Merged

Fix for including modules from different locations #108

merged 5 commits into from
Nov 10, 2021

Commits on Nov 10, 2021

  1. Fix for including modules from different locations 

    When we define multiple packages from different source locations,
Poetry currently only uses the last specified from= location.
This patch adds explicit paths to package_dir for additional packages.

This fixes python-poetry/poetry#1811, fixes python-poetry/poetry#2354,
and possibly even python-poetry/poetry#2450.
    @jaharkes
    jaharkes committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    22fdf8b View commit details
    Browse the repository at this point in the history

  2. Test the fix for including modules from different locations 

    When we try to include moduleA from libA and moduleB from libB then
package_dir in the generated setup.py must to contain either one or
both `"moduleA": "libA/moduleA"` or `"moduleB": "libB/moduleB"`
so we are able to find both modules when building the source dist.
    @jaharkes
    jaharkes committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    124358b View commit details
    Browse the repository at this point in the history

  3. Avoid issues when running split_source test on Windows.

    @jaharkes
    jaharkes committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    e219167 View commit details
    Browse the repository at this point in the history

  4. Correct split_source test 

    As noted by @layday, `ns["package_dir"].keys() == {"", "module_b"}`
should always be true, so we don't have to test for module_a in
`ns["package_dir"]`.
    @jaharkes
    jaharkes committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    9ab0cf9 View commit details
    Browse the repository at this point in the history

  5. Revert test to checking dictionary keys because paths differ on Windows

    @jaharkes
    jaharkes committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    9db9aae View commit details
    Browse the repository at this point in the history