refactoring to release version 0.2.1

.gitignore

@@ -18,7 +18,7 @@ yarn-error.log*
 rfvis.egg-info
 dist
 build
-client/**/*.css
+*.css
 
 # misc
 .DS_Store

README.md

@@ -169,7 +169,7 @@ actually see the application working on `http://localhost:8080`.
 
 To build the frontend you need Node.js installed. First install all 
 dev-dependencies by running the following 
-from within the `./client` directory:
+from within the `./rfvis/client` directory:
 
 ```
 $ npm install

rfvis/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.0"
+__version__ = "0.2.1"

rfvis/__main__.py

@@ -63,8 +63,8 @@ def cli(forest_json, out, width, height, trunk_length, display_depth, branch_col
     })
 
     try:
-        abs_path = os.path.normpath(os.path.join(__file__, "../../client/build/render_tree_script.js"))
-        process = subprocess.Popen(["node", abs_path, config, out],
+        script_path = os.path.join(os.path.dirname(__file__), "client", "build", "render_tree_script.js")
+        process = subprocess.Popen(["node", script_path, config, out],
                                    stdin=subprocess.PIPE,
                                    stdout=subprocess.PIPE)
         output = process.communicate(json.dumps(data).encode("utf8"))

rfvis/server.py

@@ -9,10 +9,11 @@ def start_server(data, port=8080, debug=False, use_reloader=False, **kwargs):
     @app.route('/', defaults={'path': ''})
     @app.route('/<path:path>')
     def serve_app(path):
-        if path != "" and os.path.exists("client/build/" + path):
-            return send_from_directory('../client/build', path)
+        build_path = os.path.join(os.path.dirname(__file__), "client", "build")
+        if path != "" and os.path.exists(os.path.join(build_path, path)):
+            return send_from_directory(build_path, path)
         else:
-            return send_from_directory('../client/build', 'index.html')
+            return send_from_directory(build_path, 'index.html')
 
     @app.route('/data')
     def serve_data():

setup.py

@@ -28,6 +28,7 @@
             "Bug Tracker": "https://github.com/birnbaum/rfvis/issues",
         },
         packages=["rfvis"],
+        package_data={"rfvis": ["client/build/*", "client/build/static/**/*"]},
         license="MIT",
         install_requires=[
             "click",