Merge pull request #7070 from rgbkrk/pin_less_docker

Pin the version of less used in the Dockerfile

Dockerfile

@@ -1,66 +1,66 b''
 # Installs IPython from the current branch
 # Another Docker container should build from this one to get services like the notebook
 
 FROM ubuntu:14.04
 
 MAINTAINER IPython Project <[e-mail]>
 
 ENV DEBIAN_FRONTEND noninteractive
 
 # Not essential, but wise to set the lang
 # Note: Users with other languages should set this in their derivative image
 RUN apt-get update && apt-get install -y language-pack-en
 ENV LANGUAGE en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LC_ALL en_US.UTF-8
 
 RUN locale-gen en_US.UTF-8
 RUN dpkg-reconfigure locales
 
 # Python binary dependencies, developer tools
 RUN apt-get update && apt-get install -y -q \
     build-essential \
     make \
     gcc \
     zlib1g-dev \
     git \
     python \
     python-dev \
     python-pip \
     python3-dev \
     python3-pip \
     python-sphinx \
     python3-sphinx \
     libzmq3-dev \
     sqlite3 \
     libsqlite3-dev \
     pandoc \
     libcurl4-openssl-dev \
     nodejs \
     nodejs-legacy \
     npm
 
 # In order to build from source, need less
-RUN npm install -g less
+RUN npm install -g less@1.7.5
 
 RUN pip install invoke
 
 RUN mkdir -p /srv/
 WORKDIR /srv/
 ADD . /srv/ipython
 WORKDIR /srv/ipython/
 RUN chmod -R +rX /srv/ipython
 
 # .[all] only works with -e, so use file://path#egg
 # Can't use -e because ipython2 and ipython3 will clobber each other
 RUN pip2 install file:///srv/ipython#egg=ipython[all]
 RUN pip3 install file:///srv/ipython#egg=ipython[all]
 
 # install kernels
 RUN python2 -m IPython kernelspec install-self --system
 RUN python3 -m IPython kernelspec install-self --system
 
 WORKDIR /tmp/
 
 RUN iptest2
 RUN iptest3

IPython/html/tasks.py

@@ -1,83 +1,83 b''
 """invoke task file to build CSS"""
 
 from invoke import task, run
 import os
 from distutils.version import LooseVersion as V
 from subprocess import check_output
 
 pjoin = os.path.join
 static_dir = 'static'
 components_dir = pjoin(static_dir, 'components')
 here = os.path.dirname(__file__)
 
 min_less_version = '1.7.5'
 max_less_version = '1.8.0' # exclusive
 
 def _need_css_update():
     """Does less need to run?"""
     
     static_path = pjoin(here, static_dir)
     css_targets = [ 
         pjoin(static_path, 'style', '%s.min.css' % name)
         for name in ('style', 'ipython')
     ]
     css_maps = [t + '.map' for t in css_targets]
     targets = css_targets + css_maps
     if not all(os.path.exists(t) for t in targets):
         # some generated files don't exist
         return True
     earliest_target = sorted(os.stat(t).st_mtime for t in targets)[0]
     
     # check if any .less files are newer than the generated targets
     for (dirpath, dirnames, filenames) in os.walk(static_path):
         for f in filenames:
             if f.endswith('.less'):
                 path = pjoin(static_path, dirpath, f)
                 timestamp = os.stat(path).st_mtime
                 if timestamp > earliest_target:
                     return True
     
     return False
 
 @task
 def css(minify=False, verbose=False, force=False):
     """generate the css from less files"""
     # minify implies force because it's not the default behavior
     if not force and not minify and not _need_css_update():
         print("css up-to-date")
         return
     
     for name in ('style', 'ipython'):
         source = pjoin('style', "%s.less" % name)
         target = pjoin('style', "%s.min.css" % name)
         sourcemap = pjoin('style', "%s.min.css.map" % name)
         _compile_less(source, target, sourcemap, minify, verbose)
 
 def _compile_less(source, target, sourcemap, minify=True, verbose=False):
     """Compile a less file by source and target relative to static_dir"""
     min_flag = '-x' if minify else ''
     ver_flag = '--verbose' if verbose else ''
     
     # pin less to version number from above
     try:
         out = check_output(['lessc', '--version'])
     except OSError as err:
         raise ValueError("Unable to find lessc.  Please install lessc >= %s and < %s " \
                          % (min_less_version, max_less_version))
     out = out.decode('utf8', 'replace')
     less_version = out.split()[1]
     if V(less_version) < V(min_less_version):
-        raise ValueError("lessc too old: %s < %s. Use `$ npm install lesscss@X.Y.Z` to install a specific version of less" % (less_version, min_less_version))
+        raise ValueError("lessc too old: %s < %s. Use `$ npm install less@X.Y.Z` to install a specific version of less" % (less_version, min_less_version))
     if V(less_version) >= V(max_less_version):
-        raise ValueError("lessc too new: %s >= %s. Use `$ npm install lesscss@X.Y.Z` to install a specific version of less" % (less_version, max_less_version))
+        raise ValueError("lessc too new: %s >= %s. Use `$ npm install less@X.Y.Z` to install a specific version of less" % (less_version, max_less_version))
     
     static_path = pjoin(here, static_dir)
     cwd = os.getcwd()
     try:
         os.chdir(static_dir)
         run('lessc {min_flag} {ver_flag} --source-map={sourcemap} --source-map-basepath={static_path} --source-map-rootpath="../" {source} {target}'.format(**locals()),
             echo=True,
         )
     finally:
         os.chdir(cwd)