Commits

J.A. Roberts Tunney committed 839bde4

make installer work better and include balls.png for demo

Comments (0)

Files changed (5)

 
 Download and extract the latest version::
 
-  sudo apt-get install gcc python-imaging python-setuptools \
-      mercurial-buildpackage
+  sudo apt-get install gcc python-imaging python-setuptools
   sudo python setup.py install
 
 Run the demo to see what's available::
Removed
Old image
Added
New image
 
+import os
+import fabulous
 from fabulous.color import *
 from fabulous import text, utils, image, debug, xterm256
 
     section("Semi-Transparent PNG")
     imp = "  from fabulous import image\n  "
     print bold(imp + 'print image.Image("balls.png")\n')
-    for line in image.Image('balls.png'):
+
+    balls = 'balls.png'
+    fabdir = os.path.dirname(fabulous.__file__)
+
+    print os.path.join(fabdir, 'balls.png')
+    for fn in ['balls.png',
+               'fabulous/balls.png',
+               os.path.join(fabdir, 'balls.png')]:
+        if os.path.exists(fn):
+            balls = fn
+            break
+
+    for line in image.Image(balls):
         print line
     wait()
 
     section("Yes the output is optimized (JELLY-FISH)")
     imp = "  from fabulous import debug\n  "
     print bold(imp + 'print debug.DebugImage("balls.png")\n')
-    for line in debug.DebugImage('balls.png'):
+    for line in debug.DebugImage(balls):
         print line
     wait()
 
+
+# http://packages.python.org/distribute/setuptools.html
+# http://diveintopython3.org/packaging.html
+# http://wiki.python.org/moin/CheeseShopTutorial
+# http://pypi.python.org/pypi?:action=list_classifiers
 
 from ez_setup import use_setuptools
 use_setuptools(version='0.6c9')
     license              = 'MIT',
     install_requires     = ['grapefruit'],
     packages             = find_packages(),
-    setup_requires       = ["setuptools_hg"],
     zip_safe             = False,
     include_package_data = True,
-    # include_data         = True,
-    # http://diveintopython3.org/packaging.html
-    # http://wiki.python.org/moin/CheeseShopTutorial
-    # http://pypi.python.org/pypi?:action=list_classifiers
-    classifiers=[
+    package_data         = {
+        'fabulous': ['*.png', '*.otf', '*.ttf'],
+    },
+    classifiers = [
         "Development Status :: 2 - Pre-Alpha",
         "License :: OSI Approved :: MIT License",
         "Environment :: Console",
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.