Mercurial > skaapsteker

changeset 545:067d3d80ff2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sort out setup.py imports, use find_packages()
author Stefano Rivera <stefano@rivera.za.net>
date Sun, 10 Apr 2011 00:41:43 +0200
parents badc218d1eba
children 05d93c10e5ae
files setup.py
diffstat 1 files changed, 13 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/setup.py	Sun Apr 10 00:40:27 2011 +0200
+++ b/setup.py	Sun Apr 10 00:41:43 2011 +0200
@@ -1,5 +1,3 @@
-import os
-
 # usage: python setup.py command
 #
 # sdist - build a source dist
@@ -9,6 +7,18 @@
 #
 # the goods are placed in the dist dir for you to .zip up or whatever...
 
+import glob
+import os
+import shutil
+import sys
+
+from setuptools import setup, find_packages, Extension
+try:
+    import py2exe
+except:
+    pass
+
+
 
 APP_NAME = 'skaapsteker'
 DESCRIPTION = open('README.txt').read()
@@ -69,28 +79,13 @@
 cmdclass = {}
 PACKAGEDATA = {
     'cmdclass':    cmdclass,
-
-    'package_dir': {'skaapsteker': 'skaapsteker',
-                   },
-    'packages': ['skaapsteker',
-                ],
+    'packages': find_packages(),
     'scripts': ['scripts/skaapsteker'],
 }
 
 PACKAGEDATA.update(METADATA)
 
 
-from distutils.core import setup, Extension
-try:
-    import py2exe
-except:
-    pass
-
-import sys
-import glob
-import os
-import shutil
-
 try:
     cmd = sys.argv[1]
 except IndexError:
@@ -175,7 +170,6 @@
 if cmd == 'py2app':
     dist_dir = os.path.join('dist',METADATA['py2app.target']+'.app')
     data_dir = os.path.join(dist_dir,'Contents','Resources')
-    from setuptools import setup
 
     src = 'run_game.py'
     dest = METADATA['py2app.target']+'.py'