beta release. updated organization for PyPI

escher/js/build/build.js

@@ -2,7 +2,7 @@
     baseUrl: '../src',
     name: "../build/almond",
     paths: {
-	lib: '../../../lib'
+	lib: '../../lib'
     },
     include: ["main"],
     wrap: {

escher/server.py

@@ -106,12 +106,9 @@ def get(self, dev_path, offline_path, kind, path):
 
 class LibHandler(BaseHandler):
     def get(self, path):
-        # try ./, lib/ and escher/lib
-        for d in ['.', 'lib', 'escher/lib']:
-            full_path = join(directory, d, path)
-            if os.path.isfile(full_path):
-                path = full_path
-                break
+        full_path = join(directory, 'escher', 'lib', path)
+        if os.path.isfile(full_path):
+            path = full_path
         else:
             raise HTTPError(404)
         self.serve_path(path)

escher/version.py

@@ -1 +1 @@
-__version__ = '1.0.dev'
+__version__ = '1.0.0b1'

setup.py

@@ -2,42 +2,42 @@
 from subprocess import call
 import threading
 import webbrowser
+from os.path import join, dirname, realpath
 
 try:
     from setuptools import setup
 except:
     from distutils.core import setup
 
+directory = dirname(realpath(__file__))
 version = __import__('escher').__version__
 escher = 'escher.%s.js'%version
 escher_min = 'escher.%s.min.js'%version
 port = 8789
 
 if 'clean' in argv:
-    call(['rm', escher])
-    call(['rm', escher_min])
+    call(['rm', join('escher/lib', escher)])
+    call(['rm', join('escher/lib', escher_min)])
     call(['rm', '-r', 'build'])
     call(['rm', '-r', 'Escher.egg-info'])
     print 'done cleaning'
 
-if 'test' in argv or 'build' in argv or 'install' in argv or 'jasmine' in argv:
-    call(['bin/r.js', '-o', 'escher/js/build/build.js',
-          'out=%s'%escher, 'optimize=none'])
+if 'test' in argv or 'build' in argv or 'jasmine' in argv:
+    call([join(directory, 'bin/r.js'), '-o', 'escher/js/build/build.js',
+          'out=escher/lib/%s'%escher, 'optimize=none'])
 
-if 'build' in argv or 'install' in argv:
-    call(['bin/r.js', '-o', 'escher/js/build/build.js',
-          'out=%s'%escher_min, 'optimize=uglify'])
+if 'build' in argv:
+    call([join(directory, 'bin/r.js'), '-o', 'escher/js/build/build.js',
+          'out=escher/lib/%s'%escher_min, 'optimize=uglify'])
     print 'done building'
 
-if 'install' in argv:
-    setup(name='Escher',
-          version=version,
-          author='Zachary King',
-          url='http://zakandrewking.github.io/escher/',
-          packages=['escher'],
-          package_data={'escher': ['css/*', 'templates/*', 'example_data/*']},
-          data_files=[('escher/lib', [escher, escher_min,
-                                      'lib/d3.v3.js', 'lib/d3.v3.min.js'])])
+setup(name='Escher',
+      version=version,
+      author='Zachary King',
+      url='http://zakandrewking.github.io/escher/',
+      packages=['escher'],
+      package_data={'escher': ['css/*', 'templates/*', 'example_data/*',
+                               'lib/*.js', 'lib/*.css', 'lib/fonts/*']})
 
 if 'test' in argv or 'pytest' in argv:
     call(['py.test'])