stripping repo/proj

RyanBalfanz · Jan 5, 2015 · 245c881 · 245c881
1 parent d174bdb
commit 245c881
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,12 @@
 language: python
 
 python:
-  - "2.6"
-  - "2.7"
+  - "3.4"
 
 env:
-#  - DJANGO=1.4
-#  - DJANGO=1.5
-  - DJANGO_SETTINGS_MODULE=example_project.settings.test
+  - DJANGO_SETTINGS_MODULE=example_project.settings
 
 install:
-#  - pip install Django==$DJANGO --use-mirrors
-#  - python setup.py develop
   - pip install . --use-mirrors
   - pip install -r requirements.txt --use-mirrors
 

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,2 @@
 [tox]
-envlist = py26,py27
-
-[testenv]
-deps=pytest       # install pytest in the venvs
-commands=py.test  # or 'nosetests' or ...
+envlist = py34