From 2b4450c02441beba05f42606bb08bd2fa1d0272a Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 19 Apr 2015 15:03:33 -0400 Subject: [PATCH 1/9] TST : first pass updating to use travis containers This will not work currently, waiting on travis to whitelist needed packages. --- .travis.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 831300cb9b46..d4614ebb1b87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,19 @@ +sudo: false + +addons: + apt: + packages: + - inkscape + - libav-tools + - gdb + - mencoder + - dvipng + - texlive-latex-base + - texlive-latex-extra + - texlive-fonts-recommended + - graphviz + - fonts-humor-sans + env: global: - ARTIFACTS_AWS_REGION=us-east-1 @@ -25,8 +41,7 @@ matrix: install: - pip install -q --use-mirrors nose python-dateutil $NUMPY pep8 pyparsing pillow sphinx!=1.3.0 - - sudo apt-get update && sudo apt-get -qq install inkscape libav-tools gdb mencoder - # We use --no-install-recommends to avoid pulling in additional large latex docs that we don't need + # We use --no-install-recommends to avoid pulling in additional large latex docs that we don't need # We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not # availible in the Ubuntu version used by Travis but we can manually install the deb from a later @@ -36,12 +51,9 @@ install: # Neihter is installed as a dependency of IPython since they are not used by the IPython console. - | if [[ $BUILD_DOCS == true ]]; then - sudo apt-get install -qq --no-install-recommends dvipng texlive-latex-base texlive-latex-extra texlive-fonts-recommended graphviz pip install numpydoc linkchecker ipython jsonschema mistune - wget http://mirrors.kernel.org/ubuntu/pool/universe/f/fonts-humor-sans/fonts-humor-sans_1.0-1_all.deb - sudo dpkg -i fonts-humor-sans_1.0-1_all.deb wget https://googlefontdirectory.googlecode.com/hg/ofl/felipa/Felipa-Regular.ttf - sudo cp Felipa-Regular.ttf /usr/local/share/fonts/ + cp Felipa-Regular.ttf ~/.local/share/fonts/ fc-cache -f -v fi; - python setup.py install From 8ade0a3a53cc62df360dbf1b57673a29020e8d43 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 20 Apr 2015 10:07:10 -0400 Subject: [PATCH 2/9] TST : update .travis.yaml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d4614ebb1b87..0912abb3ee58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ addons: - texlive-fonts-recommended - graphviz - fonts-humor-sans + sources: + - debian-sid env: global: From afca4925327c001a7ad2aeb9e06a4aadd67a87b5 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 20 Apr 2015 13:49:43 -0400 Subject: [PATCH 3/9] TST : nuke debian-sid and humorsans for testing --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0912abb3ee58..ba3b3427bd08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,9 @@ addons: - texlive-latex-extra - texlive-fonts-recommended - graphviz - - fonts-humor-sans - sources: - - debian-sid +# - fonts-humor-sans +# sources: +# - debian-sid env: global: From 22a7ee76ff18e51fa567c146278cee6c40fa694b Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 20 Apr 2015 19:33:49 -0400 Subject: [PATCH 4/9] TST : actually install all of the latex needed --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ba3b3427bd08..bf54101c64f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ addons: - texlive-latex-base - texlive-latex-extra - texlive-fonts-recommended + - texlive-latex-recommended - graphviz # - fonts-humor-sans # sources: From 150320fcac3306a8c50c5e40e89ecea53d230cfb Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 20 Apr 2015 21:37:59 -0400 Subject: [PATCH 5/9] MNT : install humor sans 'by hand' --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index bf54101c64f3..a3e853807838 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,6 +56,10 @@ install: if [[ $BUILD_DOCS == true ]]; then pip install numpydoc linkchecker ipython jsonschema mistune wget https://googlefontdirectory.googlecode.com/hg/ofl/felipa/Felipa-Regular.ttf + wget http://mirrors.kernel.org/ubuntu/pool/universe/f/fonts-humor-sans/fonts-humor-sans_1.0-1_all.deb + mkdir -p tmp + dpkg -x fonts-humor-sans_1.0-1_all.deb tmp + cp tmp/usr/share/fonts/truetype/humor-sans/Humor-Sans.ttf ~/.local/share/fonts/ cp Felipa-Regular.ttf ~/.local/share/fonts/ fc-cache -f -v fi; From fd0dbbf301a16c085cf14ea6465ee2851ae7d903 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 20 Apr 2015 22:15:49 -0400 Subject: [PATCH 6/9] TST : turn down number of concurrent jobs Travis build machines only have 2 cores --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a3e853807838..e66070d09db5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ script: export MPL_REPO_DIR=$PWD # needed for pep8-conformance test of the examples mkdir ../tmp_test_dir cd ../tmp_test_dir - gdb -return-child-result -batch -ex r -ex bt --args python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300 $TEST_ARGS + gdb -return-child-result -batch -ex r -ex bt --args python ../matplotlib/tests.py -sv --processes=2 --process-timeout=300 $TEST_ARGS else cd doc python make.py html --small --warningsaserrors From 859978441b0d9a2f3df758ae3b97e3c3114590c0 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Tue, 21 Apr 2015 09:56:27 -0400 Subject: [PATCH 7/9] TST : make number of concurrent procs an ENV --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e66070d09db5..e96070a70186 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,7 @@ env: - BUILD_DOCS=false - TEST_ARGS=--no-pep8 - NUMPY=numpy + - NPROC=2 language: python @@ -69,7 +70,7 @@ script: # The number of processes is hardcoded, because using too many causes the # Travis VM to run out of memory (since so many copies of inkscape and # ghostscript are running at the same time). - - echo Testing using 8 processes + - echo Testing using $NPROC processes # Generate the font caches in a single process before starting the # multiple processes - gcc --version @@ -79,7 +80,7 @@ script: export MPL_REPO_DIR=$PWD # needed for pep8-conformance test of the examples mkdir ../tmp_test_dir cd ../tmp_test_dir - gdb -return-child-result -batch -ex r -ex bt --args python ../matplotlib/tests.py -sv --processes=2 --process-timeout=300 $TEST_ARGS + gdb -return-child-result -batch -ex r -ex bt --args python ../matplotlib/tests.py -sv --processes=$NPROC --process-timeout=300 $TEST_ARGS else cd doc python make.py html --small --warningsaserrors From 7e741cefe3e6f2f25f3482f88ba179a30a1bd72d Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Tue, 21 Apr 2015 09:56:41 -0400 Subject: [PATCH 8/9] TST : squelch gcc output, now at the top of logs --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e96070a70186..614c8bfd9096 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,6 @@ script: - echo Testing using $NPROC processes # Generate the font caches in a single process before starting the # multiple processes - - gcc --version - python -c "from matplotlib import font_manager" - | if [[ $BUILD_DOCS == false ]]; then From 31d21dfb09a860a4b5b6f25d5cf385ea98866ce1 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Tue, 21 Apr 2015 22:14:53 -0400 Subject: [PATCH 9/9] TST : update cursive font download location - get Felipa-Regular from github instead of (dying) googlecode - Also remove outdated comment --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 614c8bfd9096..5375f5142034 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,6 @@ matrix: install: - pip install -q --use-mirrors nose python-dateutil $NUMPY pep8 pyparsing pillow sphinx!=1.3.0 - # We use --no-install-recommends to avoid pulling in additional large latex docs that we don't need # We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not # availible in the Ubuntu version used by Travis but we can manually install the deb from a later @@ -56,7 +55,7 @@ install: - | if [[ $BUILD_DOCS == true ]]; then pip install numpydoc linkchecker ipython jsonschema mistune - wget https://googlefontdirectory.googlecode.com/hg/ofl/felipa/Felipa-Regular.ttf + wget https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true wget http://mirrors.kernel.org/ubuntu/pool/universe/f/fonts-humor-sans/fonts-humor-sans_1.0-1_all.deb mkdir -p tmp dpkg -x fonts-humor-sans_1.0-1_all.deb tmp