Merge "Drop Python2 support"

.zuul.yaml

@@ -33,21 +33,21 @@
       sql: mysql
       use_amqp1: 0
       use_apache: 1
-      use_python3: 0
+      use_python3: 1
       branch_override: default
 
 - job:
-    name: heat-functional-orig-mysql-lbaasv2
+    name: heat-functional-legacy
     parent: heat-functional-devstack-base
     vars:
       disable_convergence: 'true'
 
 - job:
-    name: heat-functional-convg-mysql-lbaasv2
+    name: heat-functional
     parent: heat-functional-devstack-base
 
 - job:
-    name: heat-functional-convg-mysql-lbaasv2-amqp1
+    name: heat-functional-amqp1
     parent: heat-functional-devstack-base
     voting: false
     branches: master
@@ -55,18 +55,12 @@
       use_amqp1: 1
 
 - job:
-    name: heat-functional-convg-mysql-lbaasv2-non-apache
+    name: heat-functional-non-apache
     parent: heat-functional-devstack-base
     voting: false
     vars:
       use_apache: 0
 
-- job:
-    name: heat-functional-convg-mysql-lbaasv2-py3
-    parent: heat-functional-devstack-base
-    vars:
-      use_python3: 1
-
 - job:
     name: grenade-heat
     parent: legacy-dsvm-base
@@ -105,8 +99,7 @@
     templates:
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
-      - openstack-python-jobs
-      - openstack-python3-train-jobs
+      - openstack-python3-ussuri-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
       - check-requirements
@@ -115,19 +108,17 @@
       jobs:
         - grenade-heat
         - grenade-heat-multinode
-        - heat-functional-orig-mysql-lbaasv2
-        - heat-functional-convg-mysql-lbaasv2
-        - heat-functional-convg-mysql-lbaasv2-amqp1
-        - heat-functional-convg-mysql-lbaasv2-non-apache
-        - heat-functional-convg-mysql-lbaasv2-py3
+        - heat-functional
+        - heat-functional-legacy
+        - heat-functional-amqp1
+        - heat-functional-non-apache
     gate:
       queue: heat
       jobs:
         - grenade-heat
         - grenade-heat-multinode
-        - heat-functional-orig-mysql-lbaasv2
-        - heat-functional-convg-mysql-lbaasv2
-        - heat-functional-convg-mysql-lbaasv2-py3
+        - heat-functional
+        - heat-functional-legacy
     experimental:
       jobs:
         - tripleo-ci-centos-7-scenario002-standalone

releasenotes/notes/python2-7125a4d5b441e7a6.yaml

@@ -0,0 +1,5 @@
+---
+critical:
+  - |
+    Python 2 is no longer supported. This release runs only on Python 3 and is
+    tested only on Python 3.6 and 3.7.

setup.cfg

@@ -13,8 +13,6 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py27,pep8
+envlist = py36,py37,pep8
 minversion = 1.6
 skipsdist = True
 
@@ -12,20 +12,11 @@ install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.ope
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
-  find {toxinidir} -type f -not -path '{toxinidir}/.tox/*' -not -path '*/__pycache__/*' -name '*.py[c|o]' -delete
   stestr run {posargs}
   stestr slowest
 
-whitelist_externals =
-  bash
-  find
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 
-[testenv:py27log]
-commands =
-  find {toxinidir} -type f -not -path '{toxinidir}/.tox/*' -not -path '*/__pycache__/*' -name '*.py[c|o]' -delete
-  stestr run '^(?!heat_integrationtests){posargs}'
-
 [testenv:pep8]
 basepython = python3
 commands =
@@ -57,7 +48,6 @@ setenv =
   PYTHON=coverage run --source heat --parallel-mode
 commands =
   coverage erase
-  find {toxinidir} -not -path '{toxinidir}/.tox/*' -not -path '*/__pycache__/*' -name '*.py[c|o]' -delete
   stestr run {posargs}
   coverage combine
   coverage html -d cover
@@ -76,8 +66,7 @@ basepython = python3
 # This environment is called from CI scripts to test and publish
 # the API Ref to docs.openstack.org.
 deps = -r{toxinidir}/doc/requirements.txt
-whitelist_externals = bash
-                      rm
+whitelist_externals = rm
 commands =
   rm -rf api-ref/build
   sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html