matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve how to determine when to install the package.json file using pathlib.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-05-21 00:38:05 -04:00
parent 7744dac423
commit 047962d946
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mayan/apps/common/javascript.py
View File

@@ -8,6 +8,7 @@ import shutil
import tarfile import tarfile
from furl import furl from furl import furl
from pathlib import Path
import requests import requests
from semver import max_satisfying from semver import max_satisfying
@@ -184,7 +185,7 @@ class JSDependencyManager(object):
for app in app_config_list: for app in app_config_list:
for root, dirs, files in os.walk(os.path.join(app.path, 'static')): 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) print 'Installing JavaScript packages for app: {} - {}'.format(app.label, root)
npm_client = NPMRegistry( npm_client = NPMRegistry(
module_directory=os.path.join(root, 'node_modules'), module_directory=os.path.join(root, 'node_modules'),

1
requirements/base.txt
View File

@@ -38,6 +38,7 @@ mock==2.0.0
node-semver==0.3.0 node-semver==0.3.0
pathlib==1.0.1
pycountry==1.20 pycountry==1.20
PyPDF2==1.26.0 PyPDF2==1.26.0
pyocr==0.5.1 pyocr==0.5.1