Merge "Remove py35 support"
This commit is contained in:
commit
03634de6c8
@ -12,7 +12,6 @@
|
|||||||
|
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python35-jobs
|
|
||||||
- openstack-python36-jobs
|
- openstack-python36-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
check:
|
check:
|
||||||
|
2
Makefile
2
Makefile
@ -52,7 +52,7 @@ security:
|
|||||||
# Run all unit tests under pegleg
|
# Run all unit tests under pegleg
|
||||||
.PHONY: run_tests
|
.PHONY: run_tests
|
||||||
run_tests:
|
run_tests:
|
||||||
tox -e py35
|
tox -e py36
|
||||||
|
|
||||||
# Perform Linting
|
# Perform Linting
|
||||||
.PHONY: lint
|
.PHONY: lint
|
||||||
|
@ -72,8 +72,7 @@ Pegleg strives to conform to the `Airship coding conventions`_.
|
|||||||
Python
|
Python
|
||||||
------
|
------
|
||||||
|
|
||||||
The Pegleg code base lives under ``pegleg``. Pegleg supports py35 and py36
|
The Pegleg code base lives under ``pegleg``. Pegleg supports py36 interpreter.
|
||||||
interpreters.
|
|
||||||
|
|
||||||
Docker
|
Docker
|
||||||
------
|
------
|
||||||
@ -103,8 +102,8 @@ directory):
|
|||||||
|
|
||||||
# Quick way of building a venv and installing all required dependencies into
|
# Quick way of building a venv and installing all required dependencies into
|
||||||
# it.
|
# it.
|
||||||
tox -e py35 --notest
|
tox -e py36 --notest
|
||||||
source .tox/py35/bin/activate
|
source .tox/py36/bin/activate
|
||||||
pip install -e .
|
pip install -e .
|
||||||
|
|
||||||
# Now is it possible to run the Pegleg CLI to test local changes:
|
# Now is it possible to run the Pegleg CLI to test local changes:
|
||||||
@ -129,11 +128,11 @@ Unit Tests
|
|||||||
|
|
||||||
To run all unit tests, execute::
|
To run all unit tests, execute::
|
||||||
|
|
||||||
$ tox -epy35
|
$ tox -epy36
|
||||||
|
|
||||||
To run unit tests using a regex, execute::
|
To run unit tests using a regex, execute::
|
||||||
|
|
||||||
$ tox -epy35 -- <regex>
|
$ tox -epy36 -- <regex>
|
||||||
|
|
||||||
.. _Airship: https://airshipit.readthedocs.io
|
.. _Airship: https://airshipit.readthedocs.io
|
||||||
.. _Deckhand: https://airship-deckhand.readthedocs.io/
|
.. _Deckhand: https://airship-deckhand.readthedocs.io/
|
||||||
|
31
tox.ini
31
tox.ini
@ -1,19 +1,18 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = py35, py36, pep8, docs, cover
|
envlist = py36,pep8,docs,cover
|
||||||
minversion = 2.3.1
|
minversion = 2.3.1
|
||||||
# Allows docs to be built without setup.py having to exist. Requires that
|
|
||||||
# usedevelop be False as well (which it is by default).
|
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
usedevelop = True
|
||||||
LANGUAGE=en_US
|
setenv =
|
||||||
LC_ALL=en_US.utf-8
|
VIRTUAL_ENV={envdir}
|
||||||
passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY
|
LANGUAGE=en_US
|
||||||
|
LC_ALL=en_US.utf-8
|
||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
basepython=python3
|
passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
|
||||||
whitelist_externals =
|
whitelist_externals =
|
||||||
find
|
find
|
||||||
commands =
|
commands =
|
||||||
@ -21,19 +20,19 @@ commands =
|
|||||||
{toxinidir}/tools/gate/run-unit-tests.sh '{posargs}'
|
{toxinidir}/tools/gate/run-unit-tests.sh '{posargs}'
|
||||||
|
|
||||||
[testenv:fmt]
|
[testenv:fmt]
|
||||||
basepython=python3
|
basepython = python3
|
||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands =
|
commands =
|
||||||
yapf --style=pep8 -ir {toxinidir}/pegleg {toxinidir}/tests
|
yapf --style=pep8 -ir {toxinidir}/pegleg {toxinidir}/tests
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython=python3
|
basepython = python3
|
||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands =
|
commands =
|
||||||
flake8 {toxinidir}/pegleg
|
bandit -r pegleg -n 5
|
||||||
bandit -r pegleg -n 5
|
flake8 {toxinidir}/pegleg
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
@ -41,10 +40,12 @@ deps =
|
|||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/doc/requirements.txt
|
-r{toxinidir}/doc/requirements.txt
|
||||||
commands =
|
commands =
|
||||||
{toxinidir}/tools/gate/build-docs.sh
|
bash -c "{toxinidir}/tools/gate/build-docs.sh"
|
||||||
|
whitelist_externals =
|
||||||
|
bash
|
||||||
|
|
||||||
[testenv:bandit]
|
[testenv:bandit]
|
||||||
basepython=python3
|
basepython = python3
|
||||||
commands = bandit -r pegleg -n 5
|
commands = bandit -r pegleg -n 5
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
|
Loading…
Reference in New Issue
Block a user