Skip to content

Commit

Permalink
Revert "create PEP508 compliant dependency string for directory and f…
Browse files Browse the repository at this point in the history
…ile dependencies (#1796)"

This reverts commit 10e471a.
  • Loading branch information
sdispater committed Jan 10, 2020
1 parent 01ec4a1 commit 929af85
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 45 deletions.
11 changes: 0 additions & 11 deletions poetry/packages/directory_dependency.py
Expand Up @@ -74,17 +74,6 @@ def base(self):
def develop(self):
return self._develop

@property
def base_pep_508_name(self): # type: () -> str
requirement = self.pretty_name

if self.extras:
requirement += "[{}]".format(",".join(self.extras))

requirement += " @ {}".format(self._path)

return requirement

def supports_poetry(self):
return self._supports_poetry

Expand Down
11 changes: 0 additions & 11 deletions poetry/packages/file_dependency.py
Expand Up @@ -49,17 +49,6 @@ def path(self):
def full_path(self):
return self._full_path.resolve()

@property
def base_pep_508_name(self): # type: () -> str
requirement = self.pretty_name

if self.extras:
requirement += "[{}]".format(",".join(self.extras))

requirement += " @ {}".format(self._path)

return requirement

def is_file(self):
return True

Expand Down
14 changes: 1 addition & 13 deletions tests/packages/test_directory_dependency.py
Expand Up @@ -8,24 +8,12 @@
from poetry.utils.env import MockEnv as BaseMockEnv


fixtures_dir = Path(__file__).parent.parent / "fixtures"
DIST_PATH = Path(__file__).parent.parent / "fixtures" / "git" / "github.com" / "demo"


class MockEnv(BaseMockEnv):
def run(self, bin, *args):
raise EnvCommandError(CalledProcessError(1, "python", output=""))


def test_directory_dependency():
dependency = DirectoryDependency("simple_project", fixtures_dir / "simple_project")

assert dependency.pretty_name == "simple_project"
assert dependency.develop
assert dependency.path == fixtures_dir / "simple_project"
assert dependency.base_pep_508_name == "simple_project @ {}".format(
fixtures_dir / "simple_project"
)
DIST_PATH = Path(__file__).parent.parent / "fixtures" / "git" / "github.com" / "demo"


def test_directory_dependency_must_exist():
Expand Down
10 changes: 0 additions & 10 deletions tests/packages/test_file_dependency.py
Expand Up @@ -7,16 +7,6 @@
DIST_PATH = Path(__file__).parent.parent / "fixtures" / "distributions"


def test_file_dependency():
dependency = FileDependency("demo", DIST_PATH / "demo-0.1.0.tar.gz")

assert dependency.pretty_name == "demo"
assert dependency.path == DIST_PATH / "demo-0.1.0.tar.gz"
assert dependency.base_pep_508_name == "demo @ {}".format(
DIST_PATH / "demo-0.1.0.tar.gz"
)


def test_file_dependency_wrong_path():
with pytest.raises(ValueError):
FileDependency("demo", DIST_PATH / "demo-0.2.0.tar.gz")
Expand Down

0 comments on commit 929af85

Please sign in to comment.