Drop py27 and add py38 jobs

- Dropping py27 as is out of support
- Enable py38 testing, already default python on several distros.
- removes six as a dependency as is no longer needed for pure py3

Change-Id: I1e825073abc6cd55aa2fdc363358f2701152c57b
This commit is contained in:
Sorin Sbarnea 2020-05-19 18:05:50 +01:00
parent 8f709c1d67
commit 97ca1c24c3
9 changed files with 12 additions and 19 deletions

View File

@ -3,17 +3,16 @@
templates:
- openstack-python36-jobs
- openstack-python37-jobs
- openstack-python38-jobs
- publish-tox-docs-infra
check:
jobs:
- elastic-recheck-tox-queries:
voting: false
- openstack-tox-linters
- openstack-tox-py27
gate:
jobs:
- openstack-tox-linters
- openstack-tox-py27
- job:
name: elastic-recheck-tox-queries

View File

@ -14,7 +14,7 @@
import os
import re
from six.moves import configparser
import configparser
DEFAULT_INDEX_FORMAT = 'logstash-%Y.%m.%d'

View File

@ -19,7 +19,7 @@ by elastic recheck to talk with elastic search.
"""
import json
from six.moves.urllib.parse import quote as urlquote
from urllib.parse import quote as urlquote
def generic(raw_query, facet=None):

View File

@ -13,7 +13,7 @@
# under the License.
import gerritlib
from six.moves import configparser
import configparser
import testtools
from elastic_recheck import elasticRecheck

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from six.moves import configparser
import configparser
import unittest
import yaml

View File

@ -11,7 +11,7 @@
# under the License.
import json
from six import StringIO
from io import StringIO
import sys
import mock

View File

@ -1,23 +1,15 @@
pbr>=1.8
six
python-dateutil>=2.0
pytz
pyelasticsearch<1.0
gerritlib
python-daemon>=2.2.0
# NOTE(mriedem): irc 17.0 dropped support for py2 so use a capped version in
# that case.
irc>=15.0.1,<17.0;python_version<'3.4'
irc>=17.0;python_version>='3.4'
irc>=17.0
pyyaml
lockfile
Babel>=0.9.6
lazr.restfulclient>=0.14.2 # LGPL
httplib2>=0.12.0 # MIT License
# NOTE(mriedem): launchpadlib has an uncapped dependency on keyring which
# dropped support for python2.7 in version 19.0.0 so for py27 environments we
# have to explicitly install a capped version of keyring first.
keyring<19.0.0;python_version=='2.7'
launchpadlib>=1.10.6 # LGPL
Jinja2
requests

View File

@ -13,11 +13,13 @@ 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
Programming Language :: Python :: 3.8
[options]
python_requires = >=3.6
[files]
packages =

View File

@ -1,6 +1,6 @@
[tox]
minversion = 1.6
envlist = linters,py38,py37,py36,py27,queries,docs
envlist = linters,py38,py37,py36,queries,docs
skipsdist = True
[testenv]