Change env names to be consistent. Up deps and fix the pypy3 sed.

ci/templates/tox.ini

@@ -1,23 +1,23 @@
 [tox]
 envlist =
-    {2.7,3.6}-{{ '{' }}{{ tox_environments|sort|join(',') }}{{ '}' }}
+    {py27,py36}-{{ '{' }}{{ tox_environments|sort|join(',') }}{{ '}' }}
 skipsdist = true
 
 [testenv]
 passenv =
     *
 basepython =
-    2.7: python2.7
-    3.6: python3.6
+    py27: python2.7
+    py36: python3.6
 envdir =
-    2.7: {toxworkdir}/2.7
-    3.6: {toxworkdir}/3.6
+    py27: {toxworkdir}/py27
+    py36: {toxworkdir}/py36
 deps =
-    cookiecutter==1.5.1
+    cookiecutter==1.6.0
     bumpversion==0.5.3
-    tox==2.7.0
+    tox==3.5.2
 
-{% for py in ['2.7', '3.6'] %}
+{% for py in ['py27', 'py36'] %}
 {% for env, config in tox_environments|dictsort %}
 [testenv:{{ py }}-{{env}}]
 commands =

ci/test.sh

@@ -31,5 +31,5 @@ bumpversion minor
 bumpversion major
 safe_sed 's/sphinx-build -b linkcheck/#/' tox.ini
 safe_sed 's/,py37,/,/' tox.ini
-safe_sed 's/,pypy3,/,/' tox.ini
+safe_sed 's/,pypy3}/}/' tox.ini
 tox