Let's include Salt Cloud to avoid circular import issues in Windows.

salt/utils/cloud.py

@@ -5,7 +5,6 @@ Utility functions for salt.cloud
 
 # Import python libs
 import os
-import pwd
 import sys
 import codecs
 import shutil
@@ -31,6 +30,13 @@ import salt.utils
 import salt.utils.event
 from salt.utils.nb_popen import NonBlockingPopen
 
+# Let's import pwd after salt.utils to check for windows platform
+try:
+    import pwd
+except ImportError:
+    if not salt.utils.is_windows():
+        raise
+
 # Import salt cloud libs
 import salt.cloud
 from salt.cloud.exceptions import (

setup.py

@@ -430,6 +430,8 @@ SETUP_KWARGS = {'name': NAME,
                              'salt.log',
                              'salt.log.handlers',
                              'salt.templates',
+                             'salt.cloud',
+                             'salt.cloud.clouds',
                              ],
                 'package_data': {'salt.templates': [
                                     'rh_ip/*.jinja',
@@ -454,8 +456,8 @@ SETUP_KWARGS = {'name': NAME,
 
 if IS_WINDOWS_PLATFORM is False:
     SETUP_KWARGS['cmdclass']['sdist'] = CloudSdist
-    SETUP_KWARGS['packages'].extend(['salt.cloud',
-                                     'salt.cloud.clouds'])
+    #SETUP_KWARGS['packages'].extend(['salt.cloud',
+    #                                 'salt.cloud.clouds'])
     SETUP_KWARGS['package_data']['salt.cloud'] = ['deploy/*.sh']
     SETUP_KWARGS['data_files'][0][1].extend([
         'doc/man/salt-master.1',