dependabot-python 0.117.11 → 0.118.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66f587f9f2bad38df796b27f339d8ab7dfc0d98925762745b447ea863ff824e0
-  data.tar.gz: 8a96f54b1a137d59b95851a3eb1175cdbe23063017ac1fbd2c740d2748d25317
+  metadata.gz: b5e0617fae821ec632fc7f1eddde32962a1df52ddd266d946033e42efb6b2031
+  data.tar.gz: ce74737754731d32562993a145e63eaf7513b59b8c58d2ff11f18861f8a36a01
 SHA512:
-  metadata.gz: 27837da107b38259b08cafd3f1c4219680c2fd371c026df55ab3eaf805876b27e09c4dd5a7e8b0bbc57a1513512045529c1f6d2fe1839986412be49c7371c68d
-  data.tar.gz: b047c8281910a138e7cb3869f100547518e014b84dd95b4c7e2765249dbdbd43e3a9e23de6d13e87f835dc5aa5e811f8a857a4d12040c6682ec6ed219297c9d1
+  metadata.gz: '02250941200ab1de97012b7be8410788c2df2891862a3316d89cc1b3050fd22dc52671ddb742542d015467fabead012c8e2137e48a36e4a3dabe600b9491fd8d'
+  data.tar.gz: fab0d25f84992900a32cd5ddb3fc7aceb9578efe1ee1295e9b66772c93bee9b74467c215d9dbd302d02fb9722170e4b7e679b6b1c34afb471d63ef144037873f

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
-hashin==0.14.6
+pip==20.1.1
+pip-tools==5.2.1
+hashin==0.15.0
 pipenv==2018.11.26
 pipfile==0.0.2
-poetry==1.0.5
+poetry==1.0.9
 
 # Some dependencies will only install if Cython is present
-Cython==0.29.19
+Cython==0.29.20

data/lib/dependabot/python/requirement_parser.rb

@@ -13,11 +13,25 @@ module Dependabot
       HASH = /--hash=(?<algorithm>.*?):(?<hash>.*?)(?=\s|$)/.freeze
       REQUIREMENTS = /#{REQUIREMENT}(\s*,\s*\\?\s*#{REQUIREMENT})*/.freeze
       HASHES = /#{HASH}(\s*\\?\s*#{HASH})*/.freeze
+      MARKER_OP = /\s*(#{COMPARISON}|(\s*in)|(\s*not\s*in))/.freeze
+      PYTHON_STR_C =
+        %r{[a-zA-Z0-9\s\(\)\.\{\}\-_\*#:;/\?\[\]!~`@\$%\^&=\+\|<>]}.freeze
+      PYTHON_STR = /('(#{PYTHON_STR_C}|")*'|"(#{PYTHON_STR_C}|')*")/.freeze
+      ENV_VAR =
+        /python_version|python_full_version|os_name|sys_platform|
+         platform_release|platform_system|platform_version|platform_machine|
+         platform_python_implementation|implementation_name|
+         implementation_version/.freeze
+      MARKER_VAR = /\s*(#{ENV_VAR}|#{PYTHON_STR})/.freeze
+      MARKER_EXPR_ONE = /#{MARKER_VAR}#{MARKER_OP}#{MARKER_VAR}/.freeze
+      MARKER_EXPR =
+        /(#{MARKER_EXPR_ONE}|\(\s*|\s*\)|\s+and\s+|\s+or\s+)+/.freeze
 
       INSTALL_REQ_WITH_REQUIREMENT =
         /\s*\\?\s*(?<name>#{NAME})
           \s*\\?\s*(\[\s*(?<extras>#{EXTRA}(\s*,\s*#{EXTRA})*)\s*\])?
           \s*\\?\s*\(?(?<requirements>#{REQUIREMENTS})\)?
+          \s*\\?\s*(;\s*(?<markers>#{MARKER_EXPR}))?
           \s*\\?\s*(?<hashes>#{HASHES})?
           \s*#*\s*(?<comment>.+)?
         /x.freeze
@@ -25,6 +39,7 @@ module Dependabot
       INSTALL_REQ_WITHOUT_REQUIREMENT =
         /^\s*\\?\s*(?<name>#{NAME})
           \s*\\?\s*(\[\s*(?<extras>#{EXTRA}(\s*,\s*#{EXTRA})*)\s*\])?
+          \s*\\?\s*(;\s*(?<markers>#{MARKER_EXPR}))?
           \s*\\?\s*(?<hashes>#{HASHES})?
           \s*#*\s*(?<comment>.+)?$
         /x.freeze
@@ -33,6 +48,7 @@ module Dependabot
         /^\s*\\?\s*(?<name>#{NAME})
           \s*\\?\s*(\[\s*(?<extras>#{EXTRA}(\s*,\s*#{EXTRA})*)\s*\])?
           \s*\\?\s*\(?(?<requirements>#{REQUIREMENTS})?\)?
+          \s*\\?\s*(;\s*(?<markers>#{MARKER_EXPR}))?
           \s*\\?\s*(?<hashes>#{HASHES})?
           \s*(\#+\s*(?<comment>.*))?$
         /x.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.117.11
+  version: 0.118.4
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-06-19 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.11
+        version: 0.118.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.117.11
+        version: 0.118.4
 - !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