dependabot-python 0.180.4 → 0.182.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28ed10d7a31128ec65a3c4894d66472f1b4ac8d94e63514f1dcd7d8efa3ab1cd
-  data.tar.gz: b945f3293f3238862326a26d9c6b1b35a4570bac4c7fbd2c0c779631f4864f7b
+  metadata.gz: effbbbdf6db8fd998c99f4433bde4d4aeeda867016d16a20763d79d0f6064e15
+  data.tar.gz: f70c47a7188e266d3a22211c37f868ad8b406c1a688a7f957bab875ee095d8dc
 SHA512:
-  metadata.gz: f9673857f40bedec321b93621d1681d6d80375967502ea2343778630fd1c5a5c40c94a6218ebc644dfbead032e75ed81dc232f047dde66a06ac568dd36b554a3
-  data.tar.gz: eba64b2bdbddf52eb063a28504e589a84f481016ccba158f70c01f0e20662fd49efab242d4e0e569410fd1680a12369059c0d2cc33a4a5c3623430b5bbf3bcc6
+  metadata.gz: 97f4fb405979b036d7ca138dff691c4b4e1f2ec9390da16671a3815ab992f535b65d8ebb9c02e91060d4711f556a29b62d31e1c95c88f2d299228eb2d289e924
+  data.tar.gz: 2818b1838da861d9781759a61e9e03041ec7c315a427e2591849fbbfd6c9aacd972609bd7b5a35ef33a94f015fb006edd0b7981b5d55c2553a6641d1ad97d3f0

data/helpers/requirements.txt

@@ -1,8 +1,8 @@
-pip==22.0.4
-pip-tools==6.5.1
+pip>=21.3.1  # Allow earlier versions to retain python 3.6 support
+pip-tools>=6.4.0  # Allow earlier versions to retain python 3.6 support
 flake8==4.0.1
 hashin==0.17.0
-pipenv==2022.3.28
+pipenv==2022.4.8
 pipfile==0.0.2
 poetry==1.1.13
 wheel==0.37.1

data/lib/dependabot/python/file_parser.rb

@@ -72,12 +72,6 @@ module Dependabot
       def requirement_dependencies
         dependencies = DependencySet.new
         parsed_requirement_files.each do |dep|
-          # This isn't ideal, but currently the FileUpdater won't update
-          # deps that appear in a requirements.txt and Pipenv / Poetry
-          # and *aren't* a straight lockfile for Pipenv / Poetry
-          next if included_in_pipenv_deps?(normalised_name(dep["name"]))
-          next if included_in_poetry_deps?(normalised_name(dep["name"]))
-
           # If a requirement has a `<`, `<=` or '==' marker then updating it is
           # probably blocked. Ignore it.
           next if blocking_marker?(dep)

data/lib/dependabot/python/requirement.rb

@@ -6,7 +6,7 @@ require "dependabot/python/version"
 module Dependabot
   module Python
     class Requirement < Gem::Requirement
-      OR_SEPARATOR = /(?<=[a-zA-Z0-9*])\s*\|+/.freeze
+      OR_SEPARATOR = /(?<=[a-zA-Z0-9)*])\s*\|+/.freeze
 
       # Add equality and arbitrary-equality matchers
       OPS = OPS.merge(
@@ -20,11 +20,17 @@ module Dependabot
 
       PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{version_pattern})\\s*"
       PATTERN = /\A#{PATTERN_RAW}\z/.freeze
+      PARENS_PATTERN = /\A\(([^)]+)\)\z/.freeze
 
       def self.parse(obj)
         return ["=", Python::Version.new(obj.to_s)] if obj.is_a?(Gem::Version)
 
-        unless (matches = PATTERN.match(obj.to_s))
+        line = obj.to_s
+        if (matches = PARENS_PATTERN.match(line))
+          line = matches[1]
+        end
+
+        unless (matches = PATTERN.match(line))
           msg = "Illformed requirement [#{obj.inspect}]"
           raise BadRequirementError, msg
         end
@@ -41,6 +47,10 @@ module Dependabot
       def self.requirements_array(requirement_string)
         return [new(nil)] if requirement_string.nil?
 
+        if (matches = PARENS_PATTERN.match(requirement_string))
+          requirement_string = matches[1]
+        end
+
         requirement_string.strip.split(OR_SEPARATOR).map do |req_string|
           new(req_string.strip)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.180.4
+  version: 0.182.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.180.4
+        version: 0.182.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.180.4
+        version: 0.182.0
+- !ruby/object:Gem::Dependency
+  name: debase
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.26.0
+        version: 1.27.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.27.0
+- !ruby/object:Gem::Dependency
+  name: ruby-debug-ide
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.26.0
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement