dependabot-python 0.372.0 → 0.374.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b21301afde2e61b11b1f620c03eab9790e760917adcdcb132e1ad948fc7dd9f9
-  data.tar.gz: 4c91924b433ac4f54c2f4f1bfd649e1124864b789cc459e4ab0aca281c02b603
+  metadata.gz: 95da56a7f8bcaa1450ddc0a7944b96c1f92845ba2e332a05868118ec041b1a8f
+  data.tar.gz: 68aca7a7062f67514acdf3616ee543eb830727dffb3ea2001bbec07612d3d6ab
 SHA512:
-  metadata.gz: 062f52736ab67724e77e07d7e7f779a04ec97d6a14fcd3b5c6f54ec9447c16d65afaef51e6ae5be77dcfd89574b5c7f416e5d424b45297986e70f502adc54403
-  data.tar.gz: 586dea07cef16ec324974e7983dfbe42314e4782bfb388194bb524dc78ccb8a3448de97b52867e20be55b5304f674ce3eec26ec6f5e6be30632e4b3e1ffdff34
+  metadata.gz: 18740b4c76b1f1426d9e3d4039e41e6809869e37ccd68df3280588618200d2fdf7a31b9957b5f2c702285d45afe4ce1f227b1b4b52ce5ccdf0664735252bcca4
+  data.tar.gz: 2432fe5ce55b1749d2ad09b99875157a66f3a3d1797d2217772d545dd727192d5562b5deae11e70c3e6331753b60000dbb2aa46d2aad4ce6dfc0996e1f569c41

data/lib/dependabot/python/dependency_grapher/lockfile_generator.rb

@@ -28,7 +28,7 @@ module Dependabot
           @credentials = credentials
         end
 
-        sig { returns(T.nilable(Dependabot::DependencyFile)) }
+        sig { returns(Dependabot::DependencyFile) }
         def generate
           SharedHelpers.in_a_temporary_directory do
             SharedHelpers.with_git_configured(credentials: credentials) do
@@ -44,7 +44,7 @@ module Dependabot
           end
         rescue SharedHelpers::HelperSubprocessFailed => e
           handle_generation_error(e)
-          nil
+          raise
         end
 
         private
@@ -77,11 +77,11 @@ module Dependabot
           run_poetry_command("pyenv exec poetry lock --no-interaction")
         end
 
-        sig { returns(T.nilable(Dependabot::DependencyFile)) }
+        sig { returns(Dependabot::DependencyFile) }
         def read_generated_lockfile
           unless File.exist?(LOCKFILE_NAME)
-            Dependabot.logger.warn("#{LOCKFILE_NAME} was not generated")
-            return nil
+            Dependabot.logger.error("#{LOCKFILE_NAME} was not generated")
+            raise Dependabot::DependencyFileNotEvaluatable, "#{LOCKFILE_NAME} was not generated"
           end
 
           content = File.read(LOCKFILE_NAME)

data/lib/dependabot/python/dependency_grapher.rb

@@ -88,8 +88,6 @@ module Dependabot
         )
 
         ephemeral_lockfile = generator.generate
-        return unless ephemeral_lockfile
-
         inject_ephemeral_lockfile(ephemeral_lockfile)
         @ephemeral_lockfile_generated = T.let(true, T.nilable(T::Boolean))
 
@@ -97,6 +95,8 @@ module Dependabot
           "Successfully generated ephemeral #{ephemeral_lockfile.name} for dependency graphing"
         )
       rescue StandardError => e
+        errored_fetching_subdependencies!
+        @subdependency_error = e
         Dependabot.logger.warn(
           "Failed to generate ephemeral lockfile: #{e.message}. " \
           "Dependency versions may not be resolved."

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

@@ -198,12 +198,15 @@ module Dependabot
 
         sig { params(deps_hash: T::Hash[String, T.untyped], dep_name: String, details: T::Hash[String, T.untyped]).void }
         def freeze_git_dep!(deps_hash, dep_name, details)
+          existing_extras = deps_hash[dep_name].is_a?(Hash) ? deps_hash[dep_name]["extras"] : nil
+
           deps_hash[dep_name] = {
             "git" => details.dig("source", "url"),
             "rev" => details.dig("source", "reference")
           }
           subdirectory = details.dig("source", "subdirectory")
           deps_hash[dep_name]["subdirectory"] = subdirectory if subdirectory
+          deps_hash[dep_name]["extras"] = existing_extras if existing_extras
         end
 
         sig { params(pyproject_object: T::Hash[String, T.untyped], excluded_names: T::Array[String]).void }

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

@@ -64,7 +64,7 @@ module Dependabot
           requirements.map do |req|
             case req[:file]
             when /setup\.(?:py|cfg)$/ then updated_setup_requirement(req)
-            when "pyproject.toml" then updated_pyproject_requirement(req)
+            when ->(file) { file.end_with?("pyproject.toml") } then updated_pyproject_requirement(req)
             when "Pipfile" then updated_pipfile_requirement(req)
             when /\.txt$|\.in$/ then updated_requirement(req)
             else raise "Unexpected filename: #{req[:file]}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.372.0
+  version: 0.374.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.372.0
+        version: 0.374.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.372.0
+        version: 0.374.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -322,7 +322,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.372.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.374.0
 rdoc_options: []
 require_paths:
 - lib