Bump lockfile format to 2.0

don't write package files out twice
python-poetry · Sep 24, 2022 · e7f7f46 · e7f7f46
1 parent f9e80ff
commit e7f7f46
Show file tree

Hide file tree

Showing 36 changed files with 63 additions and 405 deletions.
diff --git a/src/poetry/packages/locker.py b/src/poetry/packages/locker.py
@@ -47,7 +47,8 @@
 
 
 class Locker:
-    _VERSION = "1.2"
+    _VERSION = "2.0"
+    _READ_VERSION_RANGE = ">=1,<3"
 
     _legacy_keys = ["dependencies", "source", "extras", "dev-dependencies"]
     _relevant_keys = [*_legacy_keys, "group"]
@@ -258,8 +259,6 @@ def set_lock_data(self, root: Package, packages: list[Package]) -> bool:
             "lock-version": self._VERSION,
             "python-versions": root.python_versions,
             "content-hash": self._content_hash,
-            # TODO stop writing files here, this is deprecated.
-            "files": files,
         }
 
         if not self.is_locked() or lock != self.lock_data:
@@ -307,11 +306,7 @@ def _get_lock_data(self) -> TOMLDocument:
         metadata = cast("Table", lock_data["metadata"])
         lock_version = Version.parse(metadata.get("lock-version", "1.0"))
         current_version = Version.parse(self._VERSION)
-        # We expect the locker to be able to read lock files
-        # from the same semantic versioning range
-        accepted_versions = parse_constraint(
-            f"^{Version.from_parts(current_version.major, 0)}"
-        )
+        accepted_versions = parse_constraint(self._READ_VERSION_RANGE)
         lock_version_allowed = accepted_versions.allows(lock_version)
         if lock_version_allowed and current_version < lock_version:
             logger.warning(

diff --git a/tests/console/commands/test_lock.py b/tests/console/commands/test_lock.py
@@ -146,7 +146,7 @@ def test_lock_no_update(
 
     assert len(packages) == len(locked_repository.packages)
 
-    assert locker.lock_data["metadata"].get("lock-version") == "1.2"
+    assert locker.lock_data["metadata"].get("lock-version") == "2.0"
 
     for package in packages:
         assert locked_repository.find_packages(package.to_dependency())
diff --git a/tests/fixtures/outdated_lock/poetry.lock b/tests/fixtures/outdated_lock/poetry.lock
diff --git a/tests/fixtures/up_to_date_lock/poetry.lock b/tests/fixtures/up_to_date_lock/poetry.lock
diff --git a/tests/installation/fixtures/extras-with-dependencies.test b/tests/installation/fixtures/extras-with-dependencies.test
@@ -42,11 +42,5 @@ foo = ["C"]
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-A = []
-B = []
-C = []
-D = []
diff --git a/tests/installation/fixtures/extras.test b/tests/installation/fixtures/extras.test
@@ -39,11 +39,5 @@ foo = ["D"]
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-A = []
-B = []
-C = []
-D = []
diff --git a/tests/installation/fixtures/install-no-dev.test b/tests/installation/fixtures/install-no-dev.test
@@ -27,10 +27,5 @@ files = []
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-"A" = []
-"B" = []
-"C" = []
diff --git a/tests/installation/fixtures/no-dependencies.test b/tests/installation/fixtures/no-dependencies.test
@@ -2,7 +2,5 @@ package = []
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
diff --git a/tests/installation/fixtures/remove.test b/tests/installation/fixtures/remove.test
@@ -9,8 +9,5 @@ files = []
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-"A" = []
diff --git a/tests/installation/fixtures/update-with-lock.test b/tests/installation/fixtures/update-with-lock.test
@@ -9,8 +9,5 @@ files = []
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-"A" = []
diff --git a/tests/installation/fixtures/update-with-locked-extras.test b/tests/installation/fixtures/update-with-locked-extras.test
@@ -43,11 +43,5 @@ files = []
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-"A" = []
-"B" = []
-"C" = []
-"D" = []
diff --git a/tests/installation/fixtures/with-category-change.test b/tests/installation/fixtures/with-category-change.test
@@ -21,9 +21,5 @@ A = "^1.0"
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-"A" = []
-"B" = []
diff --git a/tests/installation/fixtures/with-conditional-dependency.test b/tests/installation/fixtures/with-conditional-dependency.test
@@ -24,8 +24,5 @@ python = ">=3.6,<4.0"
 
 [metadata]
 python-versions = "~2.7 || ^3.4"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-A = []
diff --git a/tests/installation/fixtures/with-dependencies-extras.test b/tests/installation/fixtures/with-dependencies-extras.test
@@ -33,10 +33,5 @@ files = []
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-"A" = []
-"B" = []
-"C" = []
diff --git a/tests/installation/fixtures/with-dependencies-nested-extras.test b/tests/installation/fixtures/with-dependencies-nested-extras.test
@@ -39,10 +39,5 @@ files = []
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-"A" = []
-"B" = []
-"C" = []
diff --git a/tests/installation/fixtures/with-dependencies.test b/tests/installation/fixtures/with-dependencies.test
@@ -18,9 +18,5 @@ files = []
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-"A" = []
-"B" = []
diff --git a/tests/installation/fixtures/with-directory-dependency-poetry-transitive.test b/tests/installation/fixtures/with-directory-dependency-poetry-transitive.test
@@ -100,15 +100,5 @@ url = "project_with_transitive_file_dependencies"
 
 [metadata]
 content-hash = "123456789"
-lock-version = "1.2"
+lock-version = "2.0"
 python-versions = "*"
-
-[metadata.files]
-demo = [
-    {file = "demo-0.1.0-py2.py3-none-any.whl", hash = "sha256:70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a"},
-]
-inner-directory-project = []
-pendulum = []
-project-with-extras = []
-project-with-transitive-directory-dependencies = []
-project-with-transitive-file-dependencies = []
diff --git a/tests/installation/fixtures/with-directory-dependency-poetry.test b/tests/installation/fixtures/with-directory-dependency-poetry.test
@@ -30,9 +30,5 @@ url = "tests/fixtures/project_with_extras"
 
 [metadata]
 content-hash = "123456789"
-lock-version = "1.2"
+lock-version = "2.0"
 python-versions = "*"
-
-[metadata.files]
-project-with-extras = []
-pendulum = []
diff --git a/tests/installation/fixtures/with-directory-dependency-setuptools.test b/tests/installation/fixtures/with-directory-dependency-setuptools.test
@@ -36,10 +36,5 @@ pendulum = ">=1.4.4"
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-cachy = []
-project-with-setup = []
-pendulum = []
diff --git a/tests/installation/fixtures/with-duplicate-dependencies-update.test b/tests/installation/fixtures/with-duplicate-dependencies-update.test
@@ -33,10 +33,5 @@ files = []
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-A = []
-B = []
-C = []
diff --git a/tests/installation/fixtures/with-duplicate-dependencies.test b/tests/installation/fixtures/with-duplicate-dependencies.test
@@ -57,10 +57,5 @@ files = []
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-A = []
-B = []
-C = []
diff --git a/tests/installation/fixtures/with-file-dependency-transitive.test b/tests/installation/fixtures/with-file-dependency-transitive.test
@@ -64,13 +64,5 @@ url = "project_with_transitive_file_dependencies"
 
 [metadata]
 content-hash = "123456789"
-lock-version = "1.2"
+lock-version = "2.0"
 python-versions = "*"
-
-[metadata.files]
-demo = [
-    {file = "demo-0.1.0-py2.py3-none-any.whl", hash = "sha256:70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a"},
-]
-inner-directory-project = []
-pendulum = []
-project-with-transitive-file-dependencies = []
diff --git a/tests/installation/fixtures/with-file-dependency.test b/tests/installation/fixtures/with-file-dependency.test
@@ -32,11 +32,5 @@ files = []
 
 [metadata]
 python-versions = "*"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-demo = [
-    {file = "demo-0.1.0-py2.py3-none-any.whl", hash = "sha256:70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a"},
-]
-pendulum = []
diff --git a/tests/installation/fixtures/with-multiple-updates.test b/tests/installation/fixtures/with-multiple-updates.test
@@ -43,10 +43,5 @@ files = []
 
 [metadata]
 python-versions = "~2.7 || ^3.4"
-lock-version = "1.2"
+lock-version = "2.0"
 content-hash = "123456789"
-
-[metadata.files]
-A = []
-B = []
-C = []