Drop py27 support
This bumps jobs to the current usurri template and drops compatibility code for Python 2.7. Change-Id: Ida03f9cca7d276ed8a449d21c0ba58330916e7d9 Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
parent
f74f393218
commit
c9a5abaa8e
@ -1,5 +1,4 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python-jobs
|
- openstack-python3-ussuri-jobs
|
||||||
- openstack-python3-train-jobs
|
|
||||||
- publish-openstack-docs-pti
|
- publish-openstack-docs-pti
|
||||||
|
@ -14,8 +14,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import os
|
import os
|
||||||
import platform
|
import platform
|
||||||
|
@ -13,8 +13,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from jinja2 import contextfilter
|
from jinja2 import contextfilter
|
||||||
|
@ -14,8 +14,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
from contextlib import closing
|
from contextlib import closing
|
||||||
from contextlib import contextmanager
|
from contextlib import contextmanager
|
||||||
from email.parser import HeaderParser
|
from email.parser import HeaderParser
|
||||||
@ -23,17 +21,15 @@ import os
|
|||||||
import shutil
|
import shutil
|
||||||
import tarfile
|
import tarfile
|
||||||
import tempfile
|
import tempfile
|
||||||
|
import urllib
|
||||||
import zipfile
|
import zipfile
|
||||||
|
|
||||||
import six
|
|
||||||
from six.moves.urllib.request import urlopen
|
|
||||||
|
|
||||||
|
|
||||||
def _download_file(url, dest_dir, dest_filename):
|
def _download_file(url, dest_dir, dest_filename):
|
||||||
"""download a given url to a given destination directory and
|
"""download a given url to a given destination directory and
|
||||||
destination filenamee"""
|
destination filenamee"""
|
||||||
filename = os.path.join(dest_dir, dest_filename)
|
filename = os.path.join(dest_dir, dest_filename)
|
||||||
with closing(urlopen(url)) as response: # nosec
|
with closing(urllib.urlopen(url)) as response: # nosec
|
||||||
with open(filename, 'wb') as f:
|
with open(filename, 'wb') as f:
|
||||||
while True:
|
while True:
|
||||||
buf = response.read(8192)
|
buf = response.read(8192)
|
||||||
@ -68,7 +64,7 @@ def _extract_archive_to_tempdir(archive_filename):
|
|||||||
def _find_archives(directories, basename):
|
def _find_archives(directories, basename):
|
||||||
"""return a list of archives in the given directories
|
"""return a list of archives in the given directories
|
||||||
or an empty list if no archive(s) can be found"""
|
or an empty list if no archive(s) can be found"""
|
||||||
if isinstance(directories, six.string_types):
|
if isinstance(directories, str):
|
||||||
directories = [directories]
|
directories = [directories]
|
||||||
|
|
||||||
return sorted(
|
return sorted(
|
||||||
|
@ -14,8 +14,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
from packaging.requirements import Requirement
|
from packaging.requirements import Requirement
|
||||||
from packaging.version import Version
|
from packaging.version import Version
|
||||||
|
|
||||||
|
@ -5,4 +5,3 @@ pymod2pkg!=0.8.0,>=0.7.0 # Apache-2.0
|
|||||||
Jinja2>=2.10 # BSD License (3 clause)
|
Jinja2>=2.10 # BSD License (3 clause)
|
||||||
PyYAML>=3.10 # MIT
|
PyYAML>=3.10 # MIT
|
||||||
packaging>=16.5 # Apache-2.0
|
packaging>=16.5 # Apache-2.0
|
||||||
six>=1.10.0 # MIT
|
|
||||||
|
@ -14,8 +14,6 @@ classifier =
|
|||||||
License :: OSI Approved :: Apache Software License
|
License :: OSI Approved :: Apache Software License
|
||||||
Operating System :: POSIX :: Linux
|
Operating System :: POSIX :: Linux
|
||||||
Programming Language :: Python
|
Programming Language :: Python
|
||||||
Programming Language :: Python :: 2
|
|
||||||
Programming Language :: Python :: 2.7
|
|
||||||
Programming Language :: Python :: 3
|
Programming Language :: Python :: 3
|
||||||
Programming Language :: Python :: 3.6
|
Programming Language :: Python :: 3.6
|
||||||
Programming Language :: Python :: 3.7
|
Programming Language :: Python :: 3.7
|
||||||
|
6
tox.ini
6
tox.ini
@ -1,10 +1,11 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = py27,py37,pypy,pep8
|
envlist = py37,pypy,pep8
|
||||||
minversion = 2.0
|
minversion = 2.0
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
|
basepython = python3
|
||||||
install_command = pip install {opts} {packages}
|
install_command = pip install {opts} {packages}
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
OS_STDOUT_NOCAPTURE=False
|
OS_STDOUT_NOCAPTURE=False
|
||||||
@ -17,7 +18,6 @@ deps =
|
|||||||
commands = stestr run {posargs}
|
commands = stestr run {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
|
||||||
deps = {[testenv]deps}
|
deps = {[testenv]deps}
|
||||||
flake8<3.8.0,>=3.7.0
|
flake8<3.8.0,>=3.7.0
|
||||||
bandit>=1.1.0
|
bandit>=1.1.0
|
||||||
@ -26,14 +26,12 @@ commands =
|
|||||||
bandit -r -s B701 renderspec -x tests
|
bandit -r -s B701 renderspec -x tests
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build
|
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
basepython = python3
|
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
commands =
|
commands =
|
||||||
python setup.py build_sphinx
|
python setup.py build_sphinx
|
||||||
|
Loading…
Reference in New Issue
Block a user