Merge pull request #267 from frostming/bugfix/262

Bugfix: Use the absolute path for destination path

news/262.bugfix.md

@@ -0,0 +1 @@
+Use the absolute path when importing from a Poetry pyproject.toml.

news/263.bugfix.md

@@ -0,0 +1 @@
+Fix a bug that old toml table head is kept when converting to PEP 621 metadata format.

pdm/cli/actions.py

@@ -475,6 +475,7 @@ def do_info(
     env: bool = False,
 ) -> None:
     """Show project information."""
+    check_project_file(project)
     python_path = project.environment.python_executable
     python_version, is_64bit = get_python_version(python_path, True)
     if not python and not show_project and not env:
@@ -532,7 +533,6 @@ def do_import(project: Project, filename: str, format: Optional[str] = None) ->
         )
 
     pyproject["project"].update(project_data)
-
     pyproject["build-system"] = {
         "requires": ["pdm-pep517"],
         "build-backend": "pdm.pep517.api",

pdm/formats/legacy.py

@@ -1,7 +1,6 @@
 import functools
 
-import tomlkit
-import tomlkit.exceptions
+import toml
 
 from pdm.formats.base import (
     MetaConverter,
@@ -17,8 +16,8 @@
 def check_fingerprint(project, filename):
     with open(filename, encoding="utf-8") as fp:
         try:
-            data = tomlkit.parse(fp.read())
-        except tomlkit.exceptions.TOMLKitError:
+            data = toml.load(fp)
+        except toml.TomlDecodeError:
             return False
 
     return (
@@ -133,9 +132,7 @@ def allow_prereleases(self, value):
 
 def convert(project, filename):
     with open(filename, encoding="utf-8") as fp:
-        converter = LegacyMetaConverter(
-            tomlkit.parse(fp.read())["tool"]["pdm"], filename
-        )
+        converter = LegacyMetaConverter(toml.load(fp)["tool"]["pdm"], filename)
         return dict(converter), converter.settings
 
 

pdm/formats/pipfile.py

@@ -2,7 +2,7 @@
 import operator
 import os
 
-import tomlkit
+import toml
 from packaging.markers import default_environment
 
 from pdm.formats.base import make_array
@@ -35,7 +35,7 @@ def check_fingerprint(project, filename):
 
 def convert(project, filename):
     with open(filename, encoding="utf-8") as fp:
-        data = tomlkit.parse(fp.read())
+        data = toml.load(fp)
     result = {}
     settings = {}
     if "pipenv" in data:

pdm/formats/poetry.py

@@ -3,8 +3,7 @@
 import os
 import re
 
-import tomlkit
-import tomlkit.exceptions
+import toml
 
 from pdm.formats.base import (
     MetaConverter,
@@ -23,8 +22,8 @@
 def check_fingerprint(project, filename):
     with open(filename, encoding="utf-8") as fp:
         try:
-            data = tomlkit.parse(fp.read())
-        except tomlkit.exceptions.TOMLKitError:
+            data = toml.load(fp)
+        except toml.TomlDecodeError:
             return False
 
     return "tool" in data and "poetry" in data["tool"]
@@ -51,7 +50,7 @@ def _convert_specifier(version):
 
 def _convert_python(python):
     if not python:
-        return ""
+        return PySpecSet()
     parts = [PySpecSet(_convert_specifier(s)) for s in python.split("||")]
     return functools.reduce(operator.or_, parts)
 
@@ -168,8 +167,10 @@ def source(self, value):
 
 
 def convert(project, filename):
-    with open(filename, encoding="utf-8") as fp, cd(os.path.dirname(filename)):
-        converter = PoetryMetaConverter(tomlkit.parse(fp.read())["tool"]["poetry"])
+    with open(filename, encoding="utf-8") as fp, cd(
+        os.path.dirname(os.path.abspath(filename))
+    ):
+        converter = PoetryMetaConverter(toml.load(fp)["tool"]["poetry"])
         return dict(converter), converter.settings
 
 

pdm/project/core.py

@@ -409,7 +409,7 @@ def write_pyproject(self, show_message: bool = True) -> None:
     def meta(self) -> Optional[Metadata]:
         if not self.pyproject:
             self.pyproject = {"project": tomlkit.table()}
-        return Metadata(self.pyproject_file, self.pyproject["project"])
+        return Metadata(self.pyproject_file, self.pyproject.get("project"))
 
     def init_global_project(self) -> None:
         if not self.is_global: