dependabot-python 0.117.9 → 0.118.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72a1013c61398b0c2d6d82384ffca6000cf2315ba710e1a7a0a7e851fa77b5aa
-  data.tar.gz: d4a5179d238c18dbedec1536d7c2bb586d1f39e39a21bd55c8ec10aee4251897
+  metadata.gz: 18c982dcb048a309b081b512008e87c06803eec81343ff75ce4fb4a69107f426
+  data.tar.gz: ba8558c09f898a42f65003949141e6a6addd69bfca8ada414d01fc387137b502
 SHA512:
-  metadata.gz: b1344e569dcfe08c66188b90ba0af6982fa64515378cce1b81a3a2d57d96d3c0edd94bf5a21d6be00dad0069bbfb16a6dee9ee122e33070695023ef5627a7adc
-  data.tar.gz: 7df8498aa50721bd3414b50981bc03eec5b8688afc1eca8078aaf54b37b69eda636bff5cc8c718a44508f3b4a2458f0b76c514338dd7e31e09d9ba21a0977d12
+  metadata.gz: 24877c91ed6e3ec83f5b3249cbc903fce3fedb093010643e9fa697d6e2391c9100c3a0db95ceeeceda502afff7485e0a127884a1a0cd0f6c193ade8849407e89
+  data.tar.gz: c3d4c9be44631d42ecbca0d6781f52d8cb2b0409062db315bd858e20d34f6b01c972a714cf700110c46d021995001d049195f6dfa31fd6304e7c07e0ad56cab3

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
+poetry==1.0.8
 
 # Some dependencies will only install if Cython is present
-Cython==0.29.18
+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.9
+  version: 0.118.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-06-16 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.9
+        version: 0.118.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.117.9
+        version: 0.118.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.83.0
+        version: 0.85.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.83.0
+        version: 0.85.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement