Merge branch 'master' into merge-master-into-develop

CHANGELOG.md

 # Change Log
 # Change Log
 
 
+## [1.0.2] - 2020-01-10
+
+### Fixed
+
+- Reverted a previous fix ([#1796](https://github.com/python-poetry/poetry/pull/1796)) which was causing errors for projects with file and/or directory dependencies ([#1865](https://github.com/python-poetry/poetry/pull/1865)).
+
+
 ## [1.0.1] - 2020-01-10
 ## [1.0.1] - 2020-01-10
 
 
 ### Fixed
 ### Fixed
@@ -776,7 +783,8 @@ Initial release
 
 
 
 
 
 
-[Unreleased]: https://github.com/python-poetry/poetry/compare/1.0.1...master
+[Unreleased]: https://github.com/python-poetry/poetry/compare/1.0.2...master
+[1.0.2]: https://github.com/python-poetry/poetry/releases/tag/1.0.2
 [1.0.1]: https://github.com/python-poetry/poetry/releases/tag/1.0.1
 [1.0.1]: https://github.com/python-poetry/poetry/releases/tag/1.0.1
 [1.0.0]: https://github.com/python-poetry/poetry/releases/tag/1.0.0
 [1.0.0]: https://github.com/python-poetry/poetry/releases/tag/1.0.0
 [0.12.17]: https://github.com/python-poetry/poetry/releases/tag/0.12.17
 [0.12.17]: https://github.com/python-poetry/poetry/releases/tag/0.12.17

poetry/__version__.py

-__version__ = "1.0.1"
+__version__ = "1.0.2"

poetry/packages/directory_dependency.py

@@ -74,17 +74,6 @@ class DirectoryDependency(Dependency):
     def develop(self):
     def develop(self):
         return self._develop
         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):
     def supports_poetry(self):
         return self._supports_poetry
         return self._supports_poetry
 
 

poetry/packages/file_dependency.py

@@ -49,17 +49,6 @@ class FileDependency(Dependency):
     def full_path(self):
     def full_path(self):
         return self._full_path.resolve()
         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):
     def is_file(self):
         return True
         return True
 
 

pyproject.toml

 [tool.poetry]
 [tool.poetry]
 name = "poetry"
 name = "poetry"
-version = "1.0.1"
+version = "1.0.2"
 description = "Python dependency management and packaging made easy."
 description = "Python dependency management and packaging made easy."
 authors = [
 authors = [
     "Sébastien Eustace <sebastien@eustace.io>"
     "Sébastien Eustace <sebastien@eustace.io>"

tests/packages/test_directory_dependency.py

@@ -8,24 +8,12 @@ from poetry.utils.env import EnvCommandError
 from poetry.utils.env import MockEnv as BaseMockEnv
 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):
 class MockEnv(BaseMockEnv):
     def run(self, bin, *args):
     def run(self, bin, *args):
         raise EnvCommandError(CalledProcessError(1, "python", output=""))
         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():
 def test_directory_dependency_must_exist():

tests/packages/test_file_dependency.py

@@ -7,16 +7,6 @@ from poetry.utils._compat import Path
 DIST_PATH = Path(__file__).parent.parent / "fixtures" / "distributions"
 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():
 def test_file_dependency_wrong_path():
     with pytest.raises(ValueError):
     with pytest.raises(ValueError):
         FileDependency("demo", DIST_PATH / "demo-0.2.0.tar.gz")
         FileDependency("demo", DIST_PATH / "demo-0.2.0.tar.gz")