Merge pull request jazzband#591 from jazzband/npm-latest

Use lastest node and latest package versions

Author: cyberdelia

.gitignore

@@ -26,3 +26,4 @@ npm-debug.log
 tests/npm-cache
 django-pipeline-*/
 .tags
+node_modules/

.travis.yml

@@ -17,6 +17,12 @@ env:
   - TOXENV=py34-django19
   - TOXENV=py35-django19
 docsinstall: pip install -q tox
+before_install:
+  - nvm install node
+  - nvm use node
+install:
+  - pip install -r requirements.txt
+  - npm install
 script: tox
 deploy:
   provider: pypi

tests/package.json renamed to package.json

@@ -11,17 +11,17 @@
     "url": "git://github.com/jazzband/django-pipeline.git"
   },
   "dependencies": {
-    "babel-cli": "^6.4.5",
-    "babel-preset-es2015": "^6.3.13",
-    "coffee-script": "^1.10.0",
-    "less": "^2.5.3",
-    "livescript": "^1.4.0",
-    "node-sass": "^3.4.2",
-    "stylus": "^0.53.0",
-    "cssmin": "^0.4.3",
-    "google-closure-compiler": "^20151216.2.0",
-    "uglify-js": "^2.6.1",
-    "yuglify": "^0.1.4",
-    "yuicompressor": "^2.4.8"
+    "babel-cli": "latest",
+    "babel-preset-es2015": "latest",
+    "coffee-script": "latest",
+    "less": "latest",
+    "livescript": "latest",
+    "node-sass": "latest",
+    "stylus": "latest",
+    "cssmin": "latest",
+    "google-closure-compiler": "latest",
+    "uglify-js": "latest",
+    "yuglify": "latest",
+    "yuicompressor": "latest"
   }
 }

tests/scripts/npm_install.py

@@ -122,12 +122,12 @@ def local_path(path):
     }
 }
 
-NODE_MODULES_PATH = local_path('node_modules')
+NODE_MODULES_PATH = local_path('../node_modules')
 NODE_BIN_PATH = os.path.join(NODE_MODULES_PATH, '.bin')
 NODE_EXE_PATH = distutils.spawn.find_executable('node')
 JAVA_EXE_PATH = distutils.spawn.find_executable('java')
 CSSTIDY_EXE_PATH = distutils.spawn.find_executable('csstidy')
-HAS_NODE = os.path.exists(NODE_BIN_PATH) and NODE_EXE_PATH
+HAS_NODE = bool(NODE_EXE_PATH)
 HAS_JAVA = bool(JAVA_EXE_PATH)
 HAS_CSSTIDY = bool(CSSTIDY_EXE_PATH)
 

tests/settings.py

@@ -23,7 +23,6 @@ setenv =
     DJANGO_SETTINGS_MODULE = tests.settings
     PYTHONPATH = {toxinidir}
 commands =
-    {toxinidir}/tests/scripts/npm_install.py
     {envbindir}/django-admin.py test {posargs:tests}
 
 [testenv:docs]