dependabot-python 0.111.24 → 0.111.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4f5ea7c78f1dc2588f09b7c5a8e5d827cd807523275c09f7c3c6173992bef88
-  data.tar.gz: c638fa89b028992fe037f7d8726ed6d7d4133b21b48d7a8cba889f9d2c5c69fb
+  metadata.gz: d38ee5f205abe3d445efa70798b613ebc6fbdf984d1d7be097b15d69ca7e3bce
+  data.tar.gz: 5a6b7b801fc9f72b90b70b0d92324df3822874d98d8e87c15cb2ff1fc82c21b0
 SHA512:
-  metadata.gz: a515588d3a8069172e6c29c941ab63fe725fa1d7e16615c3b72600a9ea7a412ec9a483744ffe536a3bde80c63860f7119cf38679265096a89fd5c821c2d12c7a
-  data.tar.gz: f049f7d63332c356bd6c0b8f2f17f2dcf546757e3458d2a9a1a75689fb345a6e905ccd0e3b2710354381c809f4aa368e73d9ed3160c7be6f04ad48fda818c604
+  metadata.gz: 1d0489f5425c3d6deeddfbf254bf640d5b8fc0c175ef641adcd1644d837684e4970ba598ffa5b000b076e52ff187025322dd1b3f60ed392cd34113a5c8b896ee
+  data.tar.gz: 9a7109a141bdfb14f6e97ac06d004e11401832834cf08dc8e31509ede266bf7ca1082dcff46ecf6e009c646bd69359229135343cb34d4c8fdfdb7aa41f9de688

data/lib/dependabot/python.rb

@@ -25,3 +25,9 @@ Dependabot::Dependency.register_production_check(
     groups.include?("dependencies")
   end
 )
+
+# See https://www.python.org/dev/peps/pep-0503/#normalized-names
+Dependabot::Dependency.register_name_normaliser(
+  "pip",
+  ->(name) { name.downcase.gsub(/[-_.]+/, "-") }
+)

data/lib/dependabot/python/file_parser.rb

@@ -183,7 +183,7 @@ module Dependabot
 
       # See https://www.python.org/dev/peps/pep-0503/#normalized-names
       def normalised_name(name)
-        name.downcase.gsub(/[-_.]+/, "-")
+        Dependency.name_normaliser_for_package_manager("pip").call(name)
       end
 
       def check_required_files

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

@@ -133,9 +133,8 @@ module Dependabot
           %w(git path).any? { |k| req.key?(k) }
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalised_name(name)
-          name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
 
         def parsed_pipfile

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

@@ -97,9 +97,8 @@ module Dependabot
           raise Dependabot::DependencyFileNotEvaluatable, e.message
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalise(name)
-          name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
 
         def parsed_pyproject

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

@@ -163,9 +163,8 @@ module Dependabot
           0
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalised_name(name)
-          name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
 
         def setup_file

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "open3"
+require "dependabot/dependency"
 require "dependabot/python/requirement_parser"
 require "dependabot/python/file_fetcher"
 require "dependabot/python/file_parser/python_requirement_parser"
@@ -483,9 +484,8 @@ module Dependabot
           matches.any? { |m| normalise(m[:name]) == dependency.name }
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalise(name)
-          name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
 
         # If the files we need to update require one another then we need to

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

@@ -2,6 +2,7 @@
 
 require "toml-rb"
 require "open3"
+require "dependabot/dependency"
 require "dependabot/python/requirement_parser"
 require "dependabot/python/file_parser/python_requirement_parser"
 require "dependabot/python/file_updater"
@@ -419,9 +420,8 @@ module Dependabot
           updated_file
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalise(name)
-          name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
 
         def parsed_lockfile

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

@@ -2,6 +2,7 @@
 
 require "toml-rb"
 
+require "dependabot/dependency"
 require "dependabot/python/file_parser"
 require "dependabot/python/file_updater"
 require "dependabot/python/authed_url_builder"
@@ -102,9 +103,8 @@ module Dependabot
           @parsed_lockfile ||= JSON.parse(lockfile.content)
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalise(name)
-          name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
 
         def pipfile_sources

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

@@ -2,6 +2,7 @@
 
 require "toml-rb"
 require "open3"
+require "dependabot/dependency"
 require "dependabot/shared_helpers"
 require "dependabot/python/version"
 require "dependabot/python/requirement"
@@ -289,9 +290,8 @@ module Dependabot
           updated_file
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalise(name)
-          name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
 
         def pyproject

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

@@ -2,6 +2,7 @@
 
 require "toml-rb"
 
+require "dependabot/dependency"
 require "dependabot/python/file_parser"
 require "dependabot/python/file_updater"
 require "dependabot/python/authed_url_builder"
@@ -77,9 +78,8 @@ module Dependabot
             find { |d| d["name"] == normalise(dep_name) }
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalise(name)
-          name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
 
         def pyproject_sources

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "dependabot/dependency"
 require "dependabot/python/requirement_parser"
 require "dependabot/python/file_updater"
 require "dependabot/shared_helpers"
@@ -165,9 +166,8 @@ module Dependabot
           dec.to_s.strip
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalise(name)
-          name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
 
         def requirements_match(req1, req2)

data/lib/dependabot/python/update_checker.rb

@@ -3,6 +3,7 @@
 require "excon"
 require "toml-rb"
 
+require "dependabot/dependency"
 require "dependabot/update_checkers"
 require "dependabot/update_checkers/base"
 require "dependabot/shared_helpers"
@@ -286,9 +287,8 @@ module Dependabot
         false
       end
 
-      # See https://www.python.org/dev/peps/pep-0503/#normalized-names
       def normalised_name(name)
-        name.downcase.gsub(/[-_.]+/, "-")
+        Dependency.name_normaliser_for_package_manager("pip").call(name)
       end
 
       def pipfile

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

@@ -4,6 +4,7 @@ require "cgi"
 require "excon"
 require "nokogiri"
 
+require "dependabot/dependency"
 require "dependabot/python/update_checker"
 require "dependabot/shared_helpers"
 require "dependabot/python/authed_url_builder"
@@ -45,6 +46,7 @@ module Dependabot
 
         def fetch_latest_version(python_version:)
           versions = available_versions
+          versions = filter_yanked_versions(versions)
           versions = filter_unsupported_versions(versions, python_version)
           versions = filter_prerelease_versions(versions)
           versions = filter_ignored_versions(versions)
@@ -53,6 +55,7 @@ module Dependabot
 
         def fetch_latest_version_with_no_unlock(python_version:)
           versions = available_versions
+          versions = filter_yanked_versions(versions)
           versions = filter_unsupported_versions(versions, python_version)
           versions = filter_prerelease_versions(versions)
           versions = filter_ignored_versions(versions)
@@ -62,6 +65,7 @@ module Dependabot
 
         def fetch_lowest_security_fix_version(python_version:)
           versions = available_versions
+          versions = filter_yanked_versions(versions)
           versions = filter_unsupported_versions(versions, python_version)
           versions = filter_prerelease_versions(versions)
           versions = filter_ignored_versions(versions)
@@ -70,6 +74,10 @@ module Dependabot
           versions.min
         end
 
+        def filter_yanked_versions(versions_array)
+          versions_array.reject { |details| details.fetch(:yanked) }
+        end
+
         def filter_unsupported_versions(versions_array, python_version)
           versions_array.map do |details|
             python_requirement = details.fetch(:python_requirement)
@@ -160,7 +168,8 @@ module Dependabot
 
           {
             version: version_class.new(version),
-            python_requirement: build_python_requirement_from_link(link)
+            python_requirement: build_python_requirement_from_link(link),
+            yanked: link&.include?("data-yanked")
           }
         end
 
@@ -212,9 +221,8 @@ module Dependabot
           ignored_versions.map { |req| requirement_class.new(req.split(",")) }
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalised_name
-          dependency.name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
 
         def name_regex

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "open3"
+require "dependabot/dependency"
 require "dependabot/python/requirement_parser"
 require "dependabot/python/file_fetcher"
 require "dependabot/python/file_parser"
@@ -343,9 +344,8 @@ module Dependabot
           ).updated_content
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalise(name)
-          name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
 
         def clean_error_message(message)

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

@@ -3,6 +3,7 @@
 require "excon"
 require "toml-rb"
 require "open3"
+require "dependabot/dependency"
 require "dependabot/errors"
 require "dependabot/shared_helpers"
 require "dependabot/python/file_parser"
@@ -479,9 +480,8 @@ module Dependabot
           }
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalise(name)
-          name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
 
         def pipfile

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

@@ -3,6 +3,7 @@
 require "excon"
 require "toml-rb"
 require "open3"
+require "dependabot/dependency"
 require "dependabot/errors"
 require "dependabot/shared_helpers"
 require "dependabot/python/file_parser"
@@ -324,9 +325,8 @@ module Dependabot
           )
         end
 
-        # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalise(name)
-          name.downcase.gsub(/[-_.]+/, "-")
+          Dependency.name_normaliser_for_package_manager("pip").call(name)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.111.24
+  version: 0.111.25
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-07-23 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.111.24
+        version: 0.111.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.111.24
+        version: 0.111.25
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement