diff --git a/mayan/apps/common/javascript.py b/mayan/apps/common/javascript.py index 7076bf32ee..c3cfdbbda4 100644 --- a/mayan/apps/common/javascript.py +++ b/mayan/apps/common/javascript.py @@ -8,6 +8,7 @@ import shutil import tarfile from furl import furl +from pathlib import Path import requests from semver import max_satisfying @@ -184,7 +185,7 @@ class JSDependencyManager(object): for app in app_config_list: for root, dirs, files in os.walk(os.path.join(app.path, 'static')): - if 'package.json' in files and not any(map(lambda x: x in root, ['node_modules', 'packages', 'vendors'])): + if 'package.json' in files and not (set(Path(root).parts) & set(['node_modules', 'packages', 'vendors'])): print 'Installing JavaScript packages for app: {} - {}'.format(app.label, root) npm_client = NPMRegistry( module_directory=os.path.join(root, 'node_modules'), diff --git a/requirements/base.txt b/requirements/base.txt index 5bb7941801..2143a0a96d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -38,6 +38,7 @@ mock==2.0.0 node-semver==0.3.0 +pathlib==1.0.1 pycountry==1.20 PyPDF2==1.26.0 pyocr==0.5.1