File tree Expand file tree Collapse file tree 6 files changed +21
-57
lines changed Expand file tree Collapse file tree 6 files changed +21
-57
lines changed Original file line number Diff line number Diff line change @@ -26,3 +26,4 @@ npm-debug.log
26
26
tests /npm-cache
27
27
django-pipeline- * /
28
28
.tags
29
+ node_modules /
Original file line number Diff line number Diff line change 17
17
- TOXENV=py34-django19
18
18
- TOXENV=py35-django19
19
19
docsinstall : pip install -q tox
20
+ before_install :
21
+ - nvm install node
22
+ - nvm use node
23
+ install :
24
+ - pip install -r requirements.txt
25
+ - npm install
20
26
script : tox
21
27
deploy :
22
28
provider : pypi
Original file line number Diff line number Diff line change 11
11
"url" : " git://github.com/jazzband/django-pipeline.git"
12
12
},
13
13
"dependencies" : {
14
- "babel-cli" : " ^6.4.5 " ,
15
- "babel-preset-es2015" : " ^6.3.13 " ,
16
- "coffee-script" : " ^1.10.0 " ,
17
- "less" : " ^2.5.3 " ,
18
- "livescript" : " ^1.4.0 " ,
19
- "node-sass" : " ^3.4.2 " ,
20
- "stylus" : " ^0.53.0 " ,
21
- "cssmin" : " ^0.4.3 " ,
22
- "google-closure-compiler" : " ^20151216.2.0 " ,
23
- "uglify-js" : " ^2.6.1 " ,
24
- "yuglify" : " ^0.1.4 " ,
25
- "yuicompressor" : " ^2.4.8 "
14
+ "babel-cli" : " latest " ,
15
+ "babel-preset-es2015" : " latest " ,
16
+ "coffee-script" : " latest " ,
17
+ "less" : " latest " ,
18
+ "livescript" : " latest " ,
19
+ "node-sass" : " latest " ,
20
+ "stylus" : " latest " ,
21
+ "cssmin" : " latest " ,
22
+ "google-closure-compiler" : " latest " ,
23
+ "uglify-js" : " latest " ,
24
+ "yuglify" : " latest " ,
25
+ "yuicompressor" : " latest "
26
26
}
27
27
}
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -122,12 +122,12 @@ def local_path(path):
122
122
}
123
123
}
124
124
125
- NODE_MODULES_PATH = local_path ('node_modules' )
125
+ NODE_MODULES_PATH = local_path ('../ node_modules' )
126
126
NODE_BIN_PATH = os .path .join (NODE_MODULES_PATH , '.bin' )
127
127
NODE_EXE_PATH = distutils .spawn .find_executable ('node' )
128
128
JAVA_EXE_PATH = distutils .spawn .find_executable ('java' )
129
129
CSSTIDY_EXE_PATH = distutils .spawn .find_executable ('csstidy' )
130
- HAS_NODE = os . path . exists ( NODE_BIN_PATH ) and NODE_EXE_PATH
130
+ HAS_NODE = bool ( NODE_EXE_PATH )
131
131
HAS_JAVA = bool (JAVA_EXE_PATH )
132
132
HAS_CSSTIDY = bool (CSSTIDY_EXE_PATH )
133
133
Original file line number Diff line number Diff line change @@ -23,7 +23,6 @@ setenv =
23
23
DJANGO_SETTINGS_MODULE = tests.settings
24
24
PYTHONPATH = {toxinidir}
25
25
commands =
26
- {toxinidir}/tests/scripts/npm_install.py
27
26
{envbindir}/django-admin.py test {posargs:tests}
28
27
29
28
[testenv:docs]
You can’t perform that action at this time.
0 commit comments