dependabot-python 0.140.3 → 0.143.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a5b054bde3b2dcba10cbea15626fae53ecfb927bdf46a5af42ef245464deca8
-  data.tar.gz: 936d7a8e26bcc9c74bec6be12ed835b4414d83a300409a932755e9645f386fdd
+  metadata.gz: 8c267dc7f2143181759940166e43b27fdbafae1ae296f33e526a3f1304b283c8
+  data.tar.gz: 1e1c15bdb03251d8582074b68af012dc7255de385b93f14c858c617258161dc6
 SHA512:
-  metadata.gz: 8c42de0aaa7aebbcce0ec4f6416ba7699dd38c87762f0a88ef681a9d65eb43bf1c1c84f87ca42237bccd4bdeeaac7dcffe4118c2638c7f4e229f362f43d49e4b
-  data.tar.gz: 62b4d2240dfc583f4d67d798adaedb2b954891198192558306e26035cc0fdfe085e1e4b7857885b98bc961fbbd17102bdf5a4588e023f5e1ad706322de08e138
+  metadata.gz: e9aefef80e19ddced38bd983b13cb295012c1829e1a296b8734189c11135186917b45dce268e3148737f8f1bdbd8757b1229d9d2fb2ba8c30758b438cfcc74e8
+  data.tar.gz: f770db284ab46511979935d06ee9b7700bb4dd7ab13836f4ae58fcf722198ac718a94ec953f0db2fced3e853bbb940649668255ad82b290c0657bf9e1031b066

data/helpers/lib/parser.py

@@ -57,38 +57,50 @@ def parse_requirements(directory):
 
 
 def parse_setup(directory):
-    # Parse the setup.py
-    setup_packages = []
-    if os.path.isfile(directory + '/setup.py'):
-        def version_from_install_req(install_req):
-            if install_req.is_pinned:
-                return next(iter(install_req.specifier)).version
+    def version_from_install_req(install_req):
+        if install_req.is_pinned:
+            return next(iter(install_req.specifier)).version
 
-        def parse_requirement(req, req_type):
-            install_req = install_req_from_line(req)
-            if install_req.original_link:
-                return
+    def parse_requirement(req, req_type, filename):
+        install_req = install_req_from_line(req)
+        if install_req.original_link:
+            return
 
-            setup_packages.append({
+        setup_packages.append(
+            {
                 "name": install_req.req.name,
                 "version": version_from_install_req(install_req),
                 "markers": str(install_req.markers) or None,
-                "file": "setup.py",
+                "file": filename,
                 "requirement": str(install_req.specifier) or None,
                 "requirement_type": req_type,
-                "extras": sorted(list(install_req.extras))
-            })
+                "extras": sorted(list(install_req.extras)),
+            }
+        )
+
+    def parse_requirements(requires, req_type, filename):
+        for req in requires:
+            parse_requirement(req, req_type, filename)
+
+    # Parse the setup.py and setup.cfg
+    setup_py = "setup.py"
+    setup_py_path = os.path.join(directory, setup_py)
+    setup_cfg = "setup.cfg"
+    setup_cfg_path = os.path.join(directory, setup_cfg)
+    setup_packages = []
+
+    if os.path.isfile(setup_py_path):
 
         def setup(*args, **kwargs):
-            for arg in ['setup_requires', 'install_requires', 'tests_require']:
-                if not kwargs.get(arg):
-                    continue
-                for req in kwargs.get(arg):
-                    parse_requirement(req, arg)
-            extras_require_dict = kwargs.get('extras_require', {})
-            for key in extras_require_dict:
-                for req in extras_require_dict[key]:
-                    parse_requirement(req, 'extras_require:{}'.format(key))
+            for arg in ["setup_requires", "install_requires", "tests_require"]:
+                requires = kwargs.get(arg, [])
+                parse_requirements(requires, arg, setup_py)
+            extras_require_dict = kwargs.get("extras_require", {})
+            for key, value in extras_require_dict.items():
+                parse_requirements(
+                    value, "extras_require:{}".format(key), setup_py
+                )
+
         setuptools.setup = setup
 
         def noop(*args, **kwargs):
@@ -100,17 +112,19 @@ def parse_setup(directory):
         global fake_open
 
         def fake_open(*args, **kwargs):
-            content = ("VERSION = ('0', '0', '1+dependabot')\n"
-                       "__version__ = '0.0.1+dependabot'\n"
-                       "__author__ = 'someone'\n"
-                       "__title__ = 'something'\n"
-                       "__description__ = 'something'\n"
-                       "__author_email__ = 'something'\n"
-                       "__license__ = 'something'\n"
-                       "__url__ = 'something'\n")
+            content = (
+                "VERSION = ('0', '0', '1+dependabot')\n"
+                "__version__ = '0.0.1+dependabot'\n"
+                "__author__ = 'someone'\n"
+                "__title__ = 'something'\n"
+                "__description__ = 'something'\n"
+                "__author_email__ = 'something'\n"
+                "__license__ = 'something'\n"
+                "__url__ = 'something'\n"
+            )
             return io.StringIO(content)
 
-        content = open(directory + '/setup.py', 'r').read()
+        content = open(setup_py_path, "r").read()
 
         # Remove `print`, `open`, `log` and import statements
         content = re.sub(r"print\s*\(", "noop(", content)
@@ -121,18 +135,41 @@ def parse_setup(directory):
         content = re.sub(version_re, "", content)
 
         # Set variables likely to be imported
-        __version__ = '0.0.1+dependabot'
-        __author__ = 'someone'
-        __title__ = 'something'
-        __description__ = 'something'
-        __author_email__ = 'something'
-        __license__ = 'something'
-        __url__ = 'something'
+        __version__ = "0.0.1+dependabot"
+        __author__ = "someone"
+        __title__ = "something"
+        __description__ = "something"
+        __author_email__ = "something"
+        __license__ = "something"
+        __url__ = "something"
 
         # Run as main (since setup.py is a script)
-        __name__ = '__main__'
+        __name__ = "__main__"
 
         # Exec the setup.py
         exec(content) in globals(), locals()
 
+    if os.path.isfile(setup_cfg_path):
+        try:
+            config = setuptools.config.read_configuration(setup_cfg_path)
+
+            for req_type in [
+                "setup_requires",
+                "install_requires",
+                "tests_require",
+            ]:
+                requires = config.get("options", {}).get(req_type, [])
+                parse_requirements(requires, req_type, setup_cfg)
+
+            extras_require = config.get("options", {}).get(
+                "extras_require", {}
+            )
+            for key, value in extras_require.items():
+                parse_requirements(
+                    value, "extras_require:{}".format(key), setup_cfg
+                )
+        except Exception as e:
+            print(json.dumps({"error": repr(e)}))
+            exit(1)
+
     return json.dumps({"result": setup_packages})

data/helpers/requirements.txt

@@ -1,11 +1,11 @@
 pip==20.3.3
 pip-tools==5.5.0
-flake8==3.9.0
+flake8==3.9.1
 hashin==0.15.0
 pipenv==2018.11.26
 pipfile==0.0.2
-poetry==1.1.4
+poetry==1.1.6
 wheel==0.36.2
 
 # Some dependencies will only install if Cython is present
-Cython==0.29.22
+Cython==0.29.23

data/helpers/run.py

@@ -8,7 +8,7 @@ if __name__ == "__main__":
 
     if args["function"] == "parse_requirements":
         print(parser.parse_requirements(args["args"][0]))
-    if args["function"] == "parse_setup":
+    elif args["function"] == "parse_setup":
         print(parser.parse_setup(args["args"][0]))
     elif args["function"] == "get_dependency_hash":
         print(hasher.get_dependency_hash(*args["args"]))

data/lib/dependabot/python/file_fetcher.rb

@@ -25,11 +25,13 @@ module Dependabot
         # If this repo is using Poetry return true
         return true if filenames.include?("pyproject.toml")
 
-        filenames.include?("setup.py")
+        return true if filenames.include?("setup.py")
+
+        filenames.include?("setup.cfg")
       end
 
       def self.required_files_message
-        "Repo must contain a requirements.txt, setup.py, pyproject.toml, "\
+        "Repo must contain a requirements.txt, setup.py, setup.cfg, pyproject.toml, "\
         "or a Pipfile."
       end
 
@@ -45,7 +47,7 @@ module Dependabot
         fetched_files += requirement_files if requirements_txt_files.any?
 
         fetched_files << setup_file if setup_file
-        fetched_files << setup_cfg if setup_cfg
+        fetched_files << setup_cfg_file if setup_cfg_file
         fetched_files += path_setup_files
         fetched_files << pip_conf if pip_conf
         fetched_files << python_version if python_version
@@ -77,7 +79,7 @@ module Dependabot
       end
 
       def check_required_files_present
-        return if requirements_txt_files.any? || setup_file || pipfile || pyproject
+        return if requirements_txt_files.any? || setup_file || setup_cfg_file || pipfile || pyproject
 
         path = Pathname.new(File.join(directory, "requirements.txt")).
                cleanpath.to_path
@@ -88,8 +90,8 @@ module Dependabot
         @setup_file ||= fetch_file_if_present("setup.py")
       end
 
-      def setup_cfg
-        @setup_cfg ||= fetch_file_if_present("setup.cfg")
+      def setup_cfg_file
+        @setup_cfg_file ||= fetch_file_if_present("setup.cfg")
       end
 
       def pip_conf

data/lib/dependabot/python/file_parser.rb

@@ -44,7 +44,7 @@ module Dependabot
         dependency_set += pipenv_dependencies if pipfile
         dependency_set += poetry_dependencies if using_poetry?
         dependency_set += requirement_dependencies if requirement_files.any?
-        dependency_set += setup_file_dependencies if setup_file
+        dependency_set += setup_file_dependencies if setup_file || setup_cfg_file
 
         dependency_set.dependencies
       end
@@ -207,8 +207,9 @@ module Dependabot
         return if pipfile
         return if pyproject
         return if setup_file
+        return if setup_cfg_file
 
-        raise "No requirements.txt or setup.py!"
+        raise "Missing required files!"
       end
 
       def pipfile
@@ -248,6 +249,10 @@ module Dependabot
         @setup_file ||= get_original_file("setup.py")
       end
 
+      def setup_cfg_file
+        @setup_cfg_file ||= get_original_file("setup.cfg")
+      end
+
       def pip_compile_files
         @pip_compile_files ||=
           dependency_files.select { |f| f.name.end_with?(".in") }

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

@@ -71,6 +71,8 @@ module Dependabot
         rescue SharedHelpers::HelperSubprocessFailed => e
           raise Dependabot::DependencyFileNotEvaluatable, e.message if e.message.start_with?("InstallationError")
 
+          return [] unless setup_file
+
           parsed_sanitized_setup_file
         end
 

data/lib/dependabot/python/file_updater.rb

@@ -19,6 +19,7 @@ module Dependabot
           /.*\.txt$/,
           /.*\.in$/,
           /^setup\.py$/,
+          /^setup\.cfg$/,
           /^pyproject\.toml$/,
           /^pyproject\.lock$/
         ]
@@ -113,8 +114,9 @@ module Dependabot
         return if pipfile
         return if pyproject
         return if get_original_file("setup.py")
+        return if get_original_file("setup.cfg")
 
-        raise "No requirements.txt or setup.py!"
+        raise "Missing required files!"
       end
 
       def pipfile

data/lib/dependabot/python/requirement.rb

@@ -50,7 +50,7 @@ module Dependabot
         requirements = requirements.flatten.flat_map do |req_string|
           next if req_string.nil?
 
-          req_string.split(",").map do |r|
+          req_string.split(",").map(&:strip).map do |r|
             convert_python_constraint_to_ruby_constraint(r)
           end
         end

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

@@ -100,7 +100,7 @@ module Dependabot
 
         def filter_ignored_versions(versions_array)
           filtered = versions_array.
-                     reject { |v| ignore_reqs.any? { |r| r.satisfied_by?(v) } }
+                     reject { |v| ignore_requirements.any? { |r| r.satisfied_by?(v) } }
           raise Dependabot::AllVersionsIgnored if @raise_on_ignored && filtered.empty? && versions_array.any?
 
           filtered
@@ -226,8 +226,8 @@ module Dependabot
           )
         end
 
-        def ignore_reqs
-          ignored_versions.map { |req| requirement_class.new(req.split(",")) }
+        def ignore_requirements
+          ignored_versions.flat_map { |req| requirement_class.requirements_array(req) }
         end
 
         def normalised_name

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

@@ -32,7 +32,7 @@ module Dependabot
         def updated_requirements
           requirements.map do |req|
             case req[:file]
-            when "setup.py" then updated_setup_requirement(req)
+            when /setup\.(?:py|cfg)$/ then updated_setup_requirement(req)
             when "pyproject.toml" then updated_pyproject_requirement(req)
             when "Pipfile" then updated_pipfile_requirement(req)
             when /\.txt$|\.in$/ then updated_requirement(req)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.140.3
+  version: 0.143.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-04-21 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.140.3
+        version: 0.143.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.140.3
+        version: 0.143.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.0
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Python support for dependabot