Drop py2 support and clean things up
Change-Id: I0b2afbb3f8ba1da18e2c10e713e5374a3131a7a6
This commit is contained in:
Radosław Piliszek
parent
85eab0cb20
commit
4f299a62c2
48
.travis.yml
48
.travis.yml
|
|
@ -1,48 +0,0 @@
|
|||
dist: trusty
|
||||
sudo: required
|
||||
services:
|
||||
- docker
|
||||
language: python
|
||||
matrix:
|
||||
include:
|
||||
- python: 2.7
|
||||
env: TOXENV=pep8
|
||||
- python: 2.7
|
||||
env: TOXENV=py27
|
||||
- python: pypy
|
||||
env: TOXENV=pypy
|
||||
- python: 3.5
|
||||
env: TOXENV=py35
|
||||
- python: 3.6
|
||||
env: TOXENV=py36
|
||||
- python: 2.7
|
||||
env: TOXENV=py27-codecov
|
||||
- python: 2.7
|
||||
env: TOXENV=py27-etcd
|
||||
- python: pypy
|
||||
env: TOXENV=pypy-etcd
|
||||
- python: 3.5
|
||||
env: TOXENV=py35-etcd
|
||||
- python: 3.6
|
||||
env: TOXENV=py36-etcd
|
||||
allow_failures:
|
||||
- python: pypy
|
||||
env: TOXENV=pypy-etcd
|
||||
- python: 3.5
|
||||
env: TOXENV=py35-etcd
|
||||
- python: 3.6
|
||||
env: TOXENV=py36-etcd
|
||||
|
||||
before_install:
|
||||
- python --version
|
||||
- uname -a
|
||||
- lsb_release -a
|
||||
install:
|
||||
- python -m pip install pip -U
|
||||
- python -m pip install tox coverage coveralls
|
||||
- python -m virtualenv --version
|
||||
- python -m easy_install --version
|
||||
- python -m pip --version
|
||||
- python -m tox --version
|
||||
script:
|
||||
- tox
|
||||
|
|
@ -1,15 +1,12 @@
|
|||
- project:
|
||||
templates:
|
||||
# FIXME: requirements need to be adapted to OpenStack
|
||||
# - check-requirements
|
||||
- check-requirements
|
||||
# FIXME: see https://review.opendev.org/747460
|
||||
# - lib-forward-testing-python3
|
||||
# FIXME: needs cover tox env
|
||||
# - openstack-cover-jobs
|
||||
- openstack-cover-jobs
|
||||
# FIXME: add lower-constraints or drop this
|
||||
# - openstack-lower-constraints-jobs
|
||||
- openstack-python3-wallaby-jobs
|
||||
- periodic-stable-jobs
|
||||
- publish-openstack-docs-pti
|
||||
# FIXME: prepare reno structures
|
||||
# - release-notes-jobs-python3
|
||||
- release-notes-jobs-python3
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
sphinx>=1.5.1 # BSD
|
||||
oslosphinx>=4.7.0 # Apache-2.0
|
||||
openstackdocstheme>=2.2.1 # Apache-2.0
|
||||
reno>=1.8.0 # Apache-2.0
|
||||
|
|
|
|||
|
|
@ -30,10 +30,13 @@
|
|||
# Add any Sphinx extension module names here, as strings. They can be
|
||||
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
|
||||
# ones.
|
||||
extensions = ['sphinx.ext.autodoc',
|
||||
extensions = [
|
||||
'openstackdocstheme',
|
||||
'sphinx.ext.autodoc',
|
||||
'sphinx.ext.intersphinx',
|
||||
'sphinx.ext.todo',
|
||||
'sphinx.ext.viewcode']
|
||||
'sphinx.ext.viewcode',
|
||||
]
|
||||
|
||||
# Add any paths that contain templates here, relative to this directory.
|
||||
templates_path = ['_templates']
|
||||
|
|
@ -74,7 +77,7 @@ language = None
|
|||
exclude_patterns = []
|
||||
|
||||
# The name of the Pygments (syntax highlighting) style to use.
|
||||
pygments_style = 'sphinx'
|
||||
pygments_style = 'native'
|
||||
|
||||
# If true, `todo` and `todoList` produce output, else they produce nothing.
|
||||
todo_include_todos = True
|
||||
|
|
@ -85,7 +88,7 @@ todo_include_todos = True
|
|||
# The theme to use for HTML and HTML Help pages. See the documentation for
|
||||
# a list of builtin themes.
|
||||
#
|
||||
html_theme = 'alabaster'
|
||||
html_theme = 'openstackdocs'
|
||||
|
||||
# Theme options are theme-specific and customize the look and feel of a theme
|
||||
# further. For a list of options available for each theme, see the
|
||||
|
|
@ -160,3 +163,6 @@ texinfo_documents = [
|
|||
|
||||
# Example configuration for intersphinx: refer to the Python standard library.
|
||||
intersphinx_mapping = {'https://docs.python.org/': None}
|
||||
|
||||
# openstackdocstheme options
|
||||
openstackdocs_repo_name = 'openstack/etcd3gw'
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
|
||||
# ones.
|
||||
extensions = [
|
||||
'oslosphinx',
|
||||
'openstackdocstheme',
|
||||
'reno.sphinxext',
|
||||
]
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ exclude_patterns = []
|
|||
# show_authors = False
|
||||
|
||||
# The name of the Pygments (syntax highlighting) style to use.
|
||||
pygments_style = 'sphinx'
|
||||
pygments_style = 'native'
|
||||
|
||||
# A list of ignored prefixes for module index sorting.
|
||||
# modindex_common_prefix = []
|
||||
|
|
@ -111,7 +111,7 @@ pygments_style = 'sphinx'
|
|||
|
||||
# The theme to use for HTML and HTML Help pages. See the documentation for
|
||||
# a list of builtin themes.
|
||||
html_theme = 'default'
|
||||
html_theme = 'openstackdocs'
|
||||
|
||||
# Theme options are theme-specific and customize the look and feel of a theme
|
||||
# further. For a list of options available for each theme, see the
|
||||
|
|
@ -273,3 +273,6 @@ texinfo_documents = [
|
|||
|
||||
# -- Options for Internationalization output ------------------------------
|
||||
locale_dirs = ['locale/']
|
||||
|
||||
# openstackdocstheme options
|
||||
openstackdocs_repo_name = 'openstack/etcd3gw'
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
# process, which may cause wedges in the gate later.
|
||||
|
||||
pbr>=2.0 # Apache-2.0
|
||||
urllib3>=1.15.1 # MIT
|
||||
requests>=2.20.0 # Apache-2.0
|
||||
six>=1.9.0 # MIT
|
||||
futurist>=0.11.0,!=0.15.0 # Apache-2.0
|
||||
futurist>=0.16.0 # Apache-2.0
|
||||
|
|
|
|||
49
setup.cfg
49
setup.cfg
|
|
@ -3,11 +3,11 @@ name = etcd3gw
|
|||
summary = A python client for etcd3 grpc-gateway v3 API
|
||||
description-file =
|
||||
README.md
|
||||
author = Davanum Srinivas
|
||||
author-email = davanum@gmail.com
|
||||
home-page = https://github.com/dims/etcd3-gateway
|
||||
author = OpenStack
|
||||
author-email = openstack-discuss@lists.openstack.org
|
||||
home-page = https://docs.openstack.org/etcd3gw/latest/
|
||||
python-requires = >=3.6
|
||||
classifier =
|
||||
Development Status :: 3 - Alpha
|
||||
Environment :: Console
|
||||
Environment :: OpenStack
|
||||
Intended Audience :: Developers
|
||||
|
|
@ -15,44 +15,13 @@ classifier =
|
|||
License :: OSI Approved :: Apache Software License
|
||||
Operating System :: OS Independent
|
||||
Programming Language :: Python
|
||||
Programming Language :: Python :: 2
|
||||
Programming Language :: Python :: 2.7
|
||||
Programming Language :: Python :: 3
|
||||
Programming Language :: Python :: 3.5
|
||||
Programming Language :: Python :: 3.6
|
||||
Programming Language :: Python :: 3.7
|
||||
Programming Language :: Python :: 3.8
|
||||
Programming Language :: Python :: 3 :: Only
|
||||
Topic :: System :: Distributed Computing
|
||||
|
||||
[files]
|
||||
packages =
|
||||
etcd3gw
|
||||
|
||||
[pbr]
|
||||
warnerrors = True
|
||||
autodoc_index_modules = true
|
||||
autodoc_exclude_modules =
|
||||
etcd3gw.tests.*
|
||||
etcd3gw.examples.*
|
||||
|
||||
[wheel]
|
||||
universal = 1
|
||||
|
||||
[build_sphinx]
|
||||
all-files = 1
|
||||
warning-is-error = 1
|
||||
source-dir = doc/source
|
||||
build-dir = doc/build
|
||||
|
||||
[upload_sphinx]
|
||||
upload-dir = doc/build/html
|
||||
|
||||
[compile_catalog]
|
||||
directory = etcd3gw/locale
|
||||
domain = etcd3gw
|
||||
|
||||
[update_catalog]
|
||||
domain = etcd3gw
|
||||
output_dir = etcd3gw/locale
|
||||
input_file = etcd3gw/locale/etcd3gw.pot
|
||||
|
||||
[extract_messages]
|
||||
keywords = _ gettext ngettext l_ lazy_gettext
|
||||
mapping_file = babel.cfg
|
||||
output_file = etcd3gw/locale/etcd3gw.pot
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ testrepository>=0.0.18 # Apache-2.0/BSD
|
|||
testscenarios>=0.4 # Apache-2.0/BSD
|
||||
testtools>=1.4.0 # MIT
|
||||
pifpaf>=0.10.0 # Apache-2.0
|
||||
codecov>=1.4.0
|
||||
nose>=1.3.7
|
||||
pytest
|
||||
nose>=1.3.7 # GNU LGPL
|
||||
pytest>=3.0.0 # MIT
|
||||
mock>=2.0.0 # BSD
|
||||
urllib3>=1.15.1 # MIT
|
||||
|
|
|
|||
28
tox.ini
28
tox.ini
|
|
@ -1,17 +1,13 @@
|
|||
[tox]
|
||||
minversion = 2.0
|
||||
envlist = py36,py35,py27,pypy,pep8
|
||||
minversion = 3.1.0
|
||||
envlist = py36,py38,pypy,pep8
|
||||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
passenv = TOXENV CI TRAVIS TRAVIS_*
|
||||
usedevelop = True
|
||||
setenv =
|
||||
VIRTUAL_ENV={envdir}
|
||||
PYTHONWARNINGS=default::DeprecationWarning
|
||||
deps =
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = py.test -vv {posargs}
|
||||
|
||||
[testenv:pep8]
|
||||
|
|
@ -20,12 +16,14 @@ commands = flake8 {posargs}
|
|||
[testenv:venv]
|
||||
commands = {posargs}
|
||||
|
||||
[testenv:py27-cover]
|
||||
[testenv:cover]
|
||||
commands =
|
||||
coverage erase
|
||||
python setup.py test --coverage --testr-args='{posargs}'
|
||||
|
||||
[testenv:py27-codecov]
|
||||
[testenv:codecov]
|
||||
deps = {[testenv]deps}
|
||||
codecov>=1.4.0
|
||||
commands =
|
||||
{toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- nosetests --with-coverage --cover-package=etcd3gw --cover-tests
|
||||
codecov
|
||||
|
|
@ -33,17 +31,11 @@ commands =
|
|||
[testenv:docs]
|
||||
deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-r{toxinidir}/doc/requirements.txt
|
||||
commands = python setup.py build_sphinx
|
||||
commands = sphinx-build -W -b html doc/source doc/build/html
|
||||
|
||||
[testenv:pypy-etcd]
|
||||
commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- py.test -vv '{posargs}'
|
||||
|
||||
[testenv:py27-etcd]
|
||||
commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- py.test -vv '{posargs}'
|
||||
|
||||
[testenv:py35-etcd]
|
||||
commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- py.test -vv '{posargs}'
|
||||
|
||||
[testenv:py36-etcd]
|
||||
commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- py.test -vv '{posargs}'
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue