Python3

.travis.yml

@@ -1,22 +1,24 @@
 language: python
 
-python:
-  - '2.7'
-  - '3.3'
-  - '3.4'
-
 env:
   global:
     # $TRANSIFEX_PASSWORD for oscar_bot (used in transifex.sh)
     secure: FuIlzEsGJiAwhaIRBmRNsq9eXmuzs25fX6BChknW4lDyVAySWMp0+Zps9Bd0JgfFYUG3Ip+OTmksYIoTUsG25ZJS9cq1IFt3QKUAN70YCI/4ZBLeIdICPEyxq+Km179+NeEXmBUug17RLMLxh3MWfO+RKUHK9yHIPNNpq0dNyoo=
-  matrix:
-    - DJANGO_VERSION=1.5.8
-    - DJANGO_VERSION=1.6.5
 
 matrix:
-  allow_failures:
-    - python: '3.3'
-    - python: '3.4'
+  include:
+    - python: "2.7"
+      env: DJANGO_VERSION=1.5.8
+    - python: "2.7"
+      env: DJANGO_VERSION=1.6.5
+    - python: "3.3"
+      env: DJANGO_VERSION=1.5.8 SKIP_DEMO_SITE=1
+    - python: "3.3"
+      env: DJANGO_VERSION=1.6.5 SKIP_DEMO_SITE=1
+    - python: "3.4"
+      env: DJANGO_VERSION=1.5.8 SKIP_DEMO_SITE=1
+    - python: "3.4"
+      env: DJANGO_VERSION=1.6.5 SKIP_DEMO_SITE=1
 
 install:
   - easy_install Django==$DJANGO_VERSION
@@ -29,8 +31,7 @@ before_script:
   - psql -c 'create database oscar_demo;' -U postgres
   - psql -c 'CREATE EXTENSION postgis; CREATE EXTENSION postgis_topology;' -U postgres -d oscar_demo
 
-script:
-  - make travis
+script: make travis
 
 after_success:
   - coveralls

Makefile

@@ -82,7 +82,8 @@ testmigrations:
 # (instead of upgrade) because we install Django in the .travis.yml
 # and upgrade would overwrite it.  We also build the sandbox as part of this target
 # to catch any errors that might come from that build process.
-travis: install lint coverage sandbox demo testmigrations
+travis: install lint coverage sandbox testmigrations
+	if [ -z "$(SKIP_DEMO_SITE)" ]; then make demo; fi
 
 messages:
 	# Create the .po files used for i18n

requirements_demo.txt

@@ -9,7 +9,4 @@ psycopg2==2.5.1
 # To use Solr, we need pysolr
 pysolr==3.1
 
-lxml==3.2.4
-cssselect==0.9.1
-BeautifulSoup==3.2.1
 raven==4.0.3