Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions setupbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import os
import sys
import shutil

import pipes
from distutils import log
Expand Down Expand Up @@ -349,16 +350,6 @@ def should_run_npm(self):
return True
return mtime(self.node_modules) < mtime(pjoin(repo_root, 'package.json'))

def npm_components(self):
"""Stage npm frontend dependencies into components"""
for pkg in ['preact', 'preact-compat', 'proptypes']:
npm_pkg = os.path.join(self.node_modules, pkg)
bower_pkg = os.path.join(self.bower_dir, pkg)
log.info("Staging %s -> %s" % (npm_pkg, bower_pkg))
if os.path.exists(bower_pkg):
shutil.rmtree(bower_pkg)
shutil.copytree(npm_pkg, bower_pkg)

def patch_codemirror(self):
"""Patch CodeMirror until https://github.com/codemirror/CodeMirror/issues/4454 is resolved"""

Expand Down Expand Up @@ -393,7 +384,6 @@ def run(self):
raise

self.patch_codemirror()
self.npm_components()
os.utime(self.bower_dir, None)
# update package data in case this created new files
update_package_data(self.distribution)
Expand Down