summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTin Lam <tin@irrational.io>2018-10-31 11:37:03 -0500
committerTin Lam <tin@irrational.io>2018-11-07 13:04:34 -0600
commit253b15cc334b8feced04ea5acb150d911451da5b (patch)
treede9e36a07e2c8503865e11e9cd9d936657860da6
parent178c058474fb632806e281673d3eaf6be80fa854 (diff)
Remove py35 support
As the default Docker image support for Pegleg is using py36 as a base image, this patch set simply removes the support for py35. This allows us to use py36 features such as secrets and f-strings without needing to cope with backward compatibility. Change-Id: Ic156ca67d2a0fe6fdc74c2c9da253a1cb8a3f456 Signed-off-by: Tin Lam <tin@irrational.io>
Notes
Notes (review): Code-Review+1: Drew Walters <drewwalters96@gmail.com> Code-Review+2: Matt McEuen <matt.mceuen@att.com> Code-Review+2: Felipe Monteiro <felipe.monteiro@att.com> Workflow+1: Felipe Monteiro <felipe.monteiro@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sun, 11 Nov 2018 22:22:13 +0000 Reviewed-on: https://review.openstack.org/614584 Project: openstack/airship-pegleg Branch: refs/heads/master
-rw-r--r--.zuul.yaml1
-rw-r--r--Makefile2
-rw-r--r--doc/source/developer-overview.rst11
-rw-r--r--tox.ini31
4 files changed, 22 insertions, 23 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 50c23ce..870b68e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -12,7 +12,6 @@
12 12
13- project: 13- project:
14 templates: 14 templates:
15 - openstack-python35-jobs
16 - openstack-python36-jobs 15 - openstack-python36-jobs
17 - openstack-cover-jobs 16 - openstack-cover-jobs
18 check: 17 check:
diff --git a/Makefile b/Makefile
index 5ede898..9a70e45 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ security:
52# Run all unit tests under pegleg 52# Run all unit tests under pegleg
53.PHONY: run_tests 53.PHONY: run_tests
54run_tests: 54run_tests:
55 tox -e py35 55 tox -e py36
56 56
57# Perform Linting 57# Perform Linting
58.PHONY: lint 58.PHONY: lint
diff --git a/doc/source/developer-overview.rst b/doc/source/developer-overview.rst
index c4c2671..a1e5d08 100644
--- a/doc/source/developer-overview.rst
+++ b/doc/source/developer-overview.rst
@@ -72,8 +72,7 @@ Pegleg strives to conform to the `Airship coding conventions`_.
72Python 72Python
73------ 73------
74 74
75The Pegleg code base lives under ``pegleg``. Pegleg supports py35 and py36 75The Pegleg code base lives under ``pegleg``. Pegleg supports py36 interpreter.
76interpreters.
77 76
78Docker 77Docker
79------ 78------
@@ -103,8 +102,8 @@ directory):
103 102
104 # Quick way of building a venv and installing all required dependencies into 103 # Quick way of building a venv and installing all required dependencies into
105 # it. 104 # it.
106 tox -e py35 --notest 105 tox -e py36 --notest
107 source .tox/py35/bin/activate 106 source .tox/py36/bin/activate
108 pip install -e . 107 pip install -e .
109 108
110 # Now is it possible to run the Pegleg CLI to test local changes: 109 # Now is it possible to run the Pegleg CLI to test local changes:
@@ -129,11 +128,11 @@ Unit Tests
129 128
130To run all unit tests, execute:: 129To run all unit tests, execute::
131 130
132 $ tox -epy35 131 $ tox -epy36
133 132
134To run unit tests using a regex, execute:: 133To run unit tests using a regex, execute::
135 134
136 $ tox -epy35 -- <regex> 135 $ tox -epy36 -- <regex>
137 136
138.. _Airship: https://airshipit.readthedocs.io 137.. _Airship: https://airshipit.readthedocs.io
139.. _Deckhand: https://airship-deckhand.readthedocs.io/ 138.. _Deckhand: https://airship-deckhand.readthedocs.io/
diff --git a/tox.ini b/tox.ini
index caa91d2..bb2ce13 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,18 @@
1[tox] 1[tox]
2envlist = py35, py36, pep8, docs, cover 2envlist = py36,pep8,docs,cover
3minversion = 2.3.1 3minversion = 2.3.1
4# Allows docs to be built without setup.py having to exist. Requires that
5# usedevelop be False as well (which it is by default).
6skipsdist = True 4skipsdist = True
7 5
8[testenv] 6[testenv]
9setenv = VIRTUAL_ENV={envdir} 7usedevelop = True
10 LANGUAGE=en_US 8setenv =
11 LC_ALL=en_US.utf-8 9 VIRTUAL_ENV={envdir}
12passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY 10 LANGUAGE=en_US
11 LC_ALL=en_US.utf-8
13deps = 12deps =
14 -r{toxinidir}/requirements.txt 13 -r{toxinidir}/requirements.txt
15 -r{toxinidir}/test-requirements.txt 14 -r{toxinidir}/test-requirements.txt
16basepython=python3 15passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
17whitelist_externals = 16whitelist_externals =
18 find 17 find
19commands = 18commands =
@@ -21,19 +20,19 @@ commands =
21 {toxinidir}/tools/gate/run-unit-tests.sh '{posargs}' 20 {toxinidir}/tools/gate/run-unit-tests.sh '{posargs}'
22 21
23[testenv:fmt] 22[testenv:fmt]
24basepython=python3 23basepython = python3
25deps = 24deps =
26 -r{toxinidir}/test-requirements.txt 25 -r{toxinidir}/test-requirements.txt
27commands = 26commands =
28 yapf --style=pep8 -ir {toxinidir}/pegleg {toxinidir}/tests 27 yapf --style=pep8 -ir {toxinidir}/pegleg {toxinidir}/tests
29 28
30[testenv:pep8] 29[testenv:pep8]
31basepython=python3 30basepython = python3
32deps = 31deps =
33 -r{toxinidir}/test-requirements.txt 32 -r{toxinidir}/test-requirements.txt
34commands = 33commands =
35 flake8 {toxinidir}/pegleg 34 bandit -r pegleg -n 5
36 bandit -r pegleg -n 5 35 flake8 {toxinidir}/pegleg
37 36
38[testenv:docs] 37[testenv:docs]
39basepython = python3 38basepython = python3
@@ -41,10 +40,12 @@ deps =
41 -r{toxinidir}/requirements.txt 40 -r{toxinidir}/requirements.txt
42 -r{toxinidir}/doc/requirements.txt 41 -r{toxinidir}/doc/requirements.txt
43commands = 42commands =
44 {toxinidir}/tools/gate/build-docs.sh 43 bash -c "{toxinidir}/tools/gate/build-docs.sh"
44whitelist_externals =
45 bash
45 46
46[testenv:bandit] 47[testenv:bandit]
47basepython=python3 48basepython = python3
48commands = bandit -r pegleg -n 5 49commands = bandit -r pegleg -n 5
49 50
50[testenv:cover] 51[testenv:cover]