Merge pull request #410 from magopian/732529-dict-langpack-css-spacing

Add some spacing in the dictionnaries and langpacks page (bug 732529)

.travis.yml

@@ -1,4 +1,5 @@
 language: python
+sudo: false
 python:
   - "2.6"
 env:
@@ -11,9 +12,8 @@ env:
 services:
   - memcached
 before_install:
-  - sudo apt-get install swig
-  - wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.deb && sudo dpkg -i elasticsearch-1.3.2.deb
-  - sudo /usr/share/elasticsearch/bin/elasticsearch -d -D es.path.data=/tmp -D es.gateway.type=none -D es.index.store.type=memory -D es.discovery.zen.ping.multicast.enabled=false
+  - scripts/travis_es.sh
+  - /tmp/elasticsearch/elasticsearch-1.3.2/bin/elasticsearch -d -D es.path.data=/tmp -D es.gateway.type=none -D es.index.store.type=memory -D es.discovery.zen.ping.multicast.enabled=false
 install:
   - pip install tox
 before_script:
@@ -26,3 +26,7 @@ notifications:
       - "irc.mozilla.org#amo-bots"
     on_success: change
     on_failure: always
+cache:
+  directories:
+    - /tmp/elasticsearch
+    - /tmp/pip-cache

Makefile

@@ -68,13 +68,7 @@ update_code:
 	$(FIG_PREFIX) git checkout master && git pull
 
 update_deps:
-ifeq ($(UNAME_S),Linux)
-	$(FIG_PREFIX) DEB_HOST_MULTIARCH=x86_64-linux-gnu pip install -I --exists-action=w "git+git://anonscm.debian.org/collab-maint/m2crypto.git@debian/0.21.1-3#egg=M2Crypto"
-else
-	$(FIG_PREFIX) pip install --find-links https://pyrepo.addons.mozilla.org/ --exists-action=w --download-cache=/tmp/pip-cache "m2crypto==0.21.1"
-endif
-
-	$(FIG_PREFIX) pip install --no-deps --exists-action=w --download-cache=/tmp/pip-cache -r requirements/dev.txt --find-links https://pyrepo.addons.mozilla.org/
+	$(FIG_PREFIX) pip install --no-deps --exists-action=w --download-cache=/tmp/pip-cache -r requirements/dev.txt --find-links https://pyrepo.addons.mozilla.org/wheelhouse/
 	$(FIG_PREFIX) npm install
 
 update_db:

requirements/compiled.txt

@@ -1,7 +1,11 @@
+# These should all be in our wheelhouse to avoid compiling on production and
+# automated testing machines.
+
 Jinja2==2.7.2
 MarkupSafe==0.18
 lxml==2.2.6
 Pillow==2.3.0
+m2crypto==0.22.3
 
 # For the addon validator, including C speedups.
 simplejson==2.3.2

scripts/travis_es.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+TARGET="/tmp/elasticsearch"
+
+if [ ! -f "$TARGET/elasticsearch-1.2.4/bin/elasticsearch" ]; then
+    echo "$TARGET not found. Building..."
+    pushd $TARGET
+    wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.tar.gz
+    tar xvf elasticsearch-1.3.2.tar.gz
+else
+    echo "$TARGET already exists"
+fi

static/css/impala/dictionaries.less

@@ -7,6 +7,12 @@
     tbody {
         td, th {
             width: 25%;
+            p {
+                margin-bottom: 0.5em;
+            }
+            p:last-child {
+                margin-bottom: 0;
+            }
         }
     }
 }

tox.ini

@@ -3,10 +3,9 @@ envlist = es, addons-devhub-editors, main, flake8, docs, assets
 
 [testenv]
 basepython = python2.6
-install_command = pip install --no-deps --exists-action=w --download-cache=/tmp/pip-cache --find-links https://pyrepo.addons.mozilla.org/ {opts} {packages}
+install_command = pip install --no-deps --exists-action=w --download-cache=/tmp/pip-cache --find-links https://pyrepo.addons.mozilla.org/wheelhouse/ {opts} {packages}
 setenv =
     PYTHONPATH=apps
-    DEB_HOST_MULTIARCH=x86_64-linux-gnu  # For M2Crypto on linux.
 whitelist_externals =
     make
     npm
@@ -14,7 +13,6 @@ whitelist_externals =
 [base]
 deps =
     -rrequirements/dev.txt
-    git+git://anonscm.debian.org/collab-maint/m2crypto.git@debian/0.21.1-3#egg=M2Crypto
 
 [testenv:es]
 deps = {[base]deps}