Upgrade tox to 3.14.0

paulocheque · Sep 5, 2019 · 4806955 · 4806955
1 parent 4f8467b
commit 4806955
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ prepare:
 	#clear ; virtualenv env -p python3.5
 
 os_deps:
-	brew install gdal --HEAD
+	brew install gdal
 
 deps:
 	clear
@@ -37,7 +37,7 @@ test:
 build: clean prepare os_deps deps test
 
 tox:
-	clear ; time tox
+	clear ; time env/bin/tox
 
 push: test
 	clear ; git push origin master

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,4 +1,4 @@
-tox==2.6.0
+tox==3.14.0
 
 psycopg2==2.7 # For tests with Postgres fields
 #or psycopg2cffi==2.7.5 # For pypy

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
     'django-nose==1.4.5',
     'coverage==3.7.1',
     'django-coverage==1.2.4',
-    'tox==2.6.0',
+    'tox==3.14.0',
     'flake8==2.1.0',
     'pyflakes==1.5.0',
     'pylint==1.6.5',