dependabot-python 0.98.40 → 0.98.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2149254c88cad4a314ed5079edc0f4404f277b805b96655bd84318f489d26c6
-  data.tar.gz: 8a6f319934bf0838fe1cf07118080f784c39e7e0895ed1a79144baef3b8775d7
+  metadata.gz: a117326ce7c8572e24c1d937ee3e3317731c3e67755bf3bdfab75d780ec5821d
+  data.tar.gz: 4aee70dd22b844a03ea1416b2e2ef3a17dad95b1810ff692321eb2c26524758a
 SHA512:
-  metadata.gz: 22949505d1565c1369b42f2b157631483171ee87f9b8a03459a04b1b98e9b4ebc299612b00010fcd94f6fba24f2b51419fa1b572edd7a2cdf0f5ef02748d3af1
-  data.tar.gz: 2e27c9d438ab873b0ec6541af22a5f94bf4368adcbc90beb42b82079c420b7a77df084b9345ffa0d3ed0b49a6f12d70de71c965efc912e127829aa5bf2170090
+  metadata.gz: 6beeb80824ae7e04998cbb807c52a4d453002c280b5dff46fe717353cef5f28334240d1b68928bffc37ff776cba2842f12a953449c131c9f50add2e0ba0172fa
+  data.tar.gz: fa22c6c85a1b7747af7416e64255b184d330ac1cba857f0986f96397ff701a23ceca92c71e96cb7d0eba1cc929d3de975db9e25dc6813476fcd9a455b6f3e6a9

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

@@ -212,14 +212,36 @@ module Dependabot
 
         def clean_check_and_remove_environment_variables(url)
           url = url.strip.gsub(%r{/*$}, "") + "/"
-          url = url.gsub(%r{#{ENVIRONMENT_VARIABLE_REGEX}/?}, "")
-          authed_base_url(url)
+
+          unless url.match?(ENVIRONMENT_VARIABLE_REGEX)
+            return authed_base_url(url)
+          end
+
+          config_variable_urls =
+            [
+              config_variable_index_urls[:main],
+              *config_variable_index_urls[:extra]
+            ].
+            compact.
+            map { |u| u.strip.gsub(%r{/*$}, "") + "/" }
+
+          regexp = url.split(ENVIRONMENT_VARIABLE_REGEX).
+                   map { |part| Regexp.quote(part) }.
+                   join(".+")
+          authed_url = config_variable_urls.find { |u| u.match?(regexp) }
+          return authed_url if authed_url
+
+          cleaned_url = url.gsub(%r{#{ENVIRONMENT_VARIABLE_REGEX}/?}, "")
+          authed_url = authed_base_url(cleaned_url)
+          return authed_url unless authed_url == cleaned_url
+
+          raise PrivateSourceAuthenticationFailure, url
         end
 
         def authed_base_url(base_url)
           cred = credentials.
-                  select { |c| c["type"] == "python_index" }.
-                  find { |c| c.fetch("index-url").include?(base_url) }
+                 select { |c| c["type"] == "python_index" }.
+                 find { |c| c.fetch("index-url").include?(base_url) }
           return base_url unless cred
 
           AuthedUrlBuilder.authed_url(credential: cred)

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

@@ -94,7 +94,8 @@ module Dependabot
         end
 
         def handle_poetry_errors(error)
-          raise unless error.message.include?("SolverProblemError")
+          raise unless error.message.include?("SolverProblemError") ||
+                       error.message.include?("PackageNotFound")
 
           check_original_requirements_resolvable
 
@@ -117,7 +118,8 @@ module Dependabot
 
             true
           rescue SharedHelpers::HelperSubprocessFailed => error
-            raise unless error.message.include?("SolverProblemError")
+            raise unless error.message.include?("SolverProblemError") ||
+                         error.message.include?("PackageNotFound")
 
             msg = clean_error_message(error.message)
             raise DependencyFileNotResolvable, msg

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.98.40
+  version: 0.98.41
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.98.40
+        version: 0.98.41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.98.40
+        version: 0.98.41
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement