Added future dependency for latest version of pefile #641

joachimmetz · joachimmetz · commit 9e976389fe0d · 2017-08-05T18:55:14.000+02:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -14,7 +14,7 @@ install:
   - ps: (new-object net.webclient).DownloadFile('https://www.sqlite.org/2017/sqlite-dll-win32-x86-3180000.zip', 'C:\Projects\sqlite-dll-win32-x86-3180000.zip')
   - ps: $Output = Invoke-Expression -Command "& 'C:\\Program Files\\7-Zip\\7z.exe' -y -oC:\\Projects\\ x C:\\Projects\\sqlite-dll-win32-x86-3180000.zip 2>&1"
   - cmd: copy C:\Projects\sqlite3.dll C:\Python27\DLLs\
-  - cmd: mkdir dependencies && set PYTHONPATH=..\l2tdevtools && "%PYTHON%\\python.exe" ..\l2tdevtools\tools\update.py --download-directory dependencies --machine-type x86 --msi-targetdir "%PYTHON%" --track dev PyYAML XlsxWriter artifacts bencode binplist certifi chardet construct dateutil dfdatetime dfvfs dfwinreg dpkt efilter hachoir-core hachoir-metadata hachoir-parser idna libbde libesedb libevt libevtx libewf libfsntfs libfvde libfwnt libfwsi liblnk libmsiecf libolecf libqcow libregf libscca libsigscan libsmdev libsmraw libvhdi libvmdk libvshadow libvslvm lzma pefile psutil pycrypto pyparsing pysqlite pytsk3 pytz pyzmq requests six urllib3 yara-python funcsigs mock pbr
+  - cmd: mkdir dependencies && set PYTHONPATH=..\l2tdevtools && "%PYTHON%\\python.exe" ..\l2tdevtools\tools\update.py --download-directory dependencies --machine-type x86 --msi-targetdir "%PYTHON%" --track dev PyYAML XlsxWriter artifacts bencode binplist certifi chardet construct dateutil dfdatetime dfvfs dfwinreg dpkt efilter future hachoir-core hachoir-metadata hachoir-parser idna libbde libesedb libevt libevtx libewf libfsntfs libfvde libfwnt libfwsi liblnk libmsiecf libolecf libqcow libregf libscca libsigscan libsmdev libsmraw libvhdi libvmdk libvshadow libvslvm lzma pefile psutil pycrypto pyparsing pysqlite pytsk3 pytz pyzmq requests six urllib3 yara-python funcsigs mock pbr
 
 build: off
 
diff --git a/config/dpkg/control b/config/dpkg/control
@@ -17,7 +17,7 @@ Description: Data files for plaso (log2timeline)
 
 Package: python-plaso
 Architecture: all
-Depends: plaso-data, libbde-python (>= 20140531), libesedb-python (>= 20150409), libevt-python (>= 20120410), libevtx-python (>= 20141112), libewf-python (>= 20131210), libfsntfs-python (>= 20151130), libfvde-python (>= 20160719), libfwnt-python (>= 20160418), libfwsi-python (>= 20150606), liblnk-python (>= 20150830), libmsiecf-python (>= 20150314), libolecf-python (>= 20151223), libqcow-python (>= 20131204), libregf-python (>= 20150315), libscca-python (>= 20161031), libsigscan-python (>= 20150627), libsmdev-python (>= 20140529), libsmraw-python (>= 20140612), libvhdi-python (>= 20131210), libvmdk-python (>= 20140421), libvshadow-python (>= 20160109), libvslvm-python (>= 20160109), python-artifacts (>= 20170521), python-bencode, python-binplist (>= 0.1.4), python-certifi (>= 2016.9.26), python-chardet (>= 2.0.1), python-construct (>= 2.5.2), python-crypto (>= 2.6.0), python-dateutil (>= 1.5), python-dfdatetime (>= 20170529), python-dfvfs (>= 20160803), python-dfwinreg (>= 20170521), python-dpkt (>= 1.8), python-efilter (>= 1.5), python-hachoir-core (>= 1.3.3), python-hachoir-metadata (>= 1.3.3), python-hachoir-parser (>= 1.3.4), python-idna (>= 2.5), python-lzma (>= 0.5.3), python-pefile (>= 1.2.10-139), python-psutil (>= 1.2.1), python-pyparsing (>= 2.0.3), python-pysqlite, python-pytsk3 (>= 20160721), python-requests (>= 2.2.1), python-six (>= 1.1.0), python-tz, python-urllib3 (>= 1.7.1), python-xlsxwriter (>= 0.9.3), python-yaml (>= 3.10), python-yara (>= 3.4.0), python-zmq (>= 2.1.11), ${python:Depends}, ${misc:Depends}
+Depends: plaso-data, libbde-python (>= 20140531), libesedb-python (>= 20150409), libevt-python (>= 20120410), libevtx-python (>= 20141112), libewf-python (>= 20131210), libfsntfs-python (>= 20151130), libfvde-python (>= 20160719), libfwnt-python (>= 20160418), libfwsi-python (>= 20150606), liblnk-python (>= 20150830), libmsiecf-python (>= 20150314), libolecf-python (>= 20151223), libqcow-python (>= 20131204), libregf-python (>= 20150315), libscca-python (>= 20161031), libsigscan-python (>= 20150627), libsmdev-python (>= 20140529), libsmraw-python (>= 20140612), libvhdi-python (>= 20131210), libvmdk-python (>= 20140421), libvshadow-python (>= 20160109), libvslvm-python (>= 20160109), python-artifacts (>= 20170521), python-bencode, python-binplist (>= 0.1.4), python-certifi (>= 2016.9.26), python-chardet (>= 2.0.1), python-construct (>= 2.5.2), python-crypto (>= 2.6.0), python-dateutil (>= 1.5), python-dfdatetime (>= 20170529), python-dfvfs (>= 20160803), python-dfwinreg (>= 20170521), python-dpkt (>= 1.8), python-efilter (>= 1.5), python-future (>= 0.16.0), python-hachoir-core (>= 1.3.3), python-hachoir-metadata (>= 1.3.3), python-hachoir-parser (>= 1.3.4), python-idna (>= 2.5), python-lzma (>= 0.5.3), python-pefile (>= 1.2.10-139), python-psutil (>= 1.2.1), python-pyparsing (>= 2.0.3), python-pysqlite, python-pytsk3 (>= 20160721), python-requests (>= 2.2.1), python-six (>= 1.1.0), python-tz, python-urllib3 (>= 1.7.1), python-xlsxwriter (>= 0.9.3), python-yaml (>= 3.10), python-yara (>= 3.4.0), python-zmq (>= 2.1.11), ${python:Depends}, ${misc:Depends}
 Description: Python 2 module of plaso (log2timeline)
  Plaso (log2timeline) is a framework to create super timelines. Its
  purpose is to extract timestamps from various files found on typical
diff --git a/config/linux/gift_copr_install.sh b/config/linux/gift_copr_install.sh
@@ -51,6 +51,7 @@ PYTHON2_DEPENDENCIES="PyYAML
                       python-requests
                       python-six
                       python2-certifi
+                      python2-future
                       python2-idna
                       python2-urllib3
                       python2-yara
diff --git a/config/linux/gift_ppa_install.sh b/config/linux/gift_ppa_install.sh
@@ -38,6 +38,7 @@ PYTHON2_DEPENDENCIES="libbde-python
                       python-dfwinreg
                       python-dpkt
                       python-efilter
+                      python-future
                       python-hachoir-core
                       python-hachoir-metadata
                       python-hachoir-parser
diff --git a/config/travis/install.sh b/config/travis/install.sh
@@ -4,11 +4,11 @@
 
 COVERALL_DEPENDENCIES="python-coverage python-coveralls python-docopt";
 
-L2TBINARIES_DEPENDENCIES="PyYAML XlsxWriter artifacts bencode binplist certifi chardet construct dateutil dfdatetime dfvfs dfwinreg dpkt efilter hachoir-core hachoir-metadata hachoir-parser idna libbde libesedb libevt libevtx libewf libfsntfs libfvde libfwnt libfwsi liblnk libmsiecf libolecf libqcow libregf libscca libsigscan libsmdev libsmraw libvhdi libvmdk libvshadow libvslvm lzma pefile psutil pycrypto pyparsing pysqlite pytsk3 pytz pyzmq requests six urllib3 yara-python";
+L2TBINARIES_DEPENDENCIES="PyYAML XlsxWriter artifacts bencode binplist certifi chardet construct dateutil dfdatetime dfvfs dfwinreg dpkt efilter future hachoir-core hachoir-metadata hachoir-parser idna libbde libesedb libevt libevtx libewf libfsntfs libfvde libfwnt libfwsi liblnk libmsiecf libolecf libqcow libregf libscca libsigscan libsmdev libsmraw libvhdi libvmdk libvshadow libvslvm lzma pefile psutil pycrypto pyparsing pysqlite pytsk3 pytz pyzmq requests six urllib3 yara-python";
 
 L2TBINARIES_TEST_DEPENDENCIES="funcsigs mock pbr";
 
-PYTHON2_DEPENDENCIES="libbde-python libesedb-python libevt-python libevtx-python libewf-python libfsntfs-python libfvde-python libfwnt-python libfwsi-python liblnk-python libmsiecf-python libolecf-python libqcow-python libregf-python libscca-python libsigscan-python libsmdev-python libsmraw-python libvhdi-python libvmdk-python libvshadow-python libvslvm-python python-artifacts python-bencode python-binplist python-certifi python-chardet python-construct python-crypto python-dateutil python-dfdatetime python-dfvfs python-dfwinreg python-dpkt python-efilter python-hachoir-core python-hachoir-metadata python-hachoir-parser python-idna python-lzma python-pefile python-psutil python-pyparsing python-pysqlite python-pytsk3 python-requests python-six python-tz python-urllib3 python-xlsxwriter python-yaml python-yara python-zmq";
+PYTHON2_DEPENDENCIES="libbde-python libesedb-python libevt-python libevtx-python libewf-python libfsntfs-python libfvde-python libfwnt-python libfwsi-python liblnk-python libmsiecf-python libolecf-python libqcow-python libregf-python libscca-python libsigscan-python libsmdev-python libsmraw-python libvhdi-python libvmdk-python libvshadow-python libvslvm-python python-artifacts python-bencode python-binplist python-certifi python-chardet python-construct python-crypto python-dateutil python-dfdatetime python-dfvfs python-dfwinreg python-dpkt python-efilter python-future python-hachoir-core python-hachoir-metadata python-hachoir-parser python-idna python-lzma python-pefile python-psutil python-pyparsing python-pysqlite python-pytsk3 python-requests python-six python-tz python-urllib3 python-xlsxwriter python-yaml python-yara python-zmq";
 
 PYTHON2_TEST_DEPENDENCIES="python-mock python-tox";
 
diff --git a/dependencies.ini b/dependencies.ini
@@ -80,6 +80,12 @@ dpkg_name: python-efilter
 minimum_version: 1.5
 rpm_name: python-efilter
 
+[future]
+dpkg_name: python-future
+minimum_version: 0.16.0
+rpm_name: python2-future
+version_property: __version__
+
 [hachoir_core]
 dpkg_name: python-hachoir-core
 is_optional: true
diff --git a/requirements.txt b/requirements.txt
@@ -12,6 +12,7 @@ dfvfs >= 20160803
 dfwinreg >= 20170521
 dpkt >= 1.8
 efilter == 1-1.5
+future >= 0.16.0
 hachoir-core >= 1.3.3 ; python_version < '3.0'
 hachoir-metadata >= 1.3.3 ; python_version < '3.0'
 hachoir-parser >= 1.3.4 ; python_version < '3.0'
diff --git a/setup.cfg b/setup.cfg
@@ -62,6 +62,7 @@ requires = PyYAML >= 3.10
            python-requests >= 2.2.1
            python-six >= 1.1.0
            python2-certifi >= 2016.9.26
+           python2-future >= 0.16.0
            python2-idna >= 2.5
            python2-urllib3 >= 1.7.1
            python2-yara >= 3.4.0
diff --git a/utils/dependencies.py b/utils/dependencies.py
@@ -88,6 +88,8 @@ def Read(self, file_object):
       DependencyDefinition: dependency definition.
     """
     config_parser = configparser.RawConfigParser()
+    # pylint: disable=deprecated-method
+    # TODO: replace readfp by read_file, check if Python 2 compatible
     config_parser.readfp(file_object)
 
     for section_name in config_parser.sections():
