dependabot-python 0.117.8 → 0.118.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb334b77feb7fb23c325222e774c033a6dd0403f4f6a5b638d896ca580ba5ca9
-  data.tar.gz: c36b439813db2bdbf203169f93c84678c471c191b17b7421a87afb35b2bdccda
+  metadata.gz: 99caa4e6d7f387794e2318fd4dcc553dbfe83b14aa08ae97d0a61a402b1fe2ee
+  data.tar.gz: 011076d83323011ae02b6d633c683ecd115d1d99ddb7c052d4f4cda2fd9a35c2
 SHA512:
-  metadata.gz: 706444a09b1e6e58ce1f0859148f734703c3edada16ecefb5a5a8ef29a4ef9daa6eed32971a157b45ab1efc5dac42b56ddfd27467d8d078004d4b420d5ff3bce
-  data.tar.gz: c8382f5406e1d56ac23e44f54d847cb6bed472e743316c7fb066ffea93d475a49759f41e53cf262fab4378a2cd3396664967172e05b9f747a2d0eaeedf1362bc
+  metadata.gz: 3b9b8802a3df681735ae73677490e415eecf6f2dc83a6fd540f090860dd5f0375870cec8491bb0841046e95d4b78e6fbfe9e18ad4671f10606148d794e7960d5
+  data.tar.gz: 07a6bad7d18a9663a4a1f1b5d29022a6ebebff14317ac74c095dea05394e1d23352d923c96bba2f961383aea85117cb24ae880945e8ae8590c418b305bc53774

data/helpers/build

@@ -16,5 +16,5 @@ cp -r \
   "$install_dir"
 
 cd "$install_dir"
-PYENV_VERSION=2.7.17 pyenv exec pip install -r "requirements.txt"
-PYENV_VERSION=3.8.2  pyenv exec pip install -r "requirements.txt"
+PYENV_VERSION=2.7.18 pyenv exec pip install -r "requirements.txt"
+PYENV_VERSION=3.8.3  pyenv exec pip install -r "requirements.txt"

data/helpers/lib/parser.py

@@ -8,26 +8,16 @@ import re
 
 import setuptools
 import pip._internal.req.req_file
-from pip._internal.download import PipSession
+from pip._internal.network.session import PipSession
 from pip._internal.models.format_control import FormatControl
-from pip._internal.req.constructors import install_req_from_line
-
-JINJA_DELIMITER_IGNORE_REGEX = r"({{(.*?)}})|({%[-]?(.*?)%})|({#(.*?)#})"
+from pip._internal.req.constructors import (
+        install_req_from_line,
+        install_req_from_parsed_requirement,
+)
 
 def parse_requirements(directory):
     # Parse the requirements.txt
     requirement_packages = []
-    parser_options = optparse.Values(
-            {
-                "skip_requirements_regex": JINJA_DELIMITER_IGNORE_REGEX,
-                # pip._internal assumes parse_requirements will be called from
-                # CLI, which sets default values. When passing parser options,
-                # need to explicitly set those defaults.
-                "isolated_mode": False,
-                "format_control": FormatControl(),
-            }
-        )
-
     requirement_files = glob.glob(os.path.join(directory, '*.txt')) \
                         + glob.glob(os.path.join(directory, '**', '*.txt'))
 
@@ -42,10 +32,10 @@ def parse_requirements(directory):
         try:
             requirements = pip._internal.req.req_file.parse_requirements(
                 reqs_file,
-                options=parser_options,
                 session=PipSession()
             )
-            for install_req in requirements:
+            for parsed_req in requirements:
+                install_req = install_req_from_parsed_requirement(parsed_req)
                 if install_req.original_link:
                     continue
 

data/helpers/requirements.txt

@@ -1,9 +1,9 @@
-pip==19.3.1
-pip-tools==4.5.1
+pip==20.1.1
+pip-tools==5.1.2
 hashin==0.14.6
 pipenv==2018.11.26
 pipfile==0.0.2
 poetry==1.0.5
 
 # Some dependencies will only install if Cython is present
-Cython==0.29.17
+Cython==0.29.19

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

@@ -174,9 +174,9 @@ module Dependabot
 
           raise relevant_error unless error_suggests_bad_python_version?(msg)
           raise relevant_error if user_specified_python_version
-          raise relevant_error if python_version == "2.7.17"
+          raise relevant_error if python_version == "2.7.18"
 
-          @python_version = "2.7.17"
+          @python_version = "2.7.18"
           retry
         ensure
           @python_version = nil

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

@@ -280,7 +280,7 @@ module Dependabot
           run_command("pyenv local #{python_version}")
           run_command("pyenv exec pipenv --rm")
 
-          @python_version = "2.7.17"
+          @python_version = "2.7.18"
           retry
         ensure
           @python_version = nil

data/lib/dependabot/python/python_versions.rb

@@ -4,17 +4,17 @@ module Dependabot
   module Python
     module PythonVersions
       PRE_INSTALLED_PYTHON_VERSIONS = %w(
-        3.8.2 2.7.17
+        3.8.3 2.7.18
       ).freeze
 
       # Due to an OpenSSL issue we can only install the following versions in
       # the Dependabot container.
       SUPPORTED_VERSIONS = %w(
-        3.8.2 3.8.1 3.8.0
+        3.8.3 3.8.2 3.8.1 3.8.0
         3.7.7 3.7.6 3.7.5 3.7.4 3.7.3 3.7.2 3.7.1 3.7.0
         3.6.9 3.6.8 3.6.7 3.6.6 3.6.5 3.6.4 3.6.3 3.6.2 3.6.1 3.6.0
         3.5.7 3.5.6 3.5.5 3.5.4 3.5.3
-        2.7.17 2.7.16 2.7.15 2.7.14 2.7.13
+        2.7.18 2.7.17 2.7.16 2.7.15 2.7.14 2.7.13
       ).freeze
 
       # This list gets iterated through to find a valid version, so we have

data/lib/dependabot/python/update_checker.rb

@@ -195,6 +195,7 @@ module Dependabot
           dependency_files: dependency_files,
           credentials: credentials,
           ignored_versions: ignored_versions,
+          raise_on_ignored: @raise_on_ignored,
           security_advisories: security_advisories
         )
       end
@@ -262,6 +263,7 @@ module Dependabot
           dependency_files: dependency_files,
           credentials: credentials,
           ignored_versions: ignored_versions,
+          raise_on_ignored: @raise_on_ignored,
           security_advisories: security_advisories
         )
       end

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

@@ -17,11 +17,13 @@ module Dependabot
         require_relative "index_finder"
 
         def initialize(dependency:, dependency_files:, credentials:,
-                       ignored_versions:, security_advisories:)
+                       ignored_versions:, raise_on_ignored: false,
+                       security_advisories:)
           @dependency          = dependency
           @dependency_files    = dependency_files
           @credentials         = credentials
           @ignored_versions    = ignored_versions
+          @raise_on_ignored    = raise_on_ignored
           @security_advisories = security_advisories
         end
 
@@ -69,8 +71,8 @@ module Dependabot
           versions = filter_yanked_versions(versions)
           versions = filter_unsupported_versions(versions, python_version)
           versions = filter_prerelease_versions(versions)
-          versions = filter_ignored_versions(versions)
           versions = filter_vulnerable_versions(versions)
+          versions = filter_ignored_versions(versions)
           versions = filter_lower_versions(versions)
           versions.min
         end
@@ -97,8 +99,13 @@ module Dependabot
         end
 
         def filter_ignored_versions(versions_array)
-          versions_array.
-            reject { |v| ignore_reqs.any? { |r| r.satisfied_by?(v) } }
+          filtered = versions_array.
+                     reject { |v| ignore_reqs.any? { |r| r.satisfied_by?(v) } }
+          if @raise_on_ignored && filtered.empty? && versions_array.any?
+            raise Dependabot::AllVersionsIgnored
+          end
+
+          filtered
         end
 
         def filter_vulnerable_versions(versions_array)

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

@@ -229,9 +229,9 @@ module Dependabot
           relevant_error = choose_relevant_error(original_err, e)
           raise relevant_error unless error_suggests_bad_python_version?(msg)
           raise relevant_error if user_specified_python_version
-          raise relevant_error if python_version == "2.7.17"
+          raise relevant_error if python_version == "2.7.18"
 
-          @python_version = "2.7.17"
+          @python_version = "2.7.18"
           retry
         ensure
           @python_version = nil

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

@@ -9,11 +9,13 @@ module Dependabot
     class UpdateChecker
       class PipVersionResolver
         def initialize(dependency:, dependency_files:, credentials:,
-                       ignored_versions:, security_advisories:)
+                       ignored_versions:, raise_on_ignored: false,
+                       security_advisories:)
           @dependency          = dependency
           @dependency_files    = dependency_files
           @credentials         = credentials
           @ignored_versions    = ignored_versions
+          @raise_on_ignored    = raise_on_ignored
           @security_advisories = security_advisories
         end
 
@@ -42,6 +44,7 @@ module Dependabot
             dependency_files: dependency_files,
             credentials: credentials,
             ignored_versions: ignored_versions,
+            raise_on_ignored: @raise_on_ignored,
             security_advisories: security_advisories
           )
         end

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

@@ -458,7 +458,7 @@ module Dependabot
           run_command("pyenv local #{python_version}")
           run_command("pyenv exec pipenv --rm")
 
-          @python_version = "2.7.17"
+          @python_version = "2.7.18"
           retry
         ensure
           @python_version = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.117.8
+  version: 0.118.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-06-04 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.117.8
+        version: 0.118.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.117.8
+        version: 0.118.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 0.83.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 0.83.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement