Update setup.py tasks for new directory structure

jonmmease · jonmmease · commit 1ca95d241347 · 2019-06-03T19:35:04.000-04:00
diff --git a/plotly-package/setup.py b/plotly-package/setup.py
@@ -11,8 +11,9 @@
 
 
 here = os.path.dirname(os.path.abspath(__file__))
-node_root = os.path.join(here, 'js')
-is_repo = os.path.exists(os.path.join(here, '.git'))
+project_root = os.path.dirname(here)
+node_root = os.path.join(project_root, 'js')
+is_repo = os.path.exists(os.path.join(project_root, '.git'))
 
 npm_path = os.pathsep.join([
     os.path.join(node_root, 'node_modules', '.bin'),
@@ -22,16 +23,16 @@
 
 # Load plotly.js version from js/package.json
 def plotly_js_version():
-    with open('js/package.json', 'rt') as f:
+    path = os.path.join(project_root, 'js', 'package.json')
+    with open(path, 'rt') as f:
         package_json = json.load(f)
         version = package_json['dependencies']['plotly.js']
 
     return version
 
 
 def readme():
-    parent_dir = os.path.dirname(os.path.realpath(__file__))
-    with open(os.path.join(parent_dir, 'README.md')) as f:
+    with open(os.path.join(here, 'README.md')) as f:
         return f.read()
 
 
@@ -157,20 +158,23 @@ def overwrite_schema(url):
     import requests
     req = requests.get(url)
     assert req.status_code == 200
-    with open('plotly/package_data/plot-schema.json', 'wb') as f:
+    path = os.path.join(here, 'codegen', 'resources', 'plot-schema.json')
+    with open(path, 'wb') as f:
         f.write(req.content)
 
 
 def overwrite_bundle(url):
     import requests
     req = requests.get(url)
     assert req.status_code == 200
-    with open('plotly/package_data/plotly.min.js', 'wb') as f:
+    path = os.path.join(here, 'plotly', 'package_data', 'plotly.min.js')
+    with open(path, 'wb') as f:
         f.write(req.content)
 
 
 def overwrite_plotlyjs_version_file(plotlyjs_version):
-    with open('plotly/offline/_plotlyjs_version.py', 'w') as f:
+    path = os.path.join(here, 'plotly', 'offline', '_plotlyjs_version.py')
+    with open(path, 'w') as f:
         f.write("""\
 # DO NOT EDIT
 # This file is generated by the updatebundle setup.py command
@@ -179,7 +183,8 @@ def overwrite_plotlyjs_version_file(plotlyjs_version):
 
 
 def overwrite_plotlywidget_version_file(version):
-    with open('plotly/_widget_version.py', 'w') as f:
+    path = os.path.join(here, 'plotly', '_widget_version.py')
+    with open(path, 'w') as f:
         f.write("""\
 # This file is generated by the updateplotlywidgetversion setup.py command
 # for automated dev builds
@@ -364,8 +369,7 @@ def run(self):
             package_json = json.load(f)
 
         # Replace version with bundle url
-        root = os.path.dirname(os.path.realpath(__file__))
-        pieces = git_pieces_from_vcs('widget-v', root, False)
+        pieces = git_pieces_from_vcs('widget-v', project_root, False)
         pieces['dirty'] = False
         widget_ver = render(pieces, 'pep440')['version']
 
