"Merge pull request #448 from JDeuce/master\n\nMake travis start work…

…ing again"

.travis.yml

@@ -1,31 +1,25 @@
+sudo: required
+dist: trusty
 language: python
 python:
   - 2.6
-install: 
+node_js:
+  - "4.3.2"
+install:
+  - sudo apt-get -qq update
+
   # Supposed to help get PIL to install on PyPi
   # https://github.com/python-imaging/Pillow/issues/570
-  - apt-get install python-tk
-  
+  - sudo apt-get install python-tk
+
   # To install external filter binaries, we first need to install
   # RubyGems and Node/NPM. I'm not sure why, since it seems clear
   # that NVM and RVM are pre-installed (see below).
-  - apt-get install python-software-properties
-  - apt-add-repository -y ppa:chris-lea/node.js
-  - apt-get update
-  - apt-get install nodejs rubygems
-  - apt-get install npm
-  - npm install -g postcss autoprefixer
-
-  # These are useful for debugging this mess.
-  #- env
-  #- gem env
-  #- rvm info
+  - sudo apt-get install python-software-properties
 
-  # Use non-http registry? https://github.com/n1k0/casperjs/issues/876
-  # Without this, installing doesn't work.  
-  - npm config set registry http://registry.npmjs.org/
+  - npm install -g postcss-cli autoprefixer
 
-  # Now install the external filter binaries, finally. 
+  # Now install the external filter binaries, finally.
   # If we use sudo for this, ruby gems will not work: it seems they are
   # then installed globally, but are then searched for in a RVM location.
   # (Clearing GEM_HOME might be a way to fix this, if sudo where necessary).

requirements-dev-2.x.pip

@@ -5,6 +5,4 @@ clevercss
 pyScss==1.1.5
 slimmer
 cssmin
-
-# Default rsmin package is not installable via pip
-http://michael.elsdoerfer.name/rjsmin/rjsmin-1.0.1-webassets.tar.gz
+rjsmin>=1.0.12

tests/test_filters.py

@@ -1389,7 +1389,12 @@ def setup(self):
 
     def test(self):
         self.mkbundle('foo.ts', filters='typescript', output='out.js').build()
-        assert self.get("out.js") == 'var X = (function () {\n    function X() {\n    }\n    return X;\n})();\n'
+        assert self.get("out.js") in [
+            # older versions of typescript
+            'var X = (function () {\n    function X() {\n    }\n    return X;\n})();\n',
+            # newer versions
+            'var X = (function () {\n    function X() {\n    }\n    return X;\n}());\n'
+        ]
 
 
 class TestRequireJS(TempEnvironmentHelper):

tox.ini

@@ -75,4 +75,4 @@ deps =
     nose==1.0.0
     pytest==2.5.2
     mock==0.8.0
-    http://michael.elsdoerfer.name/rjsmin/rjsmin-1.0.1-webassets.tar.gz
+    rjsmin>=1.0.12