bug 1352232: Less Travis-specific environment

Drop PYTHONPATH, CFLAGS, and DEBIAN_FRONTED from the environment overrides.
mdn · May 17, 2017 · e6d8b66 · e6d8b66
1 parent f29abbe
commit e6d8b66
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,10 +16,8 @@ services:
     - mysql
 env:
     global:
-        - CFLAGS=-O0
         - DATABASE_URL=mysql://root:@127.0.0.1:3306/kuma
         - DJANGO_SETTINGS_MODULE=kuma.settings.travis
-        - DEBIAN_FRONTEND=noninteractive
         - DOCKER_COMPOSE_VERSION=1.9.0
           # ES_VERSION must come before ES_DOWNLOAD_URL
         - ES_VERSION=2.4.5

diff --git a/scripts/docker-compose.travis.yml b/scripts/docker-compose.travis.yml
@@ -6,8 +6,6 @@ services:
       dockerfile: Dockerfile-base
     environment:
       - DJANGO_SETTINGS_MODULE
-      - DEBIAN_FRONTEND
-      - CFLAGS
 
   web:
     <<: *worker

diff --git a/tox.ini b/tox.ini
@@ -10,15 +10,11 @@ commands =
     make compilejsi18n collectstatic clean
     py.test --no-migrations --cov=kuma kuma
 setenv =
-    PYTHONPATH = .
-    CFLAGS = -O0
     # TODO: remove once http://bugzil.la/1127798 is fixed
     PYTHONHASHSEED = 0
 passenv =
-    DJANGO_SETTINGS_MODULE
-    DEBIAN_FRONTEND
-    CFLAGS
     DATABASE_URL
+    DJANGO_SETTINGS_MODULE
     PIPELINE_*
 
 [testenv:flake8]