1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
--- a/src/pybind/mgr/ansible/run-tox.sh 2019-04-25 20:15:48.000000000 +0200
+++ b/src/pybind/mgr/ansible/run-tox.sh 2019-07-14 16:36:54.220654727 +0200
@@ -8,22 +8,22 @@
test -d ansible && cd ansible
if [ -e tox.ini ]; then
- TOX_PATH=$(readlink -f tox.ini)
+ TOX_PATH="$(readlink -f tox.ini)"
else
- TOX_PATH=$(readlink -f $(dirname $0)/tox.ini)
+ TOX_PATH="$(readlink -f "$(dirname "$0")"/tox.ini)"
fi
# tox.ini will take care of this.
unset PYTHONPATH
export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
-source ${MGR_ANSIBLE_VIRTUALENV}/bin/activate
+source "${MGR_ANSIBLE_VIRTUALENV}"/bin/activate
if [ "$WITH_PYTHON2" = "ON" ]; then
ENV_LIST+="py27"
fi
-if [ "$WITH_PYTHON3" = "ON" ]; then
+if [[ "$WITH_PYTHON3" == "ON" || "$WITH_PYTHON3" == "3" ]]; then
ENV_LIST+="py3"
fi
-tox -c ${TOX_PATH} -e ${ENV_LIST}
+tox -c "${TOX_PATH}" -e "${ENV_LIST}"
--- a/src/pybind/mgr/dashboard/run-tox.sh 2019-04-25 20:15:48.000000000 +0200
+++ b/src/pybind/mgr/dashboard/run-tox.sh 2019-07-14 16:36:48.907269344 +0200
@@ -8,30 +8,30 @@
test -d dashboard && cd dashboard
if [ -e tox.ini ]; then
- TOX_PATH=`readlink -f tox.ini`
+ TOX_PATH="$(readlink -f tox.ini)"
else
- TOX_PATH=`readlink -f $(dirname $0)/tox.ini`
+ TOX_PATH="$(readlink -f "$(dirname "$0")"/tox.ini)"
fi
# tox.ini will take care of this.
unset PYTHONPATH
export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
-source ${MGR_DASHBOARD_VIRTUALENV}/bin/activate
+source "${MGR_DASHBOARD_VIRTUALENV}"/bin/activate
-if [ "$WITH_PYTHON2" = "ON" ]; then
- if [[ -n "$@" ]]; then
+if [ "$WITH_PYTHON2" == "ON" ]; then
+ if [[ -n "$*" ]]; then
ENV_LIST+="py27-run,"
else
ENV_LIST+="py27-cov,py27-lint,"
fi
fi
-if [ "$WITH_PYTHON3" = "ON" ]; then
- if [[ -n "$@" ]]; then
+if [[ "$WITH_PYTHON3" == "ON" || "$WITH_PYTHON3" == "3" ]]; then
+ if [[ -n "$*" ]]; then
ENV_LIST+="py3-run"
else
ENV_LIST+="py3-cov,py3-lint"
fi
fi
-tox -c ${TOX_PATH} -e "$ENV_LIST" "$@"
+tox -c "${TOX_PATH}" -e "$ENV_LIST" "$@"
--- a/src/pybind/mgr/insights/run-tox.sh 2019-04-25 20:15:48.000000000 +0200
+++ b/src/pybind/mgr/insights/run-tox.sh 2019-07-14 16:36:41.347195419 +0200
@@ -8,22 +8,22 @@
test -d insights && cd insights
if [ -e tox.ini ]; then
- TOX_PATH=`readlink -f tox.ini`
+ TOX_PATH="$(readlink -f tox.ini)"
else
- TOX_PATH=`readlink -f $(dirname $0)/tox.ini`
+ TOX_PATH="$(readlink -f "$(dirname "$0")"/tox.ini)"
fi
# tox.ini will take care of this.
unset PYTHONPATH
export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
-source ${MGR_INSIGHTS_VIRTUALENV}/bin/activate
+source "${MGR_INSIGHTS_VIRTUALENV}"/bin/activate
if [ "$WITH_PYTHON2" = "ON" ]; then
ENV_LIST+="py27"
fi
-if [ "$WITH_PYTHON3" = "ON" ]; then
+if [[ "$WITH_PYTHON3" == "ON" || "$WITH_PYTHON3" == "3" ]]; then
ENV_LIST+="py3"
fi
-tox -c ${TOX_PATH} -e ${ENV_LIST}
+tox -c "${TOX_PATH}" -e "${ENV_LIST}"
--- a/src/pybind/mgr/orchestrator_cli/run-tox.sh 2019-04-25 20:15:48.000000000 +0200
+++ b/src/pybind/mgr/orchestrator_cli/run-tox.sh 2019-07-14 16:37:01.734061798 +0200
@@ -8,25 +8,24 @@
test -d orchestrator_cli && cd orchestrator_cli
if [ -e tox.ini ]; then
- TOX_PATH=$(readlink -f tox.ini)
+ TOX_PATH="$(readlink -f tox.ini)"
else
- TOX_PATH=$(readlink -f $(dirname $0)/tox.ini)
+ TOX_PATH="$(readlink -f "$(dirname "$0")"/tox.ini)"
fi
# tox.ini will take care of this.
unset PYTHONPATH
export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
-if [ -f ${MGR_ORCHESTRATOR_CLI_VIRTUALENV}/bin/activate ]
-then
- source ${MGR_ORCHESTRATOR_CLI_VIRTUALENV}/bin/activate
+if [[ -r "${MGR_ORCHESTRATOR_CLI_VIRTUALENV}"/bin/activate ]]; then
+ source "${MGR_ORCHESTRATOR_CLI_VIRTUALENV}"/bin/activate
fi
if [ "$WITH_PYTHON2" = "ON" ]; then
ENV_LIST+="py27"
fi
-if [ "$WITH_PYTHON3" = "ON" ]; then
- ENV_LIST+=",py3"
+if [[ "$WITH_PYTHON3" == "ON" || "$WITH_PYTHON3" == "3" ]]; then
+ ENV_LIST+="py3"
fi
-tox -c ${TOX_PATH} -e ${ENV_LIST}
+tox -c "${TOX_PATH}" -e "${ENV_LIST}"
--- a/src/pybind/mgr/dashboard/tox.ini 2019-04-25 20:15:48.000000000 +0200
+++ b/src/pybind/mgr/dashboard/tox.ini 2019-07-15 12:36:39.693948289 +0200
@@ -1,5 +1,5 @@
[tox]
-envlist = py27-{cov,lint,run},py3-{cov,lint,run}
+envlist = py3-{cov,lint,run}
skipsdist = true
toxworkdir = {env:CEPH_BUILD_DIR}/dashboard
minversion = 2.8.1
@@ -11,13 +11,12 @@ setenv=
WEBTEST_INTERACTIVE = false
LD_LIBRARY_PATH = {toxinidir}/../../../../build/lib
PATH = {toxinidir}/../../../../build/bin:$PATH
- py27: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.2
py3: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3
cov: UNITTEST = true
cov: COVERAGE_FILE = .coverage.{envname}
commands=
pip install -r {toxinidir}/requirements.txt
- py27: pip install -r {toxinidir}/requirements-py27.txt
+; py27: pip install -r {toxinidir}/requirements-py27.txt
py3: pip install -r {toxinidir}/requirements-py3.txt
cov: coverage erase
cov: {envbindir}/py.test --cov=. --cov-report= --junitxml=junit.{envname}.xml --doctest-modules controllers/rbd.py services/ tests/ tools.py
|