From 99003f72e08b7e8a85d1c9ae64ee5ea3e2c28e0f Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Tue, 25 Mar 2014 15:01:01 +0100
Subject: [PATCH 1/2] Capitalize WMS

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index c4ffd4a67..de8f08720 100644
--- a/README.rst
+++ b/README.rst
@@ -403,7 +403,7 @@ should configure the layers as this:
         headers:
             Host: the_host_name
 
-The idea is to get the wms server on ``localhost`` and use the ``Host`` header
+The idea is to get the WMS server on ``localhost`` and use the ``Host`` header
 to select the right Apache VirtualHost.
 
 To don't have cache we use the as default the headers:

From 2c60f15441f4e52e00948e421d1ece5480a767fd Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Tue, 25 Mar 2014 16:07:13 +0100
Subject: [PATCH 2/2] Revert "Add eggs cache on S3"

This reverts commit 261a6fdb31530bc84739d202a41f5bf04bd76ab8.
---
 .travis.yml         | 36 ++++++++----------------------------
 buildout_travis.cfg |  4 ----
 2 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 buildout_travis.cfg

diff --git a/.travis.yml b/.travis.yml
index ed35dbaaf..24db347a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,22 +7,8 @@ python:
 env:
   global:
   - BERKELEYDB_LIBDIR=/usr/lib/x86_64-linux-gnu BERKELEYDB_INCDIR=/usr/include
-  - BUNDLE_ARCHIVE="tilecloud_chain"
-  - AWS_S3_REGION="eu-west-1"
-  - AWS_S3_BUCKET="sbrunner-travis"
-  - secure: eweCyRupGDD0En9a3aXxO5QY8WO2xxMmUr42DdSUndOtbLk4GAo6ieZT77Pl91gwhh27WRMVoQQzByrNuQy/jEM+EA9Xoxy+KYqasfi7mbF7kWZ1HNEaAdqTi6RosihXmIoaaeMrjy+/gULSDgtOPDhompU4qaWfPnz1MjCRg7k=
 
 before_install:
-- ssh-keygen -t rsa -C your_email@youremail.com -P '' -f ~/.ssh/id_rsa
-- cat /home/travis/.ssh/id_rsa.pub >> /home/travis/.ssh/authorized_keys
-- ln -s /home/travis/.ssh/authorized_keys /home/travis/.ssh/authorized_keys2
-- echo "Host localhost" >> /home/travis/.ssh/config
-- echo "    StrictHostKeyChecking no" >> /home/travis/.ssh/config
-- chmod g-rw,o-rw  ~/.ssh/*
-
-- chmod 644 ~/.bashrc
-- echo "PATH=${PATH}" > ~/.bashrc
-
 - echo 'yes' | sudo add-apt-repository ppa:stephane-brunner/precise
 - echo 'yes' | sudo add-apt-repository ppa:mapnik/v2.2.0
 - sudo apt-get update
@@ -31,14 +17,12 @@ before_install:
 - sudo cp tilecloud_chain/tests/apache.conf /etc/apache2/sites-enabled/apache.conf
 - sudo apache2ctl graceful
 
-- mkdir ~/.aws
-- echo [default] > ~/.aws/config
-- echo aws_access_key_id=${AWS_S3_KEY} >> ~/.aws/config
-- echo aws_secret_access_key=${AWS_S3_SECRET} >> ~/.aws/config
-- sudo pip install awscli
-- aws s3 sync s3://${AWS_S3_BUCKET}/${BUNDLE_ARCHIVE}/buildout-${TRAVIS_PYTHON_VERSION}/ buildout/
-- chmod +x ./buildout/bin/*
-- aws s3 sync s3://${AWS_S3_BUCKET}/${BUNDLE_ARCHIVE}/mapnik-${TRAVIS_PYTHON_VERSION}/ ${HOME}/virtualenv/python${TRAVIS_PYTHON_VERSION}/
+- ssh-keygen -t rsa -C your_email@youremail.com -P '' -f ~/.ssh/id_rsa
+- cat /home/travis/.ssh/id_rsa.pub >> /home/travis/.ssh/authorized_keys
+- ln -s /home/travis/.ssh/authorized_keys /home/travis/.ssh/authorized_keys2
+- echo "Host localhost" >> /home/travis/.ssh/config
+- echo "    StrictHostKeyChecking no" >> /home/travis/.ssh/config
+- chmod g-rw,o-rw /home/travis/.ssh/*
 
 - sudo tilecloud_chain/tests/create-deploy.sh
 
@@ -46,18 +30,14 @@ before_install:
 - sudo chmod g+s,o+w /tmp/tests
 
 install:
-- pip install -U mapnik2==2.2.0
+- pip install -U mapnik2==2.2.0 --use-mirrors
 - python bootstrap.py -v 1.7.1
-- ./buildout/bin/buildout -c buildout_travis.cfg
+- ./buildout/bin/buildout 
 
 script:
 - find tilecloud_chain -name \*.py | xargs ./buildout/bin/flake8 --max-line-length=120
 - ./buildout/bin/python setup.py nosetests
 
-after_script:
-- aws s3 sync --delete --exclude *.pyc buildout/ s3://${AWS_S3_BUCKET}/${BUNDLE_ARCHIVE}/buildout-${TRAVIS_PYTHON_VERSION}/
-- aws s3 sync --delete --exclude *.pyc --exclude lib/python${TRAVIS_PYTHON_VERSION}/site-packages/mapnik/demo ${HOME}/virtualenv/python${TRAVIS_PYTHON_VERSION}/ s3://${AWS_S3_BUCKET}/${BUNDLE_ARCHIVE}/mapnik-${TRAVIS_PYTHON_VERSION}/
-
 after_success:
 # Report coverage results to coveralls.io
 - pip install coveralls
diff --git a/buildout_travis.cfg b/buildout_travis.cfg
deleted file mode 100644
index 1d45a3c63..000000000
--- a/buildout_travis.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[buildout]
-extends = buildout.cfg
-extensions += buildout.eggscleaner
-old-eggs-directory = old