Changes for latest versions of setuptools and distutils (log2timeline…

…#4195)

appveyor.yml

@@ -24,10 +24,6 @@ install:
 - sh: config/appveyor/install.sh
 
 build_script:
-# Note that bdist_msi will change the version number to work-around limitations
-# of the MSI version version numbering. Hence a MSI build is done separately
-# from building the wheel to not influence its version number.
-- cmd: "%PYTHON%\\python.exe setup.py bdist_msi"
 - cmd: "%PYTHON%\\python.exe setup.py bdist_wheel"
 
 test_script:

setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-license_file = LICENSE
+license_files = LICENSE
 
 [sdist]
 template = MANIFEST.in

setup.py

@@ -224,6 +224,12 @@ def parse_requirements_from_file(path):
     'purpose is to extract timestamps from various files found on typical '
     'computer systems and aggregate them.')
 
+command_classes = {'sdist_test_data': sdist}
+if BdistMSICommand:
+  command_classes['bdist_msi'] = BdistMSICommand
+if BdistRPMCommand:
+  command_classes['bdist_rpm'] = BdistRPMCommand
+
 setup(
     name='plaso',
     version=plaso.__version__,
@@ -234,10 +240,7 @@ def parse_requirements_from_file(path):
     url='https://github.com/log2timeline/plaso',
     maintainer='Log2Timeline maintainers',
     maintainer_email='[email protected]',
-    cmdclass={
-        'bdist_msi': BdistMSICommand,
-        'bdist_rpm': BdistRPMCommand,
-        'sdist_test_data': sdist},
+    cmdclass=command_classes,
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Console',