From c4c6b2517a0c2fe532b4231a747eec3a6eeaf31e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 17 Aug 2023 21:32:15 +0200 Subject: [PATCH] Remove code handling pyproject.lock files Poetry no longer supports them. --- python/lib/dependabot/python/file_fetcher.rb | 8 +--- python/lib/dependabot/python/file_parser.rb | 4 -- .../file_parser/pyproject_files_parser.rb | 14 +----- python/lib/dependabot/python/file_updater.rb | 6 +-- .../file_updater/poetry_file_updater.rb | 10 +--- .../lib/dependabot/python/update_checker.rb | 8 +--- .../update_checker/poetry_version_resolver.rb | 12 +---- .../pyproject_files_parser_spec.rb | 48 +++++++------------ .../dependabot/python/file_parser_spec.rb | 10 ++-- .../file_updater/poetry_file_updater_spec.rb | 14 +++--- .../file_updater/pyproject_preparer_spec.rb | 20 ++++---- .../dependabot/python/file_updater_spec.rb | 6 +-- .../poetry_version_resolver_spec.rb | 4 +- .../caret_version.lock | 0 .../conflict_at_latest.lock | 0 .../dir_dependency.lock | 0 .../exact_version.lock | 0 .../extra_dependency.lock | 0 .../extras.lock | 0 .../file_dependency.lock | 0 .../git_conflict.lock | 0 .../git_dependency.lock | 0 .../latest_subdep_blocked.lock | 0 .../multiple_constraint_dependency.lock | 0 .../pdm_example.lock | 0 .../poetry.lock | 0 .../private_secondary_source.lock | 0 .../python_2.lock | 0 .../python_310.lock | 0 .../python_38.lock | 0 .../url_dependency.lock | 0 .../version_not_specified.lock | 0 .../yanked_version.lock | 0 33 files changed, 54 insertions(+), 110 deletions(-) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/caret_version.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/conflict_at_latest.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/dir_dependency.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/exact_version.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/extra_dependency.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/extras.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/file_dependency.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/git_conflict.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/git_dependency.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/latest_subdep_blocked.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/multiple_constraint_dependency.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/pdm_example.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/poetry.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/private_secondary_source.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/python_2.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/python_310.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/python_38.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/url_dependency.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/version_not_specified.lock (100%) rename python/spec/fixtures/{pyproject_locks => poetry_locks}/yanked_version.lock (100%) diff --git a/python/lib/dependabot/python/file_fetcher.rb b/python/lib/dependabot/python/file_fetcher.rb index 2b974564c7..47556f44d7 100644 --- a/python/lib/dependabot/python/file_fetcher.rb +++ b/python/lib/dependabot/python/file_fetcher.rb @@ -91,7 +91,7 @@ def pipenv_files end def pyproject_files - [pyproject, pyproject_lock, poetry_lock, pdm_lock].compact + [pyproject, poetry_lock, pdm_lock].compact end def requirement_files @@ -166,12 +166,6 @@ def pyproject @pyproject = fetch_file_if_present("pyproject.toml") end - def pyproject_lock - return @pyproject_lock if defined?(@pyproject_lock) - - @pyproject_lock = fetch_file_if_present("pyproject.lock") - end - def poetry_lock return @poetry_lock if defined?(@poetry_lock) diff --git a/python/lib/dependabot/python/file_parser.rb b/python/lib/dependabot/python/file_parser.rb index 8ecc641763..317c9fd06c 100644 --- a/python/lib/dependabot/python/file_parser.rb +++ b/python/lib/dependabot/python/file_parser.rb @@ -208,10 +208,6 @@ def pyproject @pyproject ||= get_original_file("pyproject.toml") end - def pyproject_lock - @pyproject_lock ||= get_original_file("pyproject.lock") - end - def poetry_lock @poetry_lock ||= get_original_file("poetry.lock") end diff --git a/python/lib/dependabot/python/file_parser/pyproject_files_parser.rb b/python/lib/dependabot/python/file_parser/pyproject_files_parser.rb index 9a3b0eb9ea..052466deaf 100644 --- a/python/lib/dependabot/python/file_parser/pyproject_files_parser.rb +++ b/python/lib/dependabot/python/file_parser/pyproject_files_parser.rb @@ -194,12 +194,6 @@ def parsed_pyproject raise Dependabot::DependencyFileNotParseable, pyproject.path end - def parsed_pyproject_lock - @parsed_pyproject_lock ||= TomlRB.parse(pyproject_lock.content) - rescue TomlRB::ParseError, TomlRB::ValueOverwriteError - raise Dependabot::DependencyFileNotParseable, pyproject_lock.path - end - def parsed_poetry_lock @parsed_poetry_lock ||= TomlRB.parse(poetry_lock.content) rescue TomlRB::ParseError, TomlRB::ValueOverwriteError @@ -212,7 +206,7 @@ def pyproject end def lockfile - poetry_lock || pyproject_lock + poetry_lock end def parsed_pep621_dependencies @@ -235,12 +229,6 @@ def write_temporary_pyproject def parsed_lockfile return parsed_poetry_lock if poetry_lock - return parsed_pyproject_lock if pyproject_lock - end - - def pyproject_lock - @pyproject_lock ||= - dependency_files.find { |f| f.name == "pyproject.lock" } end def poetry_lock diff --git a/python/lib/dependabot/python/file_updater.rb b/python/lib/dependabot/python/file_updater.rb index 94cea9f607..a8afa7e8ff 100644 --- a/python/lib/dependabot/python/file_updater.rb +++ b/python/lib/dependabot/python/file_updater.rb @@ -77,7 +77,7 @@ def resolver_type def subdependency_resolver return :pipfile if pipfile_lock - return :poetry if poetry_lock || pyproject_lock + return :poetry if poetry_lock return :pip_compile if pip_compile_files.any? raise "Claimed to be a sub-dependency, but no lockfile exists!" @@ -144,10 +144,6 @@ def pyproject @pyproject ||= get_original_file("pyproject.toml") end - def pyproject_lock - @pyproject_lock ||= get_original_file("pyproject.lock") - end - def poetry_lock @poetry_lock ||= get_original_file("poetry.lock") end diff --git a/python/lib/dependabot/python/file_updater/poetry_file_updater.rb b/python/lib/dependabot/python/file_updater/poetry_file_updater.rb index e674273961..58bad2044d 100644 --- a/python/lib/dependabot/python/file_updater/poetry_file_updater.rb +++ b/python/lib/dependabot/python/file_updater/poetry_file_updater.rb @@ -182,9 +182,7 @@ def updated_lockfile_content_for(pyproject_content) run_poetry_update_command - return File.read("poetry.lock") if File.exist?("poetry.lock") - - File.read("pyproject.lock") + File.read("poetry.lock") end end end @@ -313,17 +311,13 @@ def pyproject end def lockfile - @lockfile ||= pyproject_lock || poetry_lock + @lockfile ||= poetry_lock end def python_helper_path NativeHelpers.python_helper_path end - def pyproject_lock - dependency_files.find { |f| f.name == "pyproject.lock" } - end - def poetry_lock dependency_files.find { |f| f.name == "poetry.lock" } end diff --git a/python/lib/dependabot/python/update_checker.rb b/python/lib/dependabot/python/update_checker.rb index d377d40c6a..4ebd4b1709 100644 --- a/python/lib/dependabot/python/update_checker.rb +++ b/python/lib/dependabot/python/update_checker.rb @@ -74,7 +74,7 @@ def updated_requirements requirements: requirements, latest_resolvable_version: preferred_resolvable_version&.to_s, update_strategy: requirements_update_strategy, - has_lockfile: !(pipfile_lock || poetry_lock || pyproject_lock).nil? + has_lockfile: !(pipfile_lock || poetry_lock).nil? ).updated_requirements end @@ -143,7 +143,7 @@ def resolver_type def subdependency_resolver return :pipenv if pipfile_lock - return :poetry if poetry_lock || pyproject_lock + return :poetry if poetry_lock return :pip_compile if pip_compile_files.any? raise "Claimed to be a sub-dependency, but no lockfile exists!" @@ -315,10 +315,6 @@ def pyproject dependency_files.find { |f| f.name == "pyproject.toml" } end - def pyproject_lock - dependency_files.find { |f| f.name == "pyproject.lock" } - end - def poetry_lock dependency_files.find { |f| f.name == "poetry.lock" } end diff --git a/python/lib/dependabot/python/update_checker/poetry_version_resolver.rb b/python/lib/dependabot/python/update_checker/poetry_version_resolver.rb index 789452ec26..edbd20140a 100644 --- a/python/lib/dependabot/python/update_checker/poetry_version_resolver.rb +++ b/python/lib/dependabot/python/update_checker/poetry_version_resolver.rb @@ -88,11 +88,7 @@ def fetch_latest_resolvable_version_string(requirement:) # Shell out to Poetry, which handles everything for us. run_poetry_update_command - updated_lockfile = - if File.exist?("poetry.lock") then File.read("poetry.lock") - else - File.read("pyproject.lock") - end + updated_lockfile = File.read("poetry.lock") updated_lockfile = TomlRB.parse(updated_lockfile) fetch_version_from_parsed_lockfile(updated_lockfile) @@ -310,16 +306,12 @@ def pyproject dependency_files.find { |f| f.name == "pyproject.toml" } end - def pyproject_lock - dependency_files.find { |f| f.name == "pyproject.lock" } - end - def poetry_lock dependency_files.find { |f| f.name == "poetry.lock" } end def lockfile - poetry_lock || pyproject_lock + poetry_lock end def run_poetry_command(command, fingerprint: nil) diff --git a/python/spec/dependabot/python/file_parser/pyproject_files_parser_spec.rb b/python/spec/dependabot/python/file_parser/pyproject_files_parser_spec.rb index 01e5b092db..f601dd9548 100644 --- a/python/spec/dependabot/python/file_parser/pyproject_files_parser_spec.rb +++ b/python/spec/dependabot/python/file_parser/pyproject_files_parser_spec.rb @@ -107,13 +107,13 @@ let(:poetry_lock) do Dependabot::DependencyFile.new( name: "poetry.lock", - content: pyproject_lock_body + content: poetry_lock_body ) end - let(:pyproject_lock_body) do - fixture("pyproject_locks", pyproject_lock_fixture_name) + let(:poetry_lock_body) do + fixture("poetry_locks", poetry_lock_fixture_name) end - let(:pyproject_lock_fixture_name) { "poetry.lock" } + let(:poetry_lock_fixture_name) { "poetry.lock" } its(:length) { is_expected.to eq(36) } @@ -121,37 +121,25 @@ expect(dependencies.map(&:name)).to_not include("python") end - context "that is called pyproject.lock (legacy name)" do - let(:files) { [pyproject, pyproject_lock] } - let(:pyproject_lock) do - Dependabot::DependencyFile.new( - name: "pyproject.lock", - content: pyproject_lock_body - ) - end - - its(:length) { is_expected.to eq(36) } - - describe "a development sub-dependency" do - subject(:dep) { dependencies.find { |d| d.name == "atomicwrites" } } + describe "a development sub-dependency" do + subject(:dep) { dependencies.find { |d| d.name == "atomicwrites" } } - its(:subdependency_metadata) do - is_expected.to eq([{ production: false }]) - end + its(:subdependency_metadata) do + is_expected.to eq([{ production: false }]) end + end - describe "a production sub-dependency" do - subject(:dep) { dependencies.find { |d| d.name == "certifi" } } + describe "a production sub-dependency" do + subject(:dep) { dependencies.find { |d| d.name == "certifi" } } - its(:subdependency_metadata) do - is_expected.to eq([{ production: true }]) - end + its(:subdependency_metadata) do + is_expected.to eq([{ production: true }]) end end context "with a path dependency" do let(:pyproject_fixture_name) { "dir_dependency.toml" } - let(:pyproject_lock_fixture_name) { "dir_dependency.lock" } + let(:poetry_lock_fixture_name) { "dir_dependency.lock" } subject(:dependency_names) { dependencies.map(&:name) } it "excludes the path dependency" do @@ -165,7 +153,7 @@ context "with a git dependency" do let(:pyproject_fixture_name) { "git_dependency.toml" } - let(:pyproject_lock_fixture_name) { "git_dependency.lock" } + let(:poetry_lock_fixture_name) { "git_dependency.lock" } it "excludes the git dependency" do expect(dependencies.map(&:name)).to_not include("toml") @@ -174,7 +162,7 @@ context "with a url dependency" do let(:pyproject_fixture_name) { "url_dependency.toml" } - let(:pyproject_lock_fixture_name) { "url_dependency.lock" } + let(:poetry_lock_fixture_name) { "url_dependency.lock" } it "excludes the url dependency" do expect(dependencies.map(&:name)).to_not include("toml") @@ -294,9 +282,9 @@ ) end let(:pdm_lock_body) do - fixture("pyproject_locks", pyproject_lock_fixture_name) + fixture("poetry_locks", poetry_lock_fixture_name) end - let(:pyproject_lock_fixture_name) { "pdm_example.lock" } + let(:poetry_lock_fixture_name) { "pdm_example.lock" } let(:files) { [pyproject, pdm_lock] } subject(:dependencies) { parser.dependency_set.dependencies } diff --git a/python/spec/dependabot/python/file_parser_spec.rb b/python/spec/dependabot/python/file_parser_spec.rb index d6703ebe48..6c905d8b40 100644 --- a/python/spec/dependabot/python/file_parser_spec.rb +++ b/python/spec/dependabot/python/file_parser_spec.rb @@ -1212,18 +1212,18 @@ end end - context "with a pyproject.toml in poetry format and pyproject.lock legacy poetry lock file" do - let(:files) { [pyproject, pyproject_lock] } + context "with a pyproject.toml in poetry format and a lock file" do + let(:files) { [pyproject, poetry_lock] } let(:pyproject) do Dependabot::DependencyFile.new( name: "pyproject.toml", content: fixture("pyproject_files", "basic_poetry_dependencies.toml") ) end - let(:pyproject_lock) do + let(:poetry_lock) do Dependabot::DependencyFile.new( - name: "pyproject.lock", - content: fixture("pyproject_locks", "poetry.lock") + name: "poetry.lock", + content: fixture("poetry_locks", "poetry.lock") ) end diff --git a/python/spec/dependabot/python/file_updater/poetry_file_updater_spec.rb b/python/spec/dependabot/python/file_updater/poetry_file_updater_spec.rb index 58222d62bb..773a1eb684 100644 --- a/python/spec/dependabot/python/file_updater/poetry_file_updater_spec.rb +++ b/python/spec/dependabot/python/file_updater/poetry_file_updater_spec.rb @@ -25,8 +25,8 @@ end let(:lockfile) do Dependabot::DependencyFile.new( - name: "pyproject.lock", - content: fixture("pyproject_locks", lockfile_fixture_name) + name: "poetry.lock", + content: fixture("poetry_locks", lockfile_fixture_name) ) end let(:pyproject_fixture_name) { "version_not_specified.toml" } @@ -65,9 +65,9 @@ subject(:updated_files) { updater.updated_dependency_files } it "updates the lockfile successfully (and doesn't affect other deps)" do - expect(updated_files.map(&:name)).to eq(%w(pyproject.lock)) + expect(updated_files.map(&:name)).to eq(%w(poetry.lock)) - updated_lockfile = updated_files.find { |f| f.name == "pyproject.lock" } + updated_lockfile = updated_files.find { |f| f.name == "poetry.lock" } lockfile_obj = TomlRB.parse(updated_lockfile.content) requests = lockfile_obj["package"].find { |d| d["name"] == "requests" } @@ -106,7 +106,7 @@ end it "updates the lockfile successfully" do - updated_lockfile = updated_files.find { |f| f.name == "pyproject.lock" } + updated_lockfile = updated_files.find { |f| f.name == "poetry.lock" } lockfile_obj = TomlRB.parse(updated_lockfile.content) requests = lockfile_obj["package"].find { |d| d["name"] == "requests" } @@ -144,7 +144,7 @@ ) end it "updates the lockfile" do - updated_lockfile = updated_files.find { |f| f.name == "pyproject.lock" } + updated_lockfile = updated_files.find { |f| f.name == "poetry.lock" } lockfile_obj = TomlRB.parse(updated_lockfile.content) requests = lockfile_obj["package"].find { |d| d["name"] == "django" } @@ -337,7 +337,7 @@ let(:lockfile) do Dependabot::DependencyFile.new( name: "poetry.lock", - content: fixture("pyproject_locks", lockfile_fixture_name) + content: fixture("poetry_locks", lockfile_fixture_name) ) end diff --git a/python/spec/dependabot/python/file_updater/pyproject_preparer_spec.rb b/python/spec/dependabot/python/file_updater/pyproject_preparer_spec.rb index 2f9892957c..b6aa5049e3 100644 --- a/python/spec/dependabot/python/file_updater/pyproject_preparer_spec.rb +++ b/python/spec/dependabot/python/file_updater/pyproject_preparer_spec.rb @@ -92,14 +92,14 @@ let(:lockfile) do Dependabot::DependencyFile.new( - name: "pyproject.lock", - content: pyproject_lock_body + name: "poetry.lock", + content: poetry_lock_body ) end - let(:pyproject_lock_body) do - fixture("pyproject_locks", pyproject_lock_fixture_name) + let(:poetry_lock_body) do + fixture("poetry_locks", poetry_lock_fixture_name) end - let(:pyproject_lock_fixture_name) { "poetry.lock" } + let(:poetry_lock_fixture_name) { "poetry.lock" } context "with no dependencies to except" do let(:dependencies) { [] } @@ -109,7 +109,7 @@ context "with extras" do let(:pyproject_fixture_name) { "extras.toml" } - let(:pyproject_lock_fixture_name) { "extras.lock" } + let(:poetry_lock_fixture_name) { "extras.lock" } it "preserves details of the extras" do expect(freeze_top_level_dependencies_except).to include( @@ -139,7 +139,7 @@ context "with a multiple constraint dependency" do let(:dependencies) { [] } - let(:pyproject_lock_fixture_name) { "multiple_constraint_dependency.lock" } + let(:poetry_lock_fixture_name) { "multiple_constraint_dependency.lock" } let(:pyproject_fixture_name) { "multiple_constraint_dependency.toml" } it { is_expected.to include("pytest = \"3.7.4\"\n") } @@ -152,7 +152,7 @@ context "with directory dependency" do let(:dependencies) { [] } - let(:pyproject_lock_fixture_name) { "dir_dependency.lock" } + let(:poetry_lock_fixture_name) { "dir_dependency.lock" } let(:pyproject_fixture_name) { "dir_dependency.toml" } it { is_expected.to include("pytest = \"3.7.4\"\n") } @@ -170,7 +170,7 @@ context "with file dependency" do let(:dependencies) { [] } - let(:pyproject_lock_fixture_name) { "file_dependency.lock" } + let(:poetry_lock_fixture_name) { "file_dependency.lock" } let(:pyproject_fixture_name) { "file_dependency.toml" } it { is_expected.to include("pytest = \"3.7.4\"\n") } @@ -188,7 +188,7 @@ context "with url dependency" do let(:dependencies) { [] } - let(:pyproject_lock_fixture_name) { "url_dependency.lock" } + let(:poetry_lock_fixture_name) { "url_dependency.lock" } let(:pyproject_fixture_name) { "url_dependency.toml" } it { is_expected.to include("pytest = \"6.2.4\"\n") } diff --git a/python/spec/dependabot/python/file_updater_spec.rb b/python/spec/dependabot/python/file_updater_spec.rb index 98f3f10327..a6914516bd 100644 --- a/python/spec/dependabot/python/file_updater_spec.rb +++ b/python/spec/dependabot/python/file_updater_spec.rb @@ -256,7 +256,7 @@ end end - context "with a pyproject.toml and pyproject.lock" do + context "with a pyproject.toml and poetry.lock" do let(:dependency_files) { [pyproject, lockfile] } let(:pyproject) do Dependabot::DependencyFile.new( @@ -267,9 +267,9 @@ end let(:lockfile) do Dependabot::DependencyFile.new( - name: "pyproject.lock", + name: "poetry.lock", content: - fixture("pyproject_locks", "version_not_specified.lock") + fixture("poetry_locks", "version_not_specified.lock") ) end diff --git a/python/spec/dependabot/python/update_checker/poetry_version_resolver_spec.rb b/python/spec/dependabot/python/update_checker/poetry_version_resolver_spec.rb index f5bb726fef..caff3a515b 100644 --- a/python/spec/dependabot/python/update_checker/poetry_version_resolver_spec.rb +++ b/python/spec/dependabot/python/update_checker/poetry_version_resolver_spec.rb @@ -34,7 +34,7 @@ let(:lockfile) do Dependabot::DependencyFile.new( name: "poetry.lock", - content: fixture("pyproject_locks", lockfile_fixture_name) + content: fixture("poetry_locks", lockfile_fixture_name) ) end let(:lockfile_fixture_name) { "exact_version.lock" } @@ -107,7 +107,7 @@ let(:lockfile) do Dependabot::DependencyFile.new( name: "poetry.lock", - content: fixture("pyproject_locks", lockfile_fixture_name) + content: fixture("poetry_locks", lockfile_fixture_name) ) end it { is_expected.to eq(Gem::Version.new("2.18.4")) } diff --git a/python/spec/fixtures/pyproject_locks/caret_version.lock b/python/spec/fixtures/poetry_locks/caret_version.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/caret_version.lock rename to python/spec/fixtures/poetry_locks/caret_version.lock diff --git a/python/spec/fixtures/pyproject_locks/conflict_at_latest.lock b/python/spec/fixtures/poetry_locks/conflict_at_latest.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/conflict_at_latest.lock rename to python/spec/fixtures/poetry_locks/conflict_at_latest.lock diff --git a/python/spec/fixtures/pyproject_locks/dir_dependency.lock b/python/spec/fixtures/poetry_locks/dir_dependency.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/dir_dependency.lock rename to python/spec/fixtures/poetry_locks/dir_dependency.lock diff --git a/python/spec/fixtures/pyproject_locks/exact_version.lock b/python/spec/fixtures/poetry_locks/exact_version.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/exact_version.lock rename to python/spec/fixtures/poetry_locks/exact_version.lock diff --git a/python/spec/fixtures/pyproject_locks/extra_dependency.lock b/python/spec/fixtures/poetry_locks/extra_dependency.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/extra_dependency.lock rename to python/spec/fixtures/poetry_locks/extra_dependency.lock diff --git a/python/spec/fixtures/pyproject_locks/extras.lock b/python/spec/fixtures/poetry_locks/extras.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/extras.lock rename to python/spec/fixtures/poetry_locks/extras.lock diff --git a/python/spec/fixtures/pyproject_locks/file_dependency.lock b/python/spec/fixtures/poetry_locks/file_dependency.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/file_dependency.lock rename to python/spec/fixtures/poetry_locks/file_dependency.lock diff --git a/python/spec/fixtures/pyproject_locks/git_conflict.lock b/python/spec/fixtures/poetry_locks/git_conflict.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/git_conflict.lock rename to python/spec/fixtures/poetry_locks/git_conflict.lock diff --git a/python/spec/fixtures/pyproject_locks/git_dependency.lock b/python/spec/fixtures/poetry_locks/git_dependency.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/git_dependency.lock rename to python/spec/fixtures/poetry_locks/git_dependency.lock diff --git a/python/spec/fixtures/pyproject_locks/latest_subdep_blocked.lock b/python/spec/fixtures/poetry_locks/latest_subdep_blocked.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/latest_subdep_blocked.lock rename to python/spec/fixtures/poetry_locks/latest_subdep_blocked.lock diff --git a/python/spec/fixtures/pyproject_locks/multiple_constraint_dependency.lock b/python/spec/fixtures/poetry_locks/multiple_constraint_dependency.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/multiple_constraint_dependency.lock rename to python/spec/fixtures/poetry_locks/multiple_constraint_dependency.lock diff --git a/python/spec/fixtures/pyproject_locks/pdm_example.lock b/python/spec/fixtures/poetry_locks/pdm_example.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/pdm_example.lock rename to python/spec/fixtures/poetry_locks/pdm_example.lock diff --git a/python/spec/fixtures/pyproject_locks/poetry.lock b/python/spec/fixtures/poetry_locks/poetry.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/poetry.lock rename to python/spec/fixtures/poetry_locks/poetry.lock diff --git a/python/spec/fixtures/pyproject_locks/private_secondary_source.lock b/python/spec/fixtures/poetry_locks/private_secondary_source.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/private_secondary_source.lock rename to python/spec/fixtures/poetry_locks/private_secondary_source.lock diff --git a/python/spec/fixtures/pyproject_locks/python_2.lock b/python/spec/fixtures/poetry_locks/python_2.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/python_2.lock rename to python/spec/fixtures/poetry_locks/python_2.lock diff --git a/python/spec/fixtures/pyproject_locks/python_310.lock b/python/spec/fixtures/poetry_locks/python_310.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/python_310.lock rename to python/spec/fixtures/poetry_locks/python_310.lock diff --git a/python/spec/fixtures/pyproject_locks/python_38.lock b/python/spec/fixtures/poetry_locks/python_38.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/python_38.lock rename to python/spec/fixtures/poetry_locks/python_38.lock diff --git a/python/spec/fixtures/pyproject_locks/url_dependency.lock b/python/spec/fixtures/poetry_locks/url_dependency.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/url_dependency.lock rename to python/spec/fixtures/poetry_locks/url_dependency.lock diff --git a/python/spec/fixtures/pyproject_locks/version_not_specified.lock b/python/spec/fixtures/poetry_locks/version_not_specified.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/version_not_specified.lock rename to python/spec/fixtures/poetry_locks/version_not_specified.lock diff --git a/python/spec/fixtures/pyproject_locks/yanked_version.lock b/python/spec/fixtures/poetry_locks/yanked_version.lock similarity index 100% rename from python/spec/fixtures/pyproject_locks/yanked_version.lock rename to python/spec/fixtures/poetry_locks/yanked_version.lock