Removed requests dependencies from requirements.txt #2729 (#3597)

log2timeline · May 15, 2021 · cbd6007 · cbd6007
1 parent 9d947c8
commit cbd6007
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/dependencies.ini b/dependencies.ini
@@ -24,6 +24,7 @@ rpm_name: python3-cffi
 version_property: __version__
 
 [chardet]
+skip_requires: true
 dpkg_name: python3-chardet
 minimum_version: 2.0.1
 rpm_name: python3-chardet
@@ -88,6 +89,7 @@ rpm_name: python3-future
 version_property: __version__
 
 [idna]
+skip_requires: true
 dpkg_name: python3-idna
 minimum_version: 2.5
 rpm_name: python3-idna
@@ -393,6 +395,7 @@ rpm_name: python3-six
 version_property: __version__
 
 [urllib3]
+skip_requires: true
 dpkg_name: python3-urllib3
 minimum_version: 1.21.1
 rpm_name: python3-urllib3

diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,6 @@ artifacts >= 20190305
 bencode.py
 certifi >= 2016.9.26
 cffi >= 1.9.1
-chardet >= 2.0.1
 cryptography >= 2.0.2
 defusedxml >= 0.5.0
 dfdatetime >= 20210509
@@ -14,7 +13,6 @@ dfwinreg >= 20201002
 dtfabric >= 20200621
 elasticsearch >= 7.0
 future >= 0.16.0
-idna >= 2.5
 libbde-python >= 20140531
 libcreg-python >= 20200725
 libesedb-python >= 20150409
@@ -56,5 +54,4 @@ pyzmq >= 2.1.11
 redis >= 3.4
 requests >= 2.18.0
 six >= 1.1.0
-urllib3 >= 1.21.1
 yara-python >= 3.4.0
diff --git a/utils/dependencies.py b/utils/dependencies.py
@@ -25,6 +25,8 @@ class DependencyDefinition(object):
     rpm_name (str): name of the rpm package that provides the dependency.
     skip_check (bool): True if the dependency should be skipped by the
         CheckDependencies or CheckTestDependencies methods of DependencyHelper.
+    skip_requires (bool): True if the dependency should be excluded from
+        requirements.txt or setup.py install_requires.
     version_property (str): name of the version attribute or function.
   """
 
@@ -46,6 +48,7 @@ def __init__(self, name):
     self.python3_only = False
     self.rpm_name = None
     self.skip_check = None
+    self.skip_requires = None
     self.version_property = None
 
 
@@ -63,6 +66,7 @@ class DependencyDefinitionReader(object):
       'python3_only',
       'rpm_name',
       'skip_check',
+      'skip_requires',
       'version_property'])
 
   def _GetConfigValue(self, config_parser, section_name, value_name):