Browse Source

Merge "Remove py35 support"

changes/33/617233/1
Zuul 8 months ago
parent
commit
03634de6c8
4 changed files with 22 additions and 23 deletions
  1. 0
    1
      .zuul.yaml
  2. 1
    1
      Makefile
  3. 5
    6
      doc/source/developer-overview.rst
  4. 16
    15
      tox.ini

+ 0
- 1
.zuul.yaml View File

@@ -12,7 +12,6 @@
12 12
 
13 13
 - project:
14 14
     templates:
15
-      - openstack-python35-jobs
16 15
       - openstack-python36-jobs
17 16
       - openstack-cover-jobs
18 17
     check:

+ 1
- 1
Makefile View File

@@ -52,7 +52,7 @@ security:
52 52
 # Run all unit tests under pegleg
53 53
 .PHONY: run_tests
54 54
 run_tests:
55
-	tox -e py35
55
+	tox -e py36
56 56
 
57 57
 # Perform Linting
58 58
 .PHONY: lint

+ 5
- 6
doc/source/developer-overview.rst View File

@@ -72,8 +72,7 @@ Pegleg strives to conform to the `Airship coding conventions`_.
72 72
 Python
73 73
 ------
74 74
 
75
-The Pegleg code base lives under ``pegleg``. Pegleg supports py35 and py36
76
-interpreters.
75
+The Pegleg code base lives under ``pegleg``. Pegleg supports py36 interpreter.
77 76
 
78 77
 Docker
79 78
 ------
@@ -103,8 +102,8 @@ directory):
103 102
 
104 103
   # Quick way of building a venv and installing all required dependencies into
105 104
   # it.
106
-  tox -e py35 --notest
107
-  source .tox/py35/bin/activate
105
+  tox -e py36 --notest
106
+  source .tox/py36/bin/activate
108 107
   pip install -e .
109 108
 
110 109
   # Now is it possible to run the Pegleg CLI to test local changes:
@@ -129,11 +128,11 @@ Unit Tests
129 128
 
130 129
 To run all unit tests, execute::
131 130
 
132
-  $ tox -epy35
131
+  $ tox -epy36
133 132
 
134 133
 To run unit tests using a regex, execute::
135 134
 
136
-  $ tox -epy35 -- <regex>
135
+  $ tox -epy36 -- <regex>
137 136
 
138 137
 .. _Airship: https://airshipit.readthedocs.io
139 138
 .. _Deckhand: https://airship-deckhand.readthedocs.io/

+ 16
- 15
tox.ini View File

@@ -1,19 +1,18 @@
1 1
 [tox]
2
-envlist = py35, py36, pep8, docs, cover
2
+envlist = py36,pep8,docs,cover
3 3
 minversion = 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).
6 4
 skipsdist = True
7 5
 
8 6
 [testenv]
9
-setenv = VIRTUAL_ENV={envdir}
10
-         LANGUAGE=en_US
11
-         LC_ALL=en_US.utf-8
12
-passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY
7
+usedevelop = True
8
+setenv =
9
+  VIRTUAL_ENV={envdir}
10
+  LANGUAGE=en_US
11
+  LC_ALL=en_US.utf-8
13 12
 deps =
14 13
   -r{toxinidir}/requirements.txt
15 14
   -r{toxinidir}/test-requirements.txt
16
-basepython=python3
15
+passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
17 16
 whitelist_externals =
18 17
   find
19 18
 commands =
@@ -21,19 +20,19 @@ commands =
21 20
   {toxinidir}/tools/gate/run-unit-tests.sh '{posargs}'
22 21
 
23 22
 [testenv:fmt]
24
-basepython=python3
23
+basepython = python3
25 24
 deps =
26 25
     -r{toxinidir}/test-requirements.txt
27 26
 commands =
28 27
     yapf --style=pep8 -ir {toxinidir}/pegleg {toxinidir}/tests
29 28
 
30 29
 [testenv:pep8]
31
-basepython=python3
30
+basepython = python3
32 31
 deps =
33
-    -r{toxinidir}/test-requirements.txt
32
+  -r{toxinidir}/test-requirements.txt
34 33
 commands =
35
-    flake8 {toxinidir}/pegleg
36
-    bandit -r pegleg -n 5
34
+  bandit -r pegleg -n 5
35
+  flake8 {toxinidir}/pegleg
37 36
 
38 37
 [testenv:docs]
39 38
 basepython = python3
@@ -41,10 +40,12 @@ deps =
41 40
   -r{toxinidir}/requirements.txt
42 41
   -r{toxinidir}/doc/requirements.txt
43 42
 commands =
44
-  {toxinidir}/tools/gate/build-docs.sh
43
+  bash -c "{toxinidir}/tools/gate/build-docs.sh"
44
+whitelist_externals =
45
+  bash
45 46
 
46 47
 [testenv:bandit]
47
-basepython=python3
48
+basepython = python3
48 49
 commands = bandit -r pegleg -n 5
49 50
 
50 51
 [testenv:cover]

Loading…
Cancel
Save