dependabot-python 0.342.2 → 0.343.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae0bebe61296e86521c27bb8304ee607c5755ce8d88bf3ab33a736d0758c317
-  data.tar.gz: bf3670b60f32885a9483df12df0e2a6b67a02addc5aba6b3a866a5f311a06fc7
+  metadata.gz: ed116006ed210c905c065d4f156a167a4d04d48c4a07cd8b4e169f73f63f9cf0
+  data.tar.gz: 863edd17212898be028c2a3074e82b06f4fe0a2617db4ce0c19744e84af952ef
 SHA512:
-  metadata.gz: 6d38c1411fef97bbe9984889764f1109911f49c13dbf98114490d6ce573cd70f1592683bfe12f1fd14755e8c0f692228bde718f9d8cc25561270fe422d31eded
-  data.tar.gz: 38bd7e4f464a4fc2728c8eb1fcc20f56cf9b31ec8f27b633ee6bbb34b9048b3cd6e7ae98ab1d86e911961cb4cdcd600fd4587ca84507a4cfe36f5358da31b304
+  metadata.gz: 31406dda9f98e5d03e417006fcffd2a6fb60a5963e80a9e2f1665a03e2168ee3aa0545150b5439cda0f647e954a1cb675e12d8fae4bea399d5d98b69ad387db1
+  data.tar.gz: 2db7e183b64ad1c64e0b32b55478b37a46ae012a4b9a35cf4b0e849700492daffe4fb72a08e5c475a3c5262d2a3683da2d1292178c234343d351620bf1837b57

data/lib/dependabot/python/language.rb

@@ -16,6 +16,7 @@ module Dependabot
       # ARG PY_3_13=3.13.2
       # When updating this list, also update uv/lib/dependabot/uv/language.rb
       PRE_INSTALLED_PYTHON_VERSIONS_RAW = %w(
+        3.14.0
         3.13.5
         3.12.11
         3.11.13

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

@@ -415,6 +415,12 @@ module Dependabot
       # package version mentioned in .toml not found in package index
       PACKAGE_NOT_FOUND = /Package (?<pkg>.*) ((?<req_ver>.*)) not found./
 
+      INCOMPATIBLE_ENRICH_CONSTRAINTS = /
+        Cannot\senrich\sdependency\swith\sincompatible\sconstraints:\s+
+        (?<dep>[^\s(]+)\s*\((?<ver_range_a>[^)]+)\)\s+and\s+
+        (?<dep_b>[^\s(]+)\s*\((?<ver_range_b>[^)]+)\)
+      /x
+
       # client access error codes while accessing package index
       CLIENT_ERROR_CODES = T.let(
         {
@@ -502,7 +508,6 @@ module Dependabot
         if (msg = error.message.match(PoetryVersionResolver::INCOMPATIBLE_CONSTRAINTS) ||
             error.message.match(INVALID_CONFIGURATION) || error.message.match(INVALID_VERSION) ||
             error.message.match(INVALID_LINK))
-
           raise DependencyFileNotResolvable, msg
         end
 
@@ -510,11 +515,12 @@ module Dependabot
           raise DependencyFileNotResolvable, msg
         end
 
+        handle_enrich_constraints(error)
+
         raise DependencyFileNotResolvable, error.message if error.message.match(PYTHON_RANGE_NOT_SATISFIED)
 
         if error.message.match(POETRY_VIRTUAL_ENV_CONFIG) || error.message.match(ERR_LOCAL_PROJECT_PATH)
           msg = "Error while resolving pyproject.toml file"
-
           raise DependencyFileNotResolvable, msg
         end
 
@@ -548,6 +554,19 @@ module Dependabot
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/PerceivedComplexity
       # rubocop:enable Metrics/CyclomaticComplexity
+
+      private
+
+      sig { params(error: Exception).void }
+      def handle_enrich_constraints(error)
+        if (msg = error.message.match(INCOMPATIBLE_ENRICH_CONSTRAINTS))
+          dep   = msg[:dep]
+          ver_a = msg[:ver_range_a]
+          ver_b = msg[:ver_range_b]
+          raise DependencyFileNotResolvable,
+                "Incompatible version constraints for #{dep}: #{ver_a} vs #{ver_b}"
+        end
+      end
     end
   end
 end

metadata

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