add tests

Author: mustafasoylu

tests/conftest.py

@@ -23,6 +23,7 @@
 
 class FileTypes(Enum):
     POETRY = "poetry"
+    POETRY2 = "poetry2"
     SETUPTOOLS = "setuptools"
     CITATION = "citation"
     SOMESY = "somesy"
@@ -81,6 +82,8 @@ def _create_files(files: Set[Tuple[FileTypes, str]]):
                 read_file_name = read_file_path / Path("pyproject.setuptools.toml")
             elif file_type == FileTypes.POETRY:
                 read_file_name = read_file_path / Path("pyproject.toml")
+            elif file_type == FileTypes.POETRY2:
+                read_file_name = read_file_path / Path("pyproject2.toml")
             elif file_type == FileTypes.SOMESY:
                 read_file_name = read_file_path / Path("somesy.toml")
             elif file_type == FileTypes.PACKAGE_JSON:
@@ -134,6 +137,9 @@ def _load_files(files: Set[FileTypes]):
             elif file_type == FileTypes.POETRY:
                 read_file_name = read_file_name / Path("pyproject.toml")
                 file_instances[file_type] = Pyproject(read_file_name)
+            elif file_type == FileTypes.POETRY2:
+                read_file_name = read_file_name / Path("pyproject2.toml")
+                file_instances[file_type] = Pyproject(read_file_name)
             elif file_type == FileTypes.SOMESY:
                 read_file_name = read_file_name / Path("somesy.toml")
                 file_instances[file_type] = SomesyInput.from_input_file(read_file_name)

tests/data/pyproject2.toml

@@ -0,0 +1,85 @@
+[project]
+name = "test-package"
+version = "0.1.0"
+description = "This is a test package for demonstration purposes."
+authors = ["John Doe <john.doe@example.com>"]
+license = "MIT"
+repository = "https://github.com/example/test-package"
+homepage = "https://example.com/test-package"
+documentation = "https://example.com/test-package"
+keywords = ["test", "demo", "example"]
+classifiers = [
+    "Operating System :: POSIX :: Linux",
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Science/Research",
+    "Topic :: Software Development :: Libraries :: Application Frameworks",
+]
+
+[tool.poetry.dependencies]
+python = "^3.8"
+pydantic = "^1.10.2"
+
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+# project metadata
+[tool.somesy.project]
+name = "testproject"
+version = "1.0.0"
+description = "This is a test project for demonstration purposes."
+keywords = ["test", "demo", "example"]
+license = "MIT"
+repository = "https://github.com/example/testproject"
+homepage = "https://example.com/testproject"
+
+[[tool.somesy.project.people]]
+family-names = "Doe"
+given-names = "John"
+email = "john.doe@example.com"
+orcid = "https://orcid.org/0000-0000-0000-0000"
+
+contribution = "The main developer, maintainer, and tester."
+contribution_begin = "2023-01-15"
+contribution_types = ["maintenance", "code", "test", "review", "doc"]
+
+author = true
+maintainer = true
+publication_author = true
+
+[[tool.somesy.project.people]]
+family-names = "Doe"
+given-names = "Jane"
+email = "jane.doe@example.com"
+orcid = "https://orcid.org/0000-0000-0000-0001"
+
+contribution = "Initial concepts, tool development and enhancement, documentation."
+contribution_begin = "2023-02-20"
+contribution_types = ["ideas", "code", "test", "review", "doc"]
+
+author = true
+
+[[tool.somesy.project.people]]
+family-names = "Doe"
+given-names = "Michael"
+email = "michael.doe@example.com"
+orcid = "https://orcid.org/0000-0000-0000-0002"
+
+contribution = "Valuable input concerning metadata standards and usability."
+contribution_begin = "2023-03-10"
+contribution_types = ["ideas"]
+publication_author = true
+
+[tool.somesy.config]
+no_sync_cff = false
+cff_file = "CITATION.cff"
+no_sync_pyproject = false
+pyproject_file = "pyproject.toml"
+no_sync_codemeta = false
+codemeta_file = "codemeta.json"
+no_sync_package_json = true
+show_info = false
+verbose = false
+debug = false

tests/input/test_pyproject_validate.py

@@ -7,29 +7,42 @@
 def test_poetry_validate_accept(load_files, file_types):
     """Validate by loading the data pyproject file using the fixture."""
     load_files([file_types.SETUPTOOLS])
-    load_files([file_types.POETRY])
+    load_files([file_types.POETRY])  # Poetry v1
+    load_files([file_types.POETRY2])  # Poetry v2
 
 
 def test_poetry_validate(tmp_path):
     """Test validating a pyproject file in both poetry and setuptools formats."""
 
-    # create a pyproject file in poetry format but with a invalid values
-    reject_poetry_object = {
+    # Test Poetry v1 format with invalid values
+    reject_poetry_v1_object = {
         "tool": {
             "poetry": {"name": "somesy", "version": "abc", "authors": ["John Doe <"]}
         }
     }
     invalid_poetry_path = tmp_path / "pyproject.toml"
     with open(invalid_poetry_path, "w+") as f:
-        dump(reject_poetry_object, f)
+        dump(reject_poetry_v1_object, f)
 
     with pytest.raises(ValueError):
         Pyproject(invalid_poetry_path)
 
-    # if we pass validation, it should not raise an error
+    # Test Poetry v2 format with invalid values
+    reject_poetry_v2_object = {
+        "tool": {"poetry": {}},
+        "project": {"name": "somesy", "version": "abc", "authors": ["John Doe <"]},
+    }
+    invalid_poetry_path = tmp_path / "pyproject2.toml"
+    with open(invalid_poetry_path, "w+") as f:
+        dump(reject_poetry_v2_object, f)
+
+    with pytest.raises(ValueError):
+        Pyproject(invalid_poetry_path)
+
+    # if we pass validation, it should not raise an error for either version
     Pyproject(invalid_poetry_path, pass_validation=True)
 
-    # create a pyproject file in setuptools format but with a invalid values
+    # Test setuptools format with invalid values
     reject_setuptools_object = {
         "project": {"name": "somesy", "version": "abc", "authors": ["John Doe <"]}
     }

tests/output/test_pyproject_writer.py

@@ -12,12 +12,24 @@ def pyproject_poetry(load_files, file_types):
     return files[file_types.POETRY]
 
 
+@pytest.fixture
+def pyproject_poetry2(load_files, file_types):
+    files = load_files([file_types.POETRY2])
+    return files[file_types.POETRY2]
+
+
 @pytest.fixture
 def pyproject_poetry_file(create_files, file_types):
     folder = create_files([(file_types.POETRY, "pyproject.toml")])
     return folder / Path("pyproject.toml")
 
 
+@pytest.fixture
+def pyproject_poetry2_file(create_files, file_types):
+    folder = create_files([(file_types.POETRY2, "pyproject2.toml")])
+    return folder / Path("pyproject2.toml")
+
+
 @pytest.fixture
 def pyproject_setuptools(load_files, file_types):
     files = load_files([file_types.SETUPTOOLS])
@@ -30,7 +42,7 @@ def pyproject_setuptools_file(create_files, file_types):
     return folder / Path("pyproject.toml")
 
 
-def test_content_match(pyproject_poetry, pyproject_setuptools):
+def test_content_match(pyproject_poetry, pyproject_poetry2, pyproject_setuptools):
     # create a function to check both file formats
     def assert_content_match(pyproject_file):
         assert pyproject_file.name == "test-package"
@@ -43,29 +55,32 @@ def assert_content_match(pyproject_file):
         )
         assert len(pyproject_file.authors) == 1
 
-    # assert for both formats
+    # assert for all formats
     assert_content_match(pyproject_poetry)
+    assert_content_match(pyproject_poetry2)
     assert_content_match(pyproject_setuptools)
 
 
-def test_sync(pyproject_poetry, pyproject_setuptools, somesy_input):
+def test_sync(pyproject_poetry, pyproject_poetry2, pyproject_setuptools, somesy_input):
     def assert_sync(pyproject):
         pyproject.sync(somesy_input.project)
         assert pyproject.name == "testproject"
         assert pyproject.version == "1.0.0"
 
     assert_sync(pyproject_poetry)
+    assert_sync(pyproject_poetry2)
     assert_sync(pyproject_setuptools)
 
 
-def test_save(tmp_path, pyproject_poetry, pyproject_setuptools):
+def test_save(tmp_path, pyproject_poetry, pyproject_poetry2, pyproject_setuptools):
     def assert_save(pyproject):
         custom_path = tmp_path / Path("pyproject.toml")
         pyproject.save(custom_path)
         assert custom_path.is_file()
         custom_path.unlink()
 
     assert_save(pyproject_poetry)
+    assert_save(pyproject_poetry2)
     assert_save(pyproject_setuptools)
 
 
@@ -97,13 +112,25 @@ def test_from_to_person(person):
 
 
 @pytest.mark.parametrize(
-    "writer_class, writer_file_fixture",
-    [(Poetry, "pyproject_poetry_file"), (SetupTools, "pyproject_setuptools_file")],
+    "writer_class, writer_file_fixture, version",
+    [
+        (Poetry, "pyproject_poetry_file", 1),
+        (Poetry, "pyproject_poetry2_file", 2),
+        (SetupTools, "pyproject_setuptools_file", None),
+    ],
 )
-def test_person_merge_pyproject(request, writer_class, writer_file_fixture, person):
+def test_person_merge_pyproject(
+    request, writer_class, writer_file_fixture, version, person
+):
     # get suitable project file
     writer_file = request.getfixturevalue(writer_file_fixture)
-    pj = writer_class(writer_file)
+
+    # Initialize with correct version for Poetry
+    if writer_class == Poetry:
+        pj = writer_class(writer_file, version=version)
+    else:
+        pj = writer_class(writer_file)
+
     # update project file with known data
     pm = ProjectMetadata(
         name="My awesome project",
@@ -176,7 +203,8 @@ def test_person_merge_pyproject(request, writer_class, writer_file_fixture, pers
 
 
 def test_without_email(tmp_path, person):
-    pyproject_str = """
+    # Test Poetry v1
+    pyproject_v1_str = """
     [tool.poetry]
     name = "ttt"
     version = "0.1.0"
@@ -187,33 +215,58 @@ def test_without_email(tmp_path, person):
     [tool.poetry.dependencies]
     python = "^3.10"
 
-
     [build-system]
     requires = ["poetry-core"]
     build-backend = "poetry.core.masonry.api"
     """
 
-    # save to file
-    pyproject_file = tmp_path / Path("pyproject.toml")
-    pyproject_file.write_text(pyproject_str)
+    # Test Poetry v2
+    pyproject_v2_str = """
+    [tool.poetry]
+    name = "ttt"
+    version = "0.1.0"
+    description = "asd"
+    authors = ["John Doe"]
+    license = "MIT"
 
-    # load and sync
-    p = Poetry(pyproject_file)
-    assert len(p.authors) == 1
+    [project]
+    name = "ttt"
+    version = "0.1.0"
+    description = "asd"
+    authors = ["John Doe"]
+    license = "MIT"
 
-    pm = ProjectMetadata(
-        name="My awesome project",
-        description="Project description",
-        license=LicenseEnum.MIT,
-        version="0.1.0",
-        people=[
-            person.model_copy(
-                update=dict(author=True, publication_author=True, maintainer=True)
-            )
-        ],
-    )
+    [tool.poetry.dependencies]
+    python = "^3.10"
+
+    [build-system]
+    requires = ["poetry-core"]
+    build-backend = "poetry.core.masonry.api"
+    """
+
+    # Test both versions
+    for pyproject_str, version in [(pyproject_v1_str, 1), (pyproject_v2_str, 2)]:
+        # save to file
+        pyproject_file = tmp_path / Path(f"pyproject_v{version}.toml")
+        pyproject_file.write_text(pyproject_str)
+
+        # load and sync
+        p = Poetry(pyproject_file, version=version)
+        assert len(p.authors) == 1
+
+        pm = ProjectMetadata(
+            name="My awesome project",
+            description="Project description",
+            license=LicenseEnum.MIT,
+            version="0.1.0",
+            people=[
+                person.model_copy(
+                    update=dict(author=True, publication_author=True, maintainer=True)
+                )
+            ],
+        )
 
-    p.sync(pm)
+        p.sync(pm)
 
-    assert len(p.authors) == 1
-    assert len(p.maintainers) == 1
+        assert len(p.authors) == 1
+        assert len(p.maintainers) == 1