Skip to content

Commit

Permalink
Merge pull request #375 from informatics-lab/fix-conda-build-2
Browse files Browse the repository at this point in the history
use absolute path to find JS on Windows
  • Loading branch information
andrewgryan authored May 14, 2020
2 parents 79648b4 + bb0bdf0 commit 8020b10
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion forest/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
.. automodule:: forest.presets
"""
__version__ = '0.16.3'
__version__ = '0.16.4'

from .config import *
from . import (
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@


NAME = "forest"
JS_DIR = os.path.join(os.path.dirname(__file__), NAME, r"js")


def find_version():
Expand Down Expand Up @@ -63,7 +64,7 @@ class BuildJSCommand(setuptools.command.build_py.build_py):
"""
def run(self):
cwd = os.getcwd()
os.chdir(os.path.join("forest", "js"))
os.chdir(JS_DIR)
if not os.path.exists("node_modules"):
subprocess.check_call(["npm", "install"])
subprocess.check_call(["npm", "run", "build"])
Expand Down

0 comments on commit 8020b10

Please sign in to comment.