fix: create path dependencies relative to package rather than lockfile (#4245) by md384 · Pull Request #4246 · python-poetry/poetry

md384 · 2021-07-02T18:09:40Z

Resolves path dependencies relative to the package and lockfile rather than just the lockfile.

Resolves: #4245

Added tests for changed code.
Updated documentation for changed code.

md384 · 2021-07-02T18:10:50Z

poetry/packages/locker.py

            for dep_name, constraint in info.get("dependencies", {}).items():
+
+                root_dir = self._lock.path.parent
+                if package.source_type == "directory":


Not sure if we need to handle file source types too

abn

In addition to the comments in the reivew, I wonder if this is going to cause issues if libB from your issue is also a dependency of libC, I suspect not if libC is at the same location as libA, however could get a bit hairy if it is not and/or libCis nested in libA.

abn · 2021-07-03T13:25:18Z

poetry/packages/locker.py

+                if package.source_type == "directory":
+                    # root dir should be the source of the package relative to the lock path
+                    root_dir = Path(
+                        os.path.relpath(


Couple of points;

Move to using pathlib if possible.

We cannot always be sure a "directory" package is relative as it could also be an absolute path.

sonarqubecloud · 2021-07-06T20:24:25Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

md384 · 2021-07-06T20:35:22Z

@abn to test this, I created a new project with the following structure

my-package/
  pyproject.toml
  lib/
    lib-a/
      lib-a/
      pyproject.toml
      lib-c/
        lib-c/
        pyproject.toml
    lib-b/
      lib-b/
      pyproject.toml
      lib-d/
        lib-d/
        pyproject.toml
  tools/
    my_tool/
      my_tool/
      pyproject.toml

I created nested libraries across directories like you suggested. my-package depends on lib-a which depends on lib-b which depends on lib-c which depends on lib-d which depends on my_tool. I added the relevant part of the poetry lock file for my-project (the root package) below.

[[package]]
name = "lib-a"
version = "0.1.0"
description = ""
category = "main"
optional = false
python-versions = "^3.9"
develop = true

[package.dependencies]
lib-b = {path = "../lib_b", develop = true}

[package.source]
type = "directory"
url = "lib/lib_a"

[[package]]
name = "lib-b"
version = "0.1.0"
description = ""
category = "main"
optional = false
python-versions = "^3.9"
develop = true

[package.dependencies]
lib-c = {path = "../lib_a/lib_c", develop = true}

[package.source]
type = "directory"
url = "lib/lib_b"

[[package]]
name = "lib-c"
version = "0.1.0"
description = ""
category = "main"
optional = false
python-versions = "^3.9"
develop = true

[package.dependencies]
lib-d = {path = "../../lib_b/lib_d", develop = true}

[package.source]
type = "directory"
url = "lib/lib_a/lib_c"

[[package]]
name = "lib-d"
version = "0.1.0"
description = ""
category = "main"
optional = false
python-versions = "^3.9"
develop = true

[package.dependencies]
my-tool = {path = "../../../tools/my_tool", develop = true}

[package.source]
type = "directory"
url = "lib/lib_b/lib_d"

[[package]]
name = "my-tool"
version = "0.1.0"
description = ""
category = "main"
optional = false
python-versions = "^3.9"
develop = true

[package.source]
type = "directory"
url = "tools/my_tool"

I was able to install and import all the libs from my-package.

my-package % poetry run python
Python 3.9.5 (default, May  4 2021, 03:36:27) 
[Clang 12.0.0 (clang-1200.0.32.29)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
>>> import lib_a
>>> import lib_b
>>> import lib_c
>>> import lib_d
>>> import my_tool

I hope no-one would do such a thing as this though 😉

md384 · 2021-07-06T20:38:03Z

@abn it turns out that we already calculate the relative path

poetry/poetry/packages/locker.py

Line 119 in 97e63f6

url = self._lock.path.parent.joinpath(url).resolve().as_posix()

so I am just using that now.

You commented before that a directory source url could be an absolute path. Does that line need to be changed?

sdispater · 2021-07-29T15:28:52Z

Thanks!

fix: create path dependencies relative to package rather than lockfile (#4245)

github-actions · 2024-02-29T23:07:57Z

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

fix: create path dependencies relative to package rather than lockfile (

4275a55

python-poetry#4245)

md384 commented Jul 2, 2021

View reviewed changes

test: fix tests for for older versions of python

f0487f6

abn requested changes Jul 3, 2021

View reviewed changes

fix: use already calculated relative url

97e63f6

md384 requested a review from abn July 6, 2021 20:39

lucasvieirasilva mentioned this pull request Jul 26, 2021

Fix nested local dependencies (#3368) #4320

Closed

2 tasks

sdispater approved these changes Jul 29, 2021

View reviewed changes

sdispater merged commit 89575f6 into python-poetry:master Jul 29, 2021

sdispater added a commit that referenced this pull request Jul 30, 2021

Merge pull request #4246 from zumper/m.4245-relative-paths

1ca6528

fix: create path dependencies relative to package rather than lockfile (#4245)

sdispater mentioned this pull request Jul 30, 2021

[1.1] fix: create path dependencies relative to package rather than lockfile #4331

Merged

2 tasks

sdispater added a commit that referenced this pull request Jul 30, 2021

Merge pull request #4246 from zumper/m.4245-relative-paths

ffb5601

fix: create path dependencies relative to package rather than lockfile (#4245)

sdispater added a commit that referenced this pull request Jul 30, 2021

Merge pull request #4246 from zumper/m.4245-relative-paths

b48e4e7

fix: create path dependencies relative to package rather than lockfile (#4245)

mfulgo mentioned this pull request Aug 5, 2021

Broken Relative Paths when package in subtree of installing package #4357

Closed

3 tasks

sdispater mentioned this pull request Aug 19, 2021

Release 1.1.8 #4408

Merged

martinka mentioned this pull request Dec 21, 2021

Poetry install fails for nested local dependencies and develop = false #3368

Closed

3 tasks

github-actions bot locked as resolved and limited conversation to collaborators Feb 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

fix: create path dependencies relative to package rather than lockfile (#4245)#4246

fix: create path dependencies relative to package rather than lockfile (#4245)#4246
sdispater merged 3 commits intopython-poetry:masterfrom
zumper:m.4245-relative-paths

md384 commented Jul 2, 2021 •

edited

Loading

Uh oh!

md384 Jul 2, 2021

Uh oh!

abn left a comment

Uh oh!

abn Jul 3, 2021

Uh oh!

sonarqubecloud bot commented Jul 6, 2021

Uh oh!

md384 commented Jul 6, 2021

Uh oh!

md384 commented Jul 6, 2021

Uh oh!

sdispater commented Jul 29, 2021

Uh oh!

github-actions bot commented Feb 29, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

Conversation

md384 commented Jul 2, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

md384 Jul 2, 2021

Choose a reason for hiding this comment

Uh oh!

abn left a comment

Choose a reason for hiding this comment

Uh oh!

abn Jul 3, 2021

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Jul 6, 2021

Uh oh!

md384 commented Jul 6, 2021

Uh oh!

md384 commented Jul 6, 2021

Uh oh!

sdispater commented Jul 29, 2021

Uh oh!

github-actions bot commented Feb 29, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

md384 commented Jul 2, 2021 •

edited

Loading