dependabot-python 0.91.4 → 0.91.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb67d611ca3732852116d6a1e72dee932d639aa549893d8626dc991bbd73c4d5
-  data.tar.gz: f1f970c75a447a58bdb69b9e94624f2dbeae38d9dc36727f4a26d418122f4eb0
+  metadata.gz: 292a4a8341c97357705a20e98ba03f8f9a53b5e9419fd444fc9725a811ef63d2
+  data.tar.gz: c45dc4123b2fed3f799659b38dcc8901fc2ae49f315900c28f21e5a4280ee77b
 SHA512:
-  metadata.gz: 20fd0665a928dc393e09de399ac286e00bce8bb1f4b80ea8d33c2f0167a918040e388bc25fe3cc7386181f3b4bf1cf9f4c34e958904f6b8ead479b616a9da5ed
-  data.tar.gz: ec426c47256542e9807bdac9adf50c198af0b20c5e2e4ac1de598512fec52c81f1d3e5fd745e7b137e39962522406f98d8b41ebbee10444c52ac847464847d88
+  metadata.gz: 85288aac3fd40dce151d06165ea9fc88766da4d27203af0ecaeec5df0cb92a9a4a0115f005f85a95631c83a74cd782e317214287a92a7969abd16cc0c45bb0f7
+  data.tar.gz: 169dccb747223412017616f5e879507b108b482f63e850eb373eb2c2384719cbd26137b82fdc3569f2fef09de63c007af0e0bdd9e3b2f3b84250ac6d2667f990

data/lib/dependabot/python/file_fetcher.rb

@@ -10,7 +10,7 @@ require "dependabot/errors"
 module Dependabot
   module Python
     class FileFetcher < Dependabot::FileFetchers::Base
-      CHILD_REQUIREMENT_REGEX = /^-r\s?(?<path>.*\.txt)/.freeze
+      CHILD_REQUIREMENT_REGEX = /^-r\s?(?<path>.*\.(?:txt|in))/.freeze
       CONSTRAINT_REGEX = /^-c\s?(?<path>\..*)/.freeze
 
       def self.required_files_in?(filenames)
@@ -51,7 +51,13 @@ module Dependabot
         fetched_files << python_version if python_version
 
         check_required_files_present
-        fetched_files.uniq
+        uniq_files(fetched_files)
+      end
+
+      def uniq_files(fetched_files)
+        uniq_files = fetched_files.reject(&:support_file?).uniq
+        uniq_files += fetched_files.
+                      reject { |f| uniq_files.map(&:name).include?(f.name) }
       end
 
       def pipenv_files
@@ -65,7 +71,7 @@ module Dependabot
       def requirement_files
         [
           *requirements_txt_files,
-          *child_requirement_files,
+          *child_requirement_txt_files,
           *constraints_files
         ]
       end
@@ -123,7 +129,8 @@ module Dependabot
       end
 
       def requirements_in_files
-        req_txt_and_in_files.select { |f| f.name.end_with?(".in") }
+        req_txt_and_in_files.select { |f| f.name.end_with?(".in") } +
+          child_requirement_in_files
       end
 
       def parsed_pipfile
@@ -165,11 +172,19 @@ module Dependabot
           select { |f| requirements_file?(f) }
       end
 
+      def child_requirement_txt_files
+        child_requirement_files.select { |f| f.name.end_with?(".txt") }
+      end
+
+      def child_requirement_in_files
+        child_requirement_files.select { |f| f.name.end_with?(".in") }
+      end
+
       def child_requirement_files
         @child_requirement_files ||=
           begin
-            fetched_files = requirements_txt_files.dup
-            requirements_txt_files.flat_map do |requirement_file|
+            fetched_files = req_txt_and_in_files.dup
+            req_txt_and_in_files.flat_map do |requirement_file|
               child_files = fetch_child_requirement_files(
                 file: requirement_file,
                 previously_fetched_files: fetched_files
@@ -203,7 +218,7 @@ module Dependabot
 
       def constraints_files
         all_requirement_files = requirements_txt_files +
-                                child_requirement_files
+                                child_requirement_txt_files
 
         constraints_paths = all_requirement_files.map do |req_file|
           req_file.content.scan(CONSTRAINT_REGEX).flatten
@@ -264,7 +279,7 @@ module Dependabot
       end
 
       def requirement_txt_path_setup_file_paths
-        (requirements_txt_files + child_requirement_files).map do |req_file|
+        (requirements_txt_files + child_requirement_txt_files).map do |req_file|
           uneditable_reqs =
             req_file.content.
             scan(/^['"]?(?<path>\..*?)(?=\[|#|'|"|$)/).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.91.4
+  version: 0.91.5
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.91.4
+        version: 0.91.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.91.4
+        version: 0.91.5
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement