dependabot-python 0.113.27 → 0.113.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88003eb9888610599fd8ca91af6e563a3cba580eae1c30f206612b955798c60a
-  data.tar.gz: 0f43f3e67692cfecd7b22d4ab8eaee870275e173b1966088b2556031bda74265
+  metadata.gz: 31f1b15224468c2b083b003dae0beff4898adb81e7fc2794d4c6ee4c98dfaa86
+  data.tar.gz: 140ae5c9b14cf137667d5520a5a10ed7da3ba3d4fab95c702faa0a8bf94953ac
 SHA512:
-  metadata.gz: '09c2048e951bbf33e11903544602b0f0f6329a3eb85383b41e718028ffa688c4a5259e5e3a2102a70842b228029cc0a5888e840947d25706ba26a42c1a63b769'
-  data.tar.gz: 9d205befe8f551fdc5b5b056a170b3263c78044426626da8cc081fd0e226dc4a7041ab6b54d930e75a76c4b8e8ae9c15665a1b0727bc2816dfb76b033f9304b2
+  metadata.gz: 669e60c59d0a8dcc536d084e71cc198c75d8266026f09fa8655d384833ec36fc0ba4bb63955290ae01d9a337d4acaac28f03f8e97671074d16541f24814d657a
+  data.tar.gz: 4dd4962d15839c0461205cb5cc135a3a5b66ce2f3f8ea5734ebd635221a554d436569ed35bb09ea014706b5774b014e5ef4c76b2a4fa7c6a20366dcf1402c82d

data/helpers/lib/parser.py

@@ -58,7 +58,8 @@ def parse_requirements(directory):
                     "version": version_from_install_req(install_req),
                     "markers": str(install_req.markers) or None,
                     "file": rel_path,
-                    "requirement": str(install_req.specifier) or None
+                    "requirement": str(install_req.specifier) or None,
+                    "extras": sorted(list(install_req.extras))
                 })
         except Exception as e:
             print(json.dumps({ "error": repr(e) }))
@@ -85,7 +86,8 @@ def parse_setup(directory):
                 "markers": str(install_req.markers) or None,
                 "file": "setup.py",
                 "requirement": str(install_req.specifier) or None,
-                "requirement_type": req_type
+                "requirement_type": req_type,
+                "extras": sorted(list(install_req.extras))
             })
 
         def setup(*args, **kwargs):

data/lib/dependabot/python/file_parser.rb

@@ -92,7 +92,7 @@ module Dependabot
 
           dependencies <<
             Dependency.new(
-              name: normalised_name(dep["name"]),
+              name: normalised_name(dep["name"], dep["extras"]),
               version: dep["version"]&.include?("*") ? nil : dep["version"],
               requirements: requirements,
               package_manager: "pip"
@@ -192,8 +192,8 @@ module Dependabot
           join
       end
 
-      def normalised_name(name)
-        NameNormaliser.normalise(name)
+      def normalised_name(name, extras = [])
+        NameNormaliser.normalise_including_extras(name, extras)
       end
 
       def check_required_files

data/lib/dependabot/python/file_parser/setup_file_parser.rb

@@ -37,7 +37,7 @@ module Dependabot
 
             dependencies <<
               Dependency.new(
-                name: normalised_name(dep["name"]),
+                name: normalised_name(dep["name"], dep["extras"]),
                 version: dep["version"]&.include?("*") ? nil : dep["version"],
                 requirements: [{
                   requirement: dep["requirement"],
@@ -164,8 +164,8 @@ module Dependabot
           0
         end
 
-        def normalised_name(name)
-          NameNormaliser.normalise(name)
+        def normalised_name(name, extras)
+          NameNormaliser.normalise_including_extras(name, extras)
         end
 
         def setup_file

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

@@ -14,7 +14,7 @@ module Dependabot
         def initialize(content:, dependency_name:, old_requirement:,
                        new_requirement:, new_hash_version: nil)
           @content          = content
-          @dependency_name  = dependency_name
+          @dependency_name  = normalise(dependency_name)
           @old_requirement  = old_requirement
           @new_requirement  = new_requirement
           @new_hash_version = new_hash_version

data/lib/dependabot/python/name_normaliser.rb

@@ -4,7 +4,15 @@ module Dependabot
   module Python
     module NameNormaliser
       def self.normalise(name)
-        name.downcase.gsub(/[-_.]+/, "-")
+        extras_regex = /\[.+\]/
+        name.downcase.gsub(/[-_.]+/, "-").gsub(extras_regex, "")
+      end
+
+      def self.normalise_including_extras(name, extras)
+        normalised_name = normalise(name)
+        return normalised_name if extras.empty?
+
+        normalised_name + "[" + extras.join(",") + "]"
       end
     end
   end

metadata

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