dependabot-python 0.226.0 → 0.228.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62fa8493503751dac8cc47e22819a502a292e5de2523c22a5dbd9edcb44e8051
-  data.tar.gz: 37ea1a41eb2064d2eb28149f86bc6e0c6aee4e9f6b40c64e044fa8b0d69ac8af
+  metadata.gz: 67fcdac9ca728ef251cf259a11a3d1efec3f037715f9587bc30896baf3abcad9
+  data.tar.gz: 00cf4ecfceeba160a6ccb95c84853f782df01f571ea17b320609205a6138e76e
 SHA512:
-  metadata.gz: '08074756f750b4cae957e60277544eac7c23ec2f958a78d44d8c258921fbba181d783c1a1cf0ca11813969ad1cf0446493367893a797493ab9febae8668ddf75'
-  data.tar.gz: 5416cb34a8d3a2aeaf66da9a8bbe90e44d00ff950ed1444c1558131af7863ba7fc1b7b8944c153647686a129539d01b62d9cc2e6b9796927c43f9e0011909a76
+  metadata.gz: e320bfeef5f545705df3daf17edf15cf9633b3ed2a6438bc1cd12ec3fc66d8abd1248d20898b0a8aca1d3aaa86f1b512f951179c4708706af36d64a93b0a5933
+  data.tar.gz: 9bc806e1d363784ed23ed71d694154e8d37f967bb1d559348852fffdde381889b2f235658b5dc424c9400589483d76c08b5f1f608eb15e43e59e70bc773a266a

data/helpers/requirements.txt

@@ -1,9 +1,10 @@
-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.14.0  # Range maintains py36 support TODO: Review python 3.6 support in April 2023 (eol ubuntu 18.04)
+pip==23.2.1
+pip-tools==7.3.0
+flake8==6.1.0
 hashin==0.17.0
 pipenv==2022.4.8
 pipfile==0.0.2
-poetry>=1.1.15,<1.6.0
+poetry==1.6.1
 
 # Some dependencies will only install if Cython is present
 Cython==3.0.0

data/lib/dependabot/python/file_fetcher.rb

@@ -4,8 +4,10 @@ require "toml-rb"
 
 require "dependabot/file_fetchers"
 require "dependabot/file_fetchers/base"
+require "dependabot/python/language_version_manager"
 require "dependabot/python/requirement_parser"
 require "dependabot/python/file_parser/pyproject_files_parser"
+require "dependabot/python/file_parser/python_requirement_parser"
 require "dependabot/errors"
 
 module Dependabot
@@ -91,7 +93,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
@@ -166,12 +168,6 @@ module Dependabot
         @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)
 

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

@@ -7,6 +7,7 @@ require "dependabot/file_parsers/base/dependency_set"
 require "dependabot/python/file_parser"
 require "dependabot/python/requirement"
 require "dependabot/errors"
+require "dependabot/python/helpers"
 require "dependabot/python/name_normaliser"
 
 module Dependabot
@@ -44,16 +45,20 @@ module Dependabot
         end
 
         def poetry_dependencies
+          @poetry_dependencies ||= parse_poetry_dependencies
+        end
+
+        def parse_poetry_dependencies
           dependencies = Dependabot::FileParsers::Base::DependencySet.new
 
           POETRY_DEPENDENCY_TYPES.each do |type|
             deps_hash = parsed_pyproject.dig("tool", "poetry", type) || {}
-            dependencies += parse_poetry_dependencies(type, deps_hash)
+            dependencies += parse_poetry_dependency_group(type, deps_hash)
           end
 
           groups = parsed_pyproject.dig("tool", "poetry", "group") || {}
           groups.each do |group, group_spec|
-            dependencies += parse_poetry_dependencies(group, group_spec["dependencies"])
+            dependencies += parse_poetry_dependency_group(group, group_spec["dependencies"])
           end
           dependencies
         end
@@ -92,7 +97,7 @@ module Dependabot
           dependencies
         end
 
-        def parse_poetry_dependencies(type, deps_hash)
+        def parse_poetry_dependency_group(type, deps_hash)
           dependencies = Dependabot::FileParsers::Base::DependencySet.new
 
           deps_hash.each do |name, req|
@@ -154,14 +159,16 @@ module Dependabot
           parsed_lockfile.fetch("package", []).each do |details|
             next if source_types.include?(details.dig("source", "type"))
 
+            name = normalise(details.fetch("name"))
+
             dependencies <<
               Dependency.new(
-                name: normalise(details.fetch("name")),
+                name: name,
                 version: details.fetch("version"),
                 requirements: [],
                 package_manager: "pip",
                 subdependency_metadata: [{
-                  production: details["category"] != "dev"
+                  production: production_dependency_names.include?(name)
                 }]
               )
           end
@@ -169,6 +176,32 @@ module Dependabot
           dependencies
         end
 
+        def production_dependency_names
+          @production_dependency_names ||= parse_production_dependency_names
+        end
+
+        def parse_production_dependency_names
+          SharedHelpers.in_a_temporary_directory do
+            File.write(pyproject.name, pyproject.content)
+            File.write(lockfile.name, lockfile.content)
+
+            begin
+              output = Helpers.run_poetry_command("pyenv exec poetry show --only main")
+
+              output.split("\n").map { |line| line.split.first }
+            rescue SharedHelpers::HelperSubprocessFailed
+              # Sometimes, we may be dealing with an old lockfile that our
+              # poetry version can't show dependency information for. Other
+              # commands we use like `poetry update` are more resilient and
+              # automatically heal the lockfile. So we rescue the error and make
+              # a best effort approach to this.
+              poetry_dependencies.dependencies.filter_map do |dep|
+                dep.name if dep.production?
+              end
+            end
+          end
+        end
+
         def version_from_lockfile(dep_name)
           return unless parsed_lockfile
 
@@ -194,12 +227,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 +239,7 @@ module Dependabot
         end
 
         def lockfile
-          poetry_lock || pyproject_lock
+          poetry_lock
         end
 
         def parsed_pep621_dependencies
@@ -234,13 +261,7 @@ module Dependabot
         end
 
         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" }
+          parsed_poetry_lock if poetry_lock
         end
 
         def poetry_lock

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"
 

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

@@ -7,9 +7,9 @@ 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_updater"
+require "dependabot/python/helpers"
 require "dependabot/python/native_helpers"
 require "dependabot/python/name_normaliser"
 
@@ -95,6 +95,12 @@ module Dependabot
             begin
               new_lockfile = updated_lockfile_content_for(prepared_pyproject)
 
+              original_locked_python = TomlRB.parse(lockfile.content)["metadata"]["python-versions"]
+
+              new_lockfile.gsub!(/\[metadata\]\n.*python-versions[^\n]+\n/m) do |match|
+                match.gsub(/(["']).*(['"])\n\Z/, '\1' + original_locked_python + '\1' + "\n")
+              end
+
               tmp_hash =
                 TomlRB.parse(new_lockfile)["metadata"]["content-hash"]
               correct_hash = pyproject_hash_for(updated_pyproject_content)
@@ -139,7 +145,7 @@ module Dependabot
         def update_python_requirement(pyproject_content)
           PyprojectPreparer.
             new(pyproject_content: pyproject_content).
-            update_python_requirement(language_version_manager.python_major_minor)
+            update_python_requirement(language_version_manager.python_version)
         end
 
         def lock_declaration_to_new_version!(poetry_object, dep)
@@ -157,17 +163,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
-
-        def subdep_type
-          category =
-            TomlRB.parse(lockfile.content).fetch("package", []).
-            find { |dets| normalise(dets.fetch("name")) == dependency.name }.
-            fetch("category")
+          subdep_type = dep.production? ? "dependencies" : "dev-dependencies"
 
-          category == "dev" ? "dev-dependencies" : "dependencies"
+          poetry_object[subdep_type] ||= {}
+          poetry_object[subdep_type][dep.name] = dep.version
         end
 
         def sanitize(pyproject_content)
@@ -185,15 +184,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
@@ -208,24 +203,7 @@ module Dependabot
         end
 
         def run_poetry_command(command, fingerprint: nil)
-          start = Time.now
-          command = SharedHelpers.escape_command(command)
-          stdout, process = Open3.capture2e(command)
-          time_taken = Time.now - start
-
-          # Raise an error with the output from the shell session if Pipenv
-          # returns a non-zero status
-          return if process.success?
-
-          raise SharedHelpers::HelperSubprocessFailed.new(
-            message: stdout,
-            error_context: {
-              command: command,
-              fingerprint: fingerprint,
-              time_taken: time_taken,
-              process_exit_value: process.to_s
-            }
-          )
+          Helpers.run_poetry_command(command, fingerprint: fingerprint)
         end
 
         def write_temporary_dependency_files(pyproject_content)
@@ -315,17 +293,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.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/helpers.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "time"
+require "open3"
+
+require "dependabot/errors"
+require "dependabot/shared_helpers"
+
+module Dependabot
+  module Python
+    module Helpers
+      def self.run_poetry_command(command, fingerprint: nil)
+        start = Time.now
+        command = SharedHelpers.escape_command(command)
+        stdout, stderr, process = Open3.capture3(command)
+        time_taken = Time.now - start
+
+        # Raise an error with the output from the shell session if Poetry
+        # returns a non-zero status
+        return stdout if process.success?
+
+        raise SharedHelpers::HelperSubprocessFailed.new(
+          message: stderr,
+          error_context: {
+            command: command,
+            fingerprint: fingerprint,
+            time_taken: time_taken,
+            process_exit_value: process.to_s
+          }
+        )
+      end
+    end
+  end
+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,22 +22,9 @@ 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
@@ -48,42 +43,27 @@ module Dependabot
           else
             user_specified_python_version
           end
-        elsif python_version_matching_imputed_requirements
-          python_version_matching_imputed_requirements
         else
-          PythonVersions::PRE_INSTALLED_PYTHON_VERSIONS.first
+          python_version_matching_imputed_requirements || PRE_INSTALLED_PYTHON_VERSIONS.first
         end
       end
 
       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
 
@@ -100,7 +80,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/update_checker/index_finder.rb

@@ -118,6 +118,9 @@ module Dependabot
             []
 
           sources.each do |source|
+            # If source is PyPI, skip it, and let it pick the default URI
+            next if source["name"].casecmp?("PyPI")
+
             if source["default"]
               urls[:main] = source["url"]
             else

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}"
@@ -502,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"
@@ -40,7 +39,7 @@ module Dependabot
 
         UNSUPPORTED_DEPS = %w(pyobjc).freeze
         UNSUPPORTED_DEP_REGEX =
-          /Could not find a version that satisfies the requirement.*(?:#{UNSUPPORTED_DEPS.join("|")})/
+          /Could not find a version that satisfies the requirement.*(?:#{UNSUPPORTED_DEPS.join('|')})/
         PIPENV_RANGE_WARNING = /Warning:\sPython\s[<>].* was not found/
         # rubocop:enable Layout/LineLength
 
@@ -208,15 +207,13 @@ module Dependabot
         # errors when failing to update
         def check_original_requirements_resolvable
           SharedHelpers.in_a_temporary_directory do
-            SharedHelpers.with_git_configured(credentials: credentials) do
-              write_temporary_dependency_files(update_pipfile: false)
+            write_temporary_dependency_files(update_pipfile: false)
 
-              run_pipenv_command("pyenv exec pipenv lock")
+            run_pipenv_command("pyenv exec pipenv lock")
 
-              true
-            rescue SharedHelpers::HelperSubprocessFailed => e
-              handle_pipenv_errors_resolving_original_reqs(e)
-            end
+            true
+          rescue SharedHelpers::HelperSubprocessFailed => e
+            handle_pipenv_errors_resolving_original_reqs(e)
           end
         end
 

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

@@ -13,8 +13,8 @@ require "dependabot/python/file_updater/pyproject_preparer"
 require "dependabot/python/update_checker"
 require "dependabot/python/version"
 require "dependabot/python/requirement"
+require "dependabot/python/helpers"
 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
@@ -174,20 +156,18 @@ module Dependabot
           return @original_reqs_resolvable if @original_reqs_resolvable
 
           SharedHelpers.in_a_temporary_directory do
-            SharedHelpers.with_git_configured(credentials: credentials) do
-              write_temporary_dependency_files(update_pyproject: false)
+            write_temporary_dependency_files(update_pyproject: false)
 
-              run_poetry_update_command
+            run_poetry_update_command
 
-              @original_reqs_resolvable = true
-            rescue SharedHelpers::HelperSubprocessFailed => e
-              raise unless e.message.include?("SolverProblemError") ||
-                           e.message.include?("PackageNotFound") ||
-                           e.message.include?("version solving failed.")
+            @original_reqs_resolvable = true
+          rescue SharedHelpers::HelperSubprocessFailed => e
+            raise unless e.message.include?("SolverProblemError") ||
+                         e.message.include?("not found") ||
+                         e.message.include?("version solving failed.")
 
-              msg = clean_error_message(e.message)
-              raise DependencyFileNotResolvable, msg
-            end
+            msg = clean_error_message(e.message)
+            raise DependencyFileNotResolvable, msg
           end
         end
 
@@ -249,7 +229,7 @@ module Dependabot
         def update_python_requirement(pyproject_content)
           Python::FileUpdater::PyprojectPreparer.
             new(pyproject_content: pyproject_content).
-            update_python_requirement(language_version_manager.python_major_minor)
+            update_python_requirement(language_version_manager.python_version)
         end
 
         def freeze_other_dependencies(pyproject_content)
@@ -298,12 +278,7 @@ module Dependabot
         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"
+          dependency.production? ? "dependencies" : "dev-dependencies"
         end
 
         def python_requirement_parser
@@ -324,37 +299,16 @@ 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)
-          start = Time.now
-          command = SharedHelpers.escape_command(command)
-          stdout, process = Open3.capture2e(command)
-          time_taken = Time.now - start
-
-          # Raise an error with the output from the shell session if poetry
-          # returns a non-zero status
-          return if process.success?
-
-          raise SharedHelpers::HelperSubprocessFailed.new(
-            message: stdout,
-            error_context: {
-              command: command,
-              fingerprint: fingerprint,
-              time_taken: time_taken,
-              process_exit_value: process.to_s
-            }
-          )
+          Helpers.run_poetry_command(command, fingerprint: fingerprint)
         end
 
         def normalise(name)

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!"
@@ -257,7 +257,7 @@ module Dependabot
       end
 
       def library?
-        return unless updating_pyproject?
+        return false unless updating_pyproject?
 
         # Hit PyPi and check whether there are details for a library with a
         # matching name and description
@@ -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.226.0
+  version: 0.228.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2023-08-25 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.226.0
+        version: 0.228.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.226.0
+        version: 0.228.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.50.0
+        version: 1.56.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.50.0
+        version: 1.56.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: stackprof
   requirement: !ruby/object:Gem::Requirement
@@ -210,11 +210,11 @@ files:
 - lib/dependabot/python/file_updater/requirement_file_updater.rb
 - lib/dependabot/python/file_updater/requirement_replacer.rb
 - lib/dependabot/python/file_updater/setup_file_sanitizer.rb
+- lib/dependabot/python/helpers.rb
 - lib/dependabot/python/language_version_manager.rb
 - 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.226.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.228.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