dependabot-python 0.225.0 → 0.227.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d804625d39f5d3fae7776c1963e2f33347a97fb4e9dae189674abb3dd5b3b99
-  data.tar.gz: 25193d26af70d445a683c82f7a2ea4151f1bd879e2ac35cf55d053dc761ddbac
+  metadata.gz: eb1b6edd3b3d295491ad39866fa4a7d480f9322bd60a6a05e2d9a8e7eb3c9462
+  data.tar.gz: 3b6397f0af03444908c3b87cc6dfbc173b38f0e5ae54bc5528c6588ea3e4655a
 SHA512:
-  metadata.gz: 1cbc7939f48ba24aedc80ce89dd0251ec5573197b2f5e6fe7a859b0192bed3e7009dca46287ebbd39f198d2fb5af4c453d4e84cd425b57175f532260386a9994
-  data.tar.gz: b46f5e9c0dbe616b337bd03d3621ec4a004a7f6e8ff323fa32595af884906908249f126ad1de23467c8a5b936256a5a3c30146113ecccb404b118c1e9383de17
+  metadata.gz: 295996b49310faa8aa04502f057963a0a3e21289a800be24780fcdc38c4533d0496e88a4b9a0b6722d526e707ee51cadb30a91916a882db4fb95aa8f8f2d9ebd
+  data.tar.gz: 71b07d3ed46fe06aeecce18cf2dc42da67143be4953e9b45e051cad4e57f84332fda400b071139695847a1e7eaf8ee4c4fc6da50a03dfc9d00a81979e0ffc10c

data/helpers/requirements.txt

@@ -1,10 +1,9 @@
-pip>=21.3.1,<23.2.0  # Range maintains py36 support TODO: Review python 3.6 support in April 2023 (eol ubuntu 18.04)
-pip-tools>=6.4.0,<=6.13.0  # Range maintains py36 support TODO: Review python 3.6 support in April 2023 (eol ubuntu 18.04)
+pip==23.2.0
+pip-tools==7.2.0
 hashin==0.17.0
 pipenv==2022.4.8
 pipfile==0.0.2
-poetry>=1.1.15,<1.6.0
-wheel==0.37.1
+poetry==1.5.1
 
 # Some dependencies will only install if Cython is present
-Cython==0.29.34
+Cython==3.0.0

data/lib/dependabot/python/file_fetcher.rb

@@ -91,7 +91,7 @@ module Dependabot
       end
 
       def pyproject_files
-        [pyproject, pyproject_lock, poetry_lock, pdm_lock].compact
+        [pyproject, poetry_lock, pdm_lock].compact
       end
 
       def requirement_files
@@ -116,21 +116,27 @@ module Dependabot
       end
 
       def setup_file
-        @setup_file ||= fetch_file_if_present("setup.py")
+        return @setup_file if defined?(@setup_file)
+
+        @setup_file = fetch_file_if_present("setup.py")
       end
 
       def setup_cfg_file
-        @setup_cfg_file ||= fetch_file_if_present("setup.cfg")
+        return @setup_cfg_file if defined?(@setup_cfg_file)
+
+        @setup_cfg_file = fetch_file_if_present("setup.cfg")
       end
 
       def pip_conf
-        @pip_conf ||= fetch_file_if_present("pip.conf")&.
-                      tap { |f| f.support_file = true }
+        return @pip_conf if defined?(@pip_conf)
+
+        @pip_conf = fetch_support_file("pip.conf")
       end
 
       def python_version_file
-        @python_version_file ||= fetch_file_if_present(".python-version")&.
-                            tap { |f| f.support_file = true }
+        return @python_version_file if defined?(@python_version_file)
+
+        @python_version_file = fetch_support_file(".python-version")
 
         return @python_version_file if @python_version_file
         return if [".", "/"].include?(directory)
@@ -138,33 +144,38 @@ module Dependabot
         # Check the top-level for a .python-version file, too
         reverse_path = Pathname.new(directory[0]).relative_path_from(directory)
         @python_version_file ||=
-          fetch_file_if_present(File.join(reverse_path, ".python-version"))&.
-          tap { |f| f.support_file = true }&.
+          fetch_support_file(File.join(reverse_path, ".python-version"))&.
           tap { |f| f.name = ".python-version" }
       end
 
       def pipfile
-        @pipfile ||= fetch_file_if_present("Pipfile")
+        return @pipfile if defined?(@pipfile)
+
+        @pipfile = fetch_file_if_present("Pipfile")
       end
 
       def pipfile_lock
-        @pipfile_lock ||= fetch_file_if_present("Pipfile.lock")
+        return @pipfile_lock if defined?(@pipfile_lock)
+
+        @pipfile_lock = fetch_file_if_present("Pipfile.lock")
       end
 
       def pyproject
-        @pyproject ||= fetch_file_if_present("pyproject.toml")
-      end
+        return @pyproject if defined?(@pyproject)
 
-      def pyproject_lock
-        @pyproject_lock ||= fetch_file_if_present("pyproject.lock")
+        @pyproject = fetch_file_if_present("pyproject.toml")
       end
 
       def poetry_lock
-        @poetry_lock ||= fetch_file_if_present("poetry.lock")
+        return @poetry_lock if defined?(@poetry_lock)
+
+        @poetry_lock = fetch_file_if_present("poetry.lock")
       end
 
       def pdm_lock
-        @pdm_lock ||= fetch_file_if_present("pdm.lock")
+        return @pdm_lock if defined?(@pdm_lock)
+
+        @pdm_lock = fetch_file_if_present("pdm.lock")
       end
 
       def requirements_txt_files

data/lib/dependabot/python/file_parser/pyproject_files_parser.rb

@@ -194,12 +194,6 @@ module Dependabot
           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 @@ module Dependabot
         end
 
         def lockfile
-          poetry_lock || pyproject_lock
+          poetry_lock
         end
 
         def parsed_pep621_dependencies
@@ -235,12 +229,6 @@ module Dependabot
 
         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

data/lib/dependabot/python/file_parser/subdependency_type_parser.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "toml-rb"
+require "dependabot/python/file_parser"
+require "dependabot/python/name_normaliser"
+
+module Dependabot
+  module Python
+    class FileParser
+      class PoetrySubdependencyTypeParser
+        def initialize(lockfile:)
+          @lockfile = lockfile
+        end
+
+        def subdep_type(dep)
+          category =
+            TomlRB.parse(lockfile.content).fetch("package", []).
+            find { |dets| normalise(dets.fetch("name")) == dep.name }.
+            fetch("category")
+
+          category == "dev" ? "dev-dependencies" : "dependencies"
+        end
+
+        private
+
+        attr_reader :lockfile
+
+        def normalise(name)
+          NameNormaliser.normalise(name)
+        end
+      end
+    end
+  end
+end

data/lib/dependabot/python/file_parser.rb

@@ -208,10 +208,6 @@ module Dependabot
         @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

data/lib/dependabot/python/file_updater/pip_compile_file_updater.rb

@@ -9,7 +9,6 @@ require "dependabot/python/file_updater"
 require "dependabot/shared_helpers"
 require "dependabot/python/language_version_manager"
 require "dependabot/python/native_helpers"
-require "dependabot/python/python_versions"
 require "dependabot/python/name_normaliser"
 require "dependabot/python/authed_url_builder"
 
@@ -37,9 +36,6 @@ module Dependabot
         end
 
         def updated_dependency_files
-          return @updated_dependency_files if @update_already_attempted
-
-          @update_already_attempted = true
           @updated_dependency_files ||= fetch_updated_dependency_files
         end
 

data/lib/dependabot/python/file_updater/pipfile_file_updater.rb

@@ -30,9 +30,6 @@ module Dependabot
         end
 
         def updated_dependency_files
-          return @updated_dependency_files if @update_already_attempted
-
-          @update_already_attempted = true
           @updated_dependency_files ||= fetch_updated_dependency_files
         end
 
@@ -92,7 +89,7 @@ module Dependabot
 
           # Find any requirement files that list the same dependencies as
           # the (old) Pipfile.lock. Any such files were almost certainly
-          # generated using `pipenv lock -r`
+          # generated using `pipenv requirements`
           requirements_files.select do |req_file|
             deps = []
             req_file.content.scan(regex) { deps << Regexp.last_match }
@@ -237,12 +234,12 @@ module Dependabot
 
         def generate_updated_requirements_files
           req_content = run_pipenv_command(
-            "pyenv exec pipenv lock -r"
+            "pyenv exec pipenv requirements"
           )
           File.write("req.txt", req_content)
 
           dev_req_content = run_pipenv_command(
-            "pyenv exec pipenv lock -r -d"
+            "pyenv exec pipenv requirements --dev"
           )
           File.write("dev-req.txt", dev_req_content)
         end

data/lib/dependabot/python/file_updater/pipfile_preparer.rb

@@ -109,9 +109,7 @@ module Dependabot
         end
 
         def pipfile_sources
-          @pipfile_sources ||=
-            TomlRB.parse(pipfile_content).fetch("source", []).
-            map { |h| h.dup.merge("url" => h["url"].gsub(%r{/*$}, "") + "/") }
+          @pipfile_sources ||= TomlRB.parse(pipfile_content).fetch("source", [])
         end
 
         def sub_auth_url(source, credentials)
@@ -132,9 +130,12 @@ module Dependabot
 
         def config_variable_sources(credentials)
           @config_variable_sources ||=
-            credentials.
-            select { |cred| cred["type"] == "python_index" }.
-            map { |c| { "url" => AuthedUrlBuilder.authed_url(credential: c) } }
+            credentials.select { |cred| cred["type"] == "python_index" }.map.with_index do |c, i|
+              {
+                "name" => "dependabot-inserted-index-#{i}",
+                "url" => AuthedUrlBuilder.authed_url(credential: c)
+              }
+            end
         end
       end
     end

data/lib/dependabot/python/file_updater/poetry_file_updater.rb

@@ -7,8 +7,8 @@ require "dependabot/shared_helpers"
 require "dependabot/python/language_version_manager"
 require "dependabot/python/version"
 require "dependabot/python/requirement"
-require "dependabot/python/python_versions"
 require "dependabot/python/file_parser/python_requirement_parser"
+require "dependabot/python/file_parser/subdependency_type_parser"
 require "dependabot/python/file_updater"
 require "dependabot/python/native_helpers"
 require "dependabot/python/name_normaliser"
@@ -28,9 +28,6 @@ module Dependabot
         end
 
         def updated_dependency_files
-          return @updated_dependency_files if @update_already_attempted
-
-          @update_already_attempted = true
           @updated_dependency_files ||= fetch_updated_dependency_files
         end
 
@@ -160,17 +157,10 @@ module Dependabot
         end
 
         def create_declaration_at_new_version!(poetry_object, dep)
-          poetry_object[subdep_type] ||= {}
-          poetry_object[subdep_type][dependency.name] = dep.version
-        end
+          subdep_type = subdependency_type_parser.subdep_type(dep)
 
-        def subdep_type
-          category =
-            TomlRB.parse(lockfile.content).fetch("package", []).
-            find { |dets| normalise(dets.fetch("name")) == dependency.name }.
-            fetch("category")
-
-          category == "dev" ? "dev-dependencies" : "dependencies"
+          poetry_object[subdep_type] ||= {}
+          poetry_object[subdep_type][dep.name] = dep.version
         end
 
         def sanitize(pyproject_content)
@@ -188,15 +178,11 @@ module Dependabot
               language_version_manager.install_required_python
 
               # use system git instead of the pure Python dulwich
-              unless language_version_manager.python_version&.start_with?("3.6")
-                run_poetry_command("pyenv exec poetry config experimental.system-git-client true")
-              end
+              run_poetry_command("pyenv exec poetry config experimental.system-git-client true")
 
               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
@@ -305,6 +291,13 @@ module Dependabot
             )
         end
 
+        def subdependency_type_parser
+          @subdependency_type_parser ||=
+            FileParser::PoetrySubdependencyTypeParser.new(
+              lockfile: lockfile
+            )
+        end
+
         def language_version_manager
           @language_version_manager ||=
             LanguageVersionManager.new(
@@ -318,17 +311,13 @@ module Dependabot
         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

data/lib/dependabot/python/file_updater/requirement_file_updater.rb

@@ -20,9 +20,6 @@ module Dependabot
         end
 
         def updated_dependency_files
-          return @updated_dependency_files if @update_already_attempted
-
-          @update_already_attempted = true
           @updated_dependency_files ||= fetch_updated_dependency_files
         end
 

data/lib/dependabot/python/file_updater.rb

@@ -77,7 +77,7 @@ module Dependabot
 
       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 @@ module Dependabot
         @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

data/lib/dependabot/python/language_version_manager.rb

@@ -6,6 +6,14 @@ require "dependabot/python/version"
 module Dependabot
   module Python
     class LanguageVersionManager
+      # This list must match the versions specified at the top of `python/Dockerfile`
+      PRE_INSTALLED_PYTHON_VERSIONS = %w(
+        3.11.4
+        3.10.12
+        3.9.17
+        3.8.17
+      ).freeze
+
       def initialize(python_requirement_parser:)
         @python_requirement_parser = python_requirement_parser
       end
@@ -14,27 +22,13 @@ module Dependabot
         # The leading space is important in the version check
         return if SharedHelpers.run_shell_command("pyenv versions").include?(" #{python_major_minor}.")
 
-        if File.exist?("/usr/local/.pyenv/#{python_major_minor}.tar.gz")
-          SharedHelpers.run_shell_command(
-            "tar xzf /usr/local/.pyenv/#{python_major_minor}.tar.gz -C /usr/local/.pyenv/"
-          )
-          return if SharedHelpers.run_shell_command("pyenv versions").
-                    include?(" #{python_major_minor}.")
-        end
-
-        Dependabot.logger.info("Installing required Python #{python_version}.")
-        start = Time.now
-        SharedHelpers.run_shell_command("pyenv install -s #{python_version}")
-        SharedHelpers.run_shell_command("pyenv exec pip install --upgrade pip")
-        SharedHelpers.run_shell_command("pyenv exec pip install -r" \
-                                        "#{NativeHelpers.python_requirements_path}")
-        time_taken = Time.now - start
-        Dependabot.logger.info("Installing Python #{python_version} took #{time_taken}s.")
+        SharedHelpers.run_shell_command(
+          "tar xzf /usr/local/.pyenv/#{python_major_minor}.tar.gz -C /usr/local/.pyenv/"
+        )
       end
 
       def python_major_minor
-        @python ||= Python::Version.new(python_version)
-        "#{@python.segments[0]}.#{@python.segments[1]}"
+        @python_major_minor ||= Python::Version.new(python_version).segments[0..1].join(".")
       end
 
       def python_version
@@ -59,32 +53,19 @@ module Dependabot
       def python_version_from_supported_versions
         requirement_string = python_requirement_string
 
-        # Ideally, the requirement is satisfied by a Python version we support
-        requirement =
-          Python::Requirement.requirements_array(requirement_string).first
-        version =
-          PythonVersions::SUPPORTED_VERSIONS_TO_ITERATE.
-          find { |v| requirement.satisfied_by?(Python::Version.new(v)) }
-        return version if version
+        # If the requirement string isn't already a range (eg ">3.10"), coerce it to "major.minor.*".
+        # The patch version is ignored because a non-matching patch version is unlikely to affect resolution.
+        requirement_string = requirement_string.gsub(/\.\d+$/, ".*") if requirement_string.start_with?(/\d/)
 
-        # If not, and we're dealing with a simple version string
-        # and changing the patch version would fix things, we do that
-        # as the patch version is unlikely to affect resolution
-        if requirement_string.start_with?(/\d/)
-          requirement =
-            Python::Requirement.new(requirement_string.gsub(/\.\d+$/, ".*"))
-          version =
-            PythonVersions::SUPPORTED_VERSIONS_TO_ITERATE.
-            find { |v| requirement.satisfied_by?(Python::Version.new(v)) }
-          return version if version
-        end
+        # Try to match one of our pre-installed Python versions
+        requirement = Python::Requirement.requirements_array(requirement_string).first
+        version = PRE_INSTALLED_PYTHON_VERSIONS.find { |v| requirement.satisfied_by?(Python::Version.new(v)) }
+        return version if version
 
-        # Otherwise we have to raise, giving details of the Python versions
-        # that Dependabot supports
-        msg = "Dependabot detected the following Python requirement " \
-              "for your project: '#{requirement_string}'.\n\nCurrently, the " \
-              "following Python versions are supported in Dependabot: " \
-              "#{PythonVersions::SUPPORTED_VERSIONS.join(', ')}."
+        # Otherwise we have to raise
+        msg = "Dependabot detected the following Python requirement for your project: '#{python_requirement_string}'." \
+              "\n\nCurrently, the following Python versions are supported in Dependabot: " \
+              "#{PRE_INSTALLED_PYTHON_VERSIONS.map { |x| x.gsub(/\.\d+$/, '.*') }.join(', ')}."
         raise DependencyFileNotResolvable, msg
       end
 
@@ -101,7 +82,7 @@ module Dependabot
       end
 
       def python_version_matching(requirements)
-        PythonVersions::SUPPORTED_VERSIONS_TO_ITERATE.find do |version_string|
+        PRE_INSTALLED_PYTHON_VERSIONS.find do |version_string|
           version = Python::Version.new(version_string)
           requirements.all? do |req|
             next req.any? { |r| r.satisfied_by?(version) } if req.is_a?(Array)

data/lib/dependabot/python/metadata_finder.rb

@@ -27,7 +27,6 @@ module Dependabot
         potential_source_urls = [
           pypi_listing.dig("info", "project_urls", "Source"),
           pypi_listing.dig("info", "home_page"),
-          pypi_listing.dig("info", "bugtrack_url"),
           pypi_listing.dig("info", "download_url"),
           pypi_listing.dig("info", "docs_url")
         ].compact

data/lib/dependabot/python/update_checker/pip_compile_version_resolver.rb

@@ -13,7 +13,6 @@ require "dependabot/python/version"
 require "dependabot/shared_helpers"
 require "dependabot/python/language_version_manager"
 require "dependabot/python/native_helpers"
-require "dependabot/python/python_versions"
 require "dependabot/python/name_normaliser"
 require "dependabot/python/authed_url_builder"
 
@@ -23,7 +22,6 @@ module Dependabot
       # This class does version resolution for pip-compile. Its approach is:
       # - Unlock the dependency we're checking in the requirements.in file
       # - Run `pip-compile` and see what the result is
-      # rubocop:disable Metrics/ClassLength
       class PipCompileVersionResolver
         GIT_DEPENDENCY_UNREACHABLE_REGEX = /git clone --filter=blob:none --quiet (?<url>[^\s]+).* /
         GIT_REFERENCE_NOT_FOUND_REGEX = /Did not find branch or tag '(?<tag>[^\n"]+)'/m
@@ -236,10 +234,6 @@ module Dependabot
           )
         end
 
-        def new_resolver_supported?
-          language_version_manager.python_version >= Python::Version.new("3.7")
-        end
-
         def pip_compile_options_fingerprint(options)
           options.sub(
             /--output-file=\S+/, "--output-file=<output_file>"
@@ -253,8 +247,9 @@ module Dependabot
         def pip_compile_options(filename)
           options = @build_isolation ? ["--build-isolation"] : ["--no-build-isolation"]
           options += pip_compile_index_options
+          # TODO: Stop explicitly specifying `allow-unsafe` once it becomes the default:
+          # https://github.com/jazzband/pip-tools/issues/989#issuecomment-1661254701
           options += ["--allow-unsafe"]
-          options += ["--resolver backtracking"] if new_resolver_supported?
 
           if (requirements_file = compiled_file_for_filename(filename))
             options << "--output-file=#{requirements_file.name}"
@@ -301,17 +296,6 @@ module Dependabot
           env
         end
 
-        def error_certainly_bad_python_version?(message)
-          return true if message.include?("UnsupportedPythonVersion")
-
-          unless message.include?('"python setup.py egg_info" failed') ||
-                 message.include?("exit status 1: python setup.py egg_info")
-            return false
-          end
-
-          message.include?("SyntaxError")
-        end
-
         def write_temporary_dependency_files(updated_req: nil,
                                              update_requirement: true)
           dependency_files.each do |file|
@@ -513,7 +497,6 @@ module Dependabot
           dependency_files.select { |f| f.name.end_with?("setup.cfg") }
         end
       end
-      # rubocop:enable Metrics/ClassLength
     end
   end
 end

data/lib/dependabot/python/update_checker/pipenv_version_resolver.rb

@@ -11,7 +11,6 @@ require "dependabot/python/file_parser/python_requirement_parser"
 require "dependabot/python/file_updater/pipfile_preparer"
 require "dependabot/python/file_updater/setup_file_sanitizer"
 require "dependabot/python/update_checker"
-require "dependabot/python/python_versions"
 require "dependabot/python/native_helpers"
 require "dependabot/python/name_normaliser"
 require "dependabot/python/version"

data/lib/dependabot/python/update_checker/poetry_version_resolver.rb

@@ -9,12 +9,12 @@ require "dependabot/errors"
 require "dependabot/shared_helpers"
 require "dependabot/python/file_parser"
 require "dependabot/python/file_parser/python_requirement_parser"
+require "dependabot/python/file_parser/subdependency_type_parser"
 require "dependabot/python/file_updater/pyproject_preparer"
 require "dependabot/python/update_checker"
 require "dependabot/python/version"
 require "dependabot/python/requirement"
 require "dependabot/python/native_helpers"
-require "dependabot/python/python_versions"
 require "dependabot/python/authed_url_builder"
 require "dependabot/python/name_normaliser"
 
@@ -24,30 +24,19 @@ module Dependabot
       # This class does version resolution for pyproject.toml files.
       class PoetryVersionResolver
         GIT_REFERENCE_NOT_FOUND_REGEX = /
-          (?:'git'.*pypoetry-git-(?<name>.+?).{8}',
-          'checkout',
-          '(?<tag>.+?)'
-          |
-          Failed to checkout
+          (Failed to checkout
           (?<tag>.+?)
           (?<url>.+?).git at '(?<tag>.+?)'
           |
           ...Failedtoclone
           (?<url>.+?).gitat'(?<tag>.+?)',
           verifyrefexistsonremote)
-        /x # TODO: remove the first clause and | when py3.6 support is EoL
+        /x
         GIT_DEPENDENCY_UNREACHABLE_REGEX = /
-          (?:'\['git',
-          \s+'clone',
-          \s+'--recurse-submodules',
-          \s+'(--)?',
-          \s+'(?<url>.+?)'.*
-          \s+exit\s+status\s+128
-          |
           \s+Failed\sto\sclone
           \s+(?<url>.+?),
-          \s+check\syour\sgit\sconfiguration)
-        /mx # TODO: remove the first clause and | when py3.6 support is EoL
+          \s+check\syour\sgit\sconfiguration
+        /mx
 
         attr_reader :dependency, :dependency_files, :credentials
 
@@ -74,8 +63,7 @@ module Dependabot
                                    false
                                  end
         rescue SharedHelpers::HelperSubprocessFailed => e
-          raise unless e.message.include?("SolverProblemError") || # TODO: Remove once py3.6 is EoL
-                       e.message.include?("version solving failed.")
+          raise unless e.message.include?("version solving failed.")
 
           @resolvable[version] = false
         end
@@ -95,18 +83,12 @@ module Dependabot
                 language_version_manager.install_required_python
 
                 # use system git instead of the pure Python dulwich
-                unless language_version_manager.python_version&.start_with?("3.6")
-                  run_poetry_command("pyenv exec poetry config experimental.system-git-client true")
-                end
+                run_poetry_command("pyenv exec poetry config experimental.system-git-client true")
 
                 # 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)
@@ -147,7 +129,7 @@ module Dependabot
           end
 
           raise unless error.message.include?("SolverProblemError") ||
-                       error.message.include?("PackageNotFound") ||
+                       error.message.include?("not found") ||
                        error.message.include?("version solving failed.")
 
           check_original_requirements_resolvable
@@ -182,7 +164,7 @@ module Dependabot
               @original_reqs_resolvable = true
             rescue SharedHelpers::HelperSubprocessFailed => e
               raise unless e.message.include?("SolverProblemError") ||
-                           e.message.include?("PackageNotFound") ||
+                           e.message.include?("not found") ||
                            e.message.include?("version solving failed.")
 
               msg = clean_error_message(e.message)
@@ -278,6 +260,8 @@ module Dependabot
 
           # If this is a sub-dependency, add the new requirement
           unless dependency.requirements.find { |r| r[:file] == pyproject.name }
+            subdep_type = subdependency_type_parser.subdep_type(dependency)
+
             poetry_object[subdep_type] ||= {}
             poetry_object[subdep_type][dependency.name] = updated_requirement
           end
@@ -297,15 +281,6 @@ module Dependabot
           end
         end
 
-        def subdep_type
-          category =
-            TomlRB.parse(lockfile.content).fetch("package", []).
-            find { |dets| normalise(dets.fetch("name")) == dependency.name }.
-            fetch("category")
-
-          category == "dev" ? "dev-dependencies" : "dependencies"
-        end
-
         def python_requirement_parser
           @python_requirement_parser ||=
             FileParser::PythonRequirementParser.new(
@@ -313,6 +288,13 @@ module Dependabot
             )
         end
 
+        def subdependency_type_parser
+          @subdependency_type_parser ||=
+            FileParser::PoetrySubdependencyTypeParser.new(
+              lockfile: lockfile
+            )
+        end
+
         def language_version_manager
           @language_version_manager ||=
             LanguageVersionManager.new(
@@ -324,16 +306,12 @@ module Dependabot
           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)

data/lib/dependabot/python/update_checker.rb

@@ -74,7 +74,7 @@ module Dependabot
           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 @@ module Dependabot
 
       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 @@ module Dependabot
         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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.225.0
+  version: 0.227.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.225.0
+        version: 0.227.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.225.0
+        version: 0.227.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.1
+        version: 1.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.1
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: stackprof
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,7 @@ files:
 - lib/dependabot/python/file_parser/pyproject_files_parser.rb
 - lib/dependabot/python/file_parser/python_requirement_parser.rb
 - lib/dependabot/python/file_parser/setup_file_parser.rb
+- lib/dependabot/python/file_parser/subdependency_type_parser.rb
 - lib/dependabot/python/file_updater.rb
 - lib/dependabot/python/file_updater/pip_compile_file_updater.rb
 - lib/dependabot/python/file_updater/pipfile_file_updater.rb
@@ -214,7 +215,6 @@ files:
 - lib/dependabot/python/metadata_finder.rb
 - lib/dependabot/python/name_normaliser.rb
 - lib/dependabot/python/native_helpers.rb
-- lib/dependabot/python/python_versions.rb
 - lib/dependabot/python/requirement.rb
 - lib/dependabot/python/requirement_parser.rb
 - lib/dependabot/python/update_checker.rb
@@ -231,7 +231,7 @@ licenses:
 - Nonstandard
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.225.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.227.0
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/dependabot/python/python_versions.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Dependabot
-  module Python
-    module PythonVersions
-      PRE_INSTALLED_PYTHON_VERSIONS = %w(
-        3.11.4
-      ).freeze
-
-      # Due to an OpenSSL issue we can only install the following versions in
-      # the Dependabot container.
-      # NOTE: When adding one version, always doublecheck for additional releases: https://www.python.org/downloads/
-      #
-      # WARNING: 3.9.3 is purposefully omitted as it was recalled: https://www.python.org/downloads/release/python-393/
-      SUPPORTED_VERSIONS = %w(
-        3.11.4 3.11.3 3.11.2 3.11.1 3.11.0
-        3.10.12 3.10.11 3.10.10 3.10.9 3.10.8 3.10.7 3.10.6 3.10.5 3.10.4 3.10.3 3.10.2 3.10.1 3.10.0
-        3.9.17 3.9.16 3.9.15 3.9.14 3.9.13 3.9.12 3.9.11 3.9.10 3.9.9 3.9.8 3.9.7 3.9.6 3.9.5 3.9.4 3.9.2 3.9.1 3.9.0
-        3.8.17 3.8.15 3.8.14 3.8.13 3.8.12 3.8.11 3.8.10 3.8.9 3.8.8 3.8.7 3.8.6 3.8.5 3.8.4 3.8.3 3.8.2 3.8.1 3.8.0
-        3.7.17 3.7.15 3.7.14 3.7.13 3.7.12 3.7.11 3.7.10 3.7.9 3.7.8 3.7.7 3.7.6 3.7.5 3.7.4 3.7.3 3.7.2 3.7.1 3.7.0
-        3.6.15 3.6.14 3.6.13 3.6.12 3.6.11 3.6.10 3.6.9 3.6.8 3.6.7 3.6.6 3.6.5 3.6.4 3.6.3 3.6.2 3.6.1 3.6.0
-        3.5.10 3.5.8 3.5.7 3.5.6 3.5.5 3.5.4 3.5.3
-      ).freeze
-
-      # This list gets iterated through to find a valid version, so we have
-      # the pre-installed versions listed first.
-      SUPPORTED_VERSIONS_TO_ITERATE =
-        [
-          *PRE_INSTALLED_PYTHON_VERSIONS,
-          *SUPPORTED_VERSIONS
-        ].freeze
-    end
-  end
-end