Merge branch 'v2.x'

Author: QuLogic

.travis.yml

@@ -89,6 +89,9 @@ before_install:
       pip install --upgrade virtualenv
       python -m virtualenv venv
       source venv/bin/activate
+      # test with non-ascii in path
+      mkdir /tmp/λ
+      export PATH=$PATH:/tmp/λ
       export PATH=/usr/lib/ccache:$PATH
     else
       brew update
@@ -138,8 +141,7 @@ install:
     fi;
   - |
     # Install matplotlib
-    pip install -e .
-  - |
+    pip install -ve .
 
 script:
   # The number of processes is hardcoded, because using too many causes the

doc/api/api_changes.rst

@@ -201,6 +201,20 @@ replaced by ``nipy_spectral`` and ``nipy_spectral_r`` since Matplotlib
 raised a warning. As of Matplotlib 2.0.0, using the old names raises a
 deprecation warning. In the future, using the old names will raise an error.
 
+Default install no longer includes test images
+----------------------------------------------
+
+To reduce the size of wheels and source installs, the tests and
+baseline images are no longer included by default.
+
+To restore installing the tests and images, use a `setup.cfg` with ::
+
+   [packages]
+   tests = True
+   toolkits_tests = True
+
+in the source directory at build/install time.
+
 Changes in 1.5.3
 ================
 

doc/devel/contributing.rst

@@ -77,7 +77,7 @@ the env ``MPLLOCALFREETYPE`` as::
 
   export MPLLOCALFREETYPE=1
 
-or copy :file:`setup.cfg.template` to :file:`setup.cfg` and edit to contain ::
+or copy :file:`setup.cfg.template` to :file:`setup.cfg` and edit it to contain ::
 
   [test]
   local_freetype = True
@@ -107,9 +107,15 @@ Alternatively, if you do ::
 
 all of the files will be copied to the installation directory however,
 you will have to rerun this command every time the source is changed.
+Additionally you will need to copy :file:`setup.cfg.template` to
+:file:`setup.cfg` and edit it to contain ::
 
+  [test]
+  local_freetype = True
+  tests = True
 
-You can then run the tests to check your work environment is set up properly::
+In either case you can then run the tests to check your work
+environment is set up properly::
 
   python tests.py
 

doc/devel/testing.rst

@@ -45,6 +45,7 @@ matplotlib source directory::
 
   [test]
   local_freetype = True
+  tests = True
 
 or by setting the ``MPLLOCALFREETYPE`` environmental variable to any true
 value.

lib/matplotlib/__init__.py

@@ -359,7 +359,8 @@ def ge(self, level):
 
 def checkdep_dvipng():
     try:
-        s = subprocess.Popen(['dvipng', '-version'], stdout=subprocess.PIPE,
+        s = subprocess.Popen([str('dvipng'), '-version'],
+                             stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
         stdout, stderr = s.communicate()
         line = stdout.decode('ascii').split('\n')[1]
@@ -379,7 +380,7 @@ def checkdep_ghostscript():
         for gs_exec in gs_execs:
             try:
                 s = subprocess.Popen(
-                    [gs_exec, '--version'], stdout=subprocess.PIPE,
+                    [str(gs_exec), '--version'], stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE)
                 stdout, stderr = s.communicate()
                 if s.returncode == 0:
@@ -395,7 +396,7 @@ def checkdep_ghostscript():
 
 def checkdep_tex():
     try:
-        s = subprocess.Popen(['tex', '-version'], stdout=subprocess.PIPE,
+        s = subprocess.Popen([str('tex'), '-version'], stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
         stdout, stderr = s.communicate()
         line = stdout.decode('ascii').split('\n')[0]
@@ -409,7 +410,7 @@ def checkdep_tex():
 
 def checkdep_pdftops():
     try:
-        s = subprocess.Popen(['pdftops', '-v'], stdout=subprocess.PIPE,
+        s = subprocess.Popen([str('pdftops'), '-v'], stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
         stdout, stderr = s.communicate()
         lines = stderr.decode('ascii').split('\n')
@@ -424,7 +425,8 @@ def checkdep_pdftops():
 def checkdep_inkscape():
     if checkdep_inkscape.version is None:
         try:
-            s = subprocess.Popen(['inkscape', '-V'], stdout=subprocess.PIPE,
+            s = subprocess.Popen([str('inkscape'), '-V'],
+                                 stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE)
             stdout, stderr = s.communicate()
             lines = stdout.decode('ascii').split('\n')
@@ -442,7 +444,8 @@ def checkdep_inkscape():
 @cbook.deprecated("2.1")
 def checkdep_xmllint():
     try:
-        s = subprocess.Popen(['xmllint', '--version'], stdout=subprocess.PIPE,
+        s = subprocess.Popen([str('xmllint'), '--version'],
+                             stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
         stdout, stderr = s.communicate()
         lines = stderr.decode('ascii').split('\n')

lib/matplotlib/animation.py

@@ -372,7 +372,7 @@ def bin_path(cls):
         subclass. This is a class method so that the tool can be looked for
         before making a particular MovieWriter subclass available.
         '''
-        return rcParams[cls.exec_key]
+        return str(rcParams[cls.exec_key])
 
     @classmethod
     def isAvailable(cls):

lib/matplotlib/backends/backend_pgf.py

@@ -45,7 +45,7 @@
     # assuming fontconfig is installed and the command 'fc-list' exists
     try:
         # list scalable (non-bitmap) fonts
-        fc_list = check_output(['fc-list', ':outline,scalable', 'family'])
+        fc_list = check_output([str('fc-list'), ':outline,scalable', 'family'])
         fc_list = fc_list.decode('utf8')
         system_fonts = [f.split(',')[0] for f in fc_list.splitlines()]
         system_fonts = list(set(system_fonts))
@@ -179,7 +179,7 @@ def make_pdf_to_png_converter():
     tools_available = []
     # check for pdftocairo
     try:
-        check_output(["pdftocairo", "-v"], stderr=subprocess.STDOUT)
+        check_output([str("pdftocairo"), "-v"], stderr=subprocess.STDOUT)
         tools_available.append("pdftocairo")
     except:
         pass
@@ -191,14 +191,14 @@ def make_pdf_to_png_converter():
     # pick converter
     if "pdftocairo" in tools_available:
         def cairo_convert(pdffile, pngfile, dpi):
-            cmd = ["pdftocairo", "-singlefile", "-png",
+            cmd = [str("pdftocairo"), "-singlefile", "-png",
                    "-r %d" % dpi, pdffile, os.path.splitext(pngfile)[0]]
             # for some reason this doesn't work without shell
-            check_output(" ".join(cmd), shell=True, stderr=subprocess.STDOUT)
+            check_output(cmd, shell=True, stderr=subprocess.STDOUT)
         return cairo_convert
     elif "gs" in tools_available:
         def gs_convert(pdffile, pngfile, dpi):
-            cmd = [gs, '-dQUIET', '-dSAFER', '-dBATCH', '-dNOPAUSE', '-dNOPROMPT',
+            cmd = [str(gs), '-dQUIET', '-dSAFER', '-dBATCH', '-dNOPAUSE', '-dNOPROMPT',
                    '-sDEVICE=png16m', '-dUseCIEColor', '-dTextAlphaBits=4',
                    '-dGraphicsAlphaBits=4', '-dDOINTERPOLATE', '-sOutputFile=%s' % pngfile,
                    '-r%d' % dpi, pdffile]
@@ -300,7 +300,7 @@ def __init__(self):
         self.latex_header = LatexManager._build_latex_header()
         latex_end = "\n\\makeatletter\n\\@@end\n"
         try:
-            latex = subprocess.Popen([self.texcommand, "-halt-on-error"],
+            latex = subprocess.Popen([str(self.texcommand), "-halt-on-error"],
                                      stdin=subprocess.PIPE,
                                      stdout=subprocess.PIPE,
                                      cwd=self.tmpdir)
@@ -318,7 +318,7 @@ def __init__(self):
             raise LatexError("LaTeX returned an error, probably missing font or error in preamble:\n%s" % stdout)
 
         # open LaTeX process for real work
-        latex = subprocess.Popen([self.texcommand, "-halt-on-error"],
+        latex = subprocess.Popen([str(self.texcommand), "-halt-on-error"],
                                  stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                                  cwd=self.tmpdir)
         self.latex = latex
@@ -899,7 +899,7 @@ def _print_pdf_to_fh(self, fh, *args, **kwargs):
                 fh_tex.write(latexcode)
 
             texcommand = get_texcommand()
-            cmdargs = [texcommand, "-interaction=nonstopmode",
+            cmdargs = [str(texcommand), "-interaction=nonstopmode",
                        "-halt-on-error", "figure.tex"]
             try:
                 check_output(cmdargs, stderr=subprocess.STDOUT, cwd=tmpdir)

lib/matplotlib/cbook.py

@@ -1467,7 +1467,7 @@ def report_memory(i=0):  # argument may go away
     pid = os.getpid()
     if sys.platform == 'sunos5':
         try:
-            a2 = Popen('ps -p %d -o osz' % pid, shell=True,
+            a2 = Popen(str('ps -p %d -o osz') % pid, shell=True,
                        stdout=PIPE).stdout.readlines()
         except OSError:
             raise NotImplementedError(
@@ -1476,7 +1476,7 @@ def report_memory(i=0):  # argument may go away
         mem = int(a2[-1].strip())
     elif sys.platform.startswith('linux'):
         try:
-            a2 = Popen('ps -p %d -o rss,sz' % pid, shell=True,
+            a2 = Popen(str('ps -p %d -o rss,sz') % pid, shell=True,
                        stdout=PIPE).stdout.readlines()
         except OSError:
             raise NotImplementedError(
@@ -1485,7 +1485,7 @@ def report_memory(i=0):  # argument may go away
         mem = int(a2[1].split()[1])
     elif sys.platform.startswith('darwin'):
         try:
-            a2 = Popen('ps -p %d -o rss,vsz' % pid, shell=True,
+            a2 = Popen(str('ps -p %d -o rss,vsz') % pid, shell=True,
                        stdout=PIPE).stdout.readlines()
         except OSError:
             raise NotImplementedError(
@@ -1494,7 +1494,7 @@ def report_memory(i=0):  # argument may go away
         mem = int(a2[1].split()[0])
     elif sys.platform.startswith('win'):
         try:
-            a2 = Popen(["tasklist", "/nh", "/fi", "pid eq %d" % pid],
+            a2 = Popen([str("tasklist"), "/nh", "/fi", "pid eq %d" % pid],
                        stdout=PIPE).stdout.read()
         except OSError:
             raise NotImplementedError(

lib/matplotlib/collections.py

@@ -771,6 +771,7 @@ def update_from(self, other):
         self._facecolors = other._facecolors
         self._linewidths = other._linewidths
         self._linestyles = other._linestyles
+        self._us_linestyles = other._us_linestyles
         self._pickradius = other._pickradius
         self._hatch = other._hatch
 

lib/matplotlib/dviread.py

@@ -970,7 +970,7 @@ def find_tex_file(filename, format=None):
         The library that :program:`kpsewhich` is part of.
     """
 
-    cmd = ['kpsewhich']
+    cmd = [str('kpsewhich')]
     if format is not None:
         cmd += ['--format=' + format]
     cmd += [filename]