dependabot-uv 0.365.0 → 0.366.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6240bab6f9752f6e33cac15a9334ee0af6e9dc6b0ab055970dd45dec7ecec3ce
-  data.tar.gz: dbb9a819d19fc1aae22864f589b90384bf76e2401ec7c07bc1961cb2094c6c62
+  metadata.gz: 6a921263a8493134f2d7e6670d06844e9f4f232f2e5afc2c76908bab64df9101
+  data.tar.gz: 8fa028c9a8b1184935ed65002de04664dbdccc85249abee4e1e8477b59fac9ee
 SHA512:
-  metadata.gz: 33e3cb465420e534eb6137515ef2fa43a5fe2bbd370a99e39f24efe39bfdb81b0fc092ff8e26e2a94b6618fb5c0be99015d5a93f0c7225fc8db74885c0abfdbb
-  data.tar.gz: 1bc5d384e74eb79a58dc5a302ed8f004b36ffbb16adf2330aa50eacd7802cdbeebeeb5c2b0c00f2b9fe95ef262d4d39c3b82a4c57d214d4f8121e94ea9f5fda0
+  metadata.gz: d42c942af66f282f399afff0125dda633772d2283932b900f4ac2521fbcd018b78de4b3d0ef41c6cf829572ca3eab0d17c09da9394b91620fb6cea7352468f95
+  data.tar.gz: b5d1fd02a5c9bfbdfeac365d307482719514464de17e1519dede2283da2b3e3fd9179b54dcf216ca823a7de810fe60818cae398a93ca7d36ae22b75daab4d3c5

data/lib/dependabot/uv/dependency_grapher.rb

@@ -6,6 +6,7 @@ require "sorbet-runtime"
 require "dependabot/dependency_graphers"
 require "dependabot/dependency_graphers/base"
 require "dependabot/uv/file_parser"
+require "dependabot/uv/name_normaliser"
 require "toml-rb"
 
 module Dependabot
@@ -170,6 +171,13 @@ module Dependabot
         "pypi"
       end
 
+      # Strip extras (e.g. "[filecache]") from the dependency name for PURLs,
+      # since the PURL should reference the base package only.
+      sig { override.params(dependency: Dependabot::Dependency).returns(String) }
+      def purl_name_for(dependency)
+        NameNormaliser.normalise(dependency.name)
+      end
+
       sig { returns(T.nilable(Dependabot::DependencyFile)) }
       def pyproject_toml
         return @pyproject_toml if defined?(@pyproject_toml)

data/lib/dependabot/uv/file_updater/lock_file_error_handler.rb

@@ -64,6 +64,11 @@ module Dependabot
           /Failed to parse:?\s*`?(?<file>[^`\n]+\.toml)`?|TOML parse error/i,
           Regexp
         )
+        # uv prefixes errors with interpreter info that should be stripped
+        USING_CPYTHON_LINE_REGEX = T.let(
+          /\AUsing CPython \S+ interpreter at: [^\n]+\n?/,
+          Regexp
+        )
         PYPROJECT_SCHEMA_ERROR_REGEX = T.let(
           /missing field `project`|missing.*\[project\].*table|Field `project\.name` is required/i,
           Regexp
@@ -110,6 +115,7 @@ module Dependabot
           handle_python_version_errors(message)
           handle_resource_errors(message)
           handle_package_not_found_errors(message)
+          handle_uv_fallback_error(message)
 
           raise error
         end
@@ -293,6 +299,13 @@ module Dependabot
           raise Dependabot::DependencyFileNotResolvable, clean_error_message(message)
         end
 
+        sig { params(message: String).void }
+        def handle_uv_fallback_error(message)
+          return unless message.match?(USING_CPYTHON_LINE_REGEX)
+
+          raise Dependabot::DependencyFileNotResolvable, clean_error_message(message)
+        end
+
         sig { params(match: T.untyped).returns(T.nilable(String)) }
         def extract_match_string(match)
           return nil unless match
@@ -311,6 +324,7 @@ module Dependabot
         sig { params(message: String).returns(String) }
         def clean_error_message(message)
           message
+            .sub(USING_CPYTHON_LINE_REGEX, "")
             .gsub(/#{Regexp.escape(Utils::BUMP_TMP_DIR_PATH)}[^\s]*/o, "")
             .lines
             .reject { |line| line.strip.empty? }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-uv
 version: !ruby/object:Gem::Version
-  version: 0.365.0
+  version: 0.366.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.365.0
+        version: 0.366.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.365.0
+        version: 0.366.0
 - !ruby/object:Gem::Dependency
   name: dependabot-python
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.365.0
+        version: 0.366.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.365.0
+        version: 0.366.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -300,7 +300,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.365.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.366.0
 rdoc_options: []
 require_paths:
 - lib