@@ -34,24 +34,58 @@ matrix:
34
34
env :
35
35
- MB_PYTHON_VERSION=2.7
36
36
- ENABLE_CONTRIB=0
37
+ - ENABLE_HEADLESS=0
37
38
- os : osx
38
39
language : generic
39
40
osx_image : xcode7.3
40
41
env :
41
42
- MB_PYTHON_VERSION=3.4
42
43
- ENABLE_CONTRIB=0
44
+ - ENABLE_HEADLESS=0
43
45
- os : osx
44
46
language : generic
45
47
osx_image : xcode7.3
46
48
env :
47
49
- MB_PYTHON_VERSION=3.5
48
50
- ENABLE_CONTRIB=0
51
+ - ENABLE_HEADLESS=0
49
52
- os : osx
50
53
language : generic
51
54
osx_image : xcode7.3
52
55
env :
53
56
- MB_PYTHON_VERSION=3.6
54
57
- ENABLE_CONTRIB=0
58
+ - ENABLE_HEADLESS=0
59
+
60
+ # headless builds for MacOS
61
+ - os : osx
62
+ language : generic
63
+ osx_image : xcode7.3
64
+ env :
65
+ - MB_PYTHON_VERSION=2.7
66
+ - ENABLE_CONTRIB=0
67
+ - ENABLE_HEADLESS=1
68
+ - os : osx
69
+ language : generic
70
+ osx_image : xcode7.3
71
+ env :
72
+ - MB_PYTHON_VERSION=3.4
73
+ - ENABLE_CONTRIB=0
74
+ - ENABLE_HEADLESS=1
75
+ - os : osx
76
+ language : generic
77
+ osx_image : xcode7.3
78
+ env :
79
+ - MB_PYTHON_VERSION=3.5
80
+ - ENABLE_CONTRIB=0
81
+ - ENABLE_HEADLESS=1
82
+ - os : osx
83
+ language : generic
84
+ osx_image : xcode7.3
85
+ env :
86
+ - MB_PYTHON_VERSION=3.6
87
+ - ENABLE_CONTRIB=0
88
+ - ENABLE_HEADLESS=1
55
89
56
90
# Contrib builds for MacOS
57
91
- os : osx
@@ -60,126 +94,302 @@ matrix:
60
94
env :
61
95
- MB_PYTHON_VERSION=2.7
62
96
- ENABLE_CONTRIB=1
97
+ - ENABLE_HEADLESS=0
63
98
- os : osx
64
99
language : generic
65
100
osx_image : xcode7.3
66
101
env :
67
102
- MB_PYTHON_VERSION=3.4
68
103
- ENABLE_CONTRIB=1
104
+ - ENABLE_HEADLESS=0
69
105
- os : osx
70
106
language : generic
71
107
osx_image : xcode7.3
72
108
env :
73
109
- MB_PYTHON_VERSION=3.5
74
110
- ENABLE_CONTRIB=1
111
+ - ENABLE_HEADLESS=0
75
112
- os : osx
76
113
language : generic
77
114
osx_image : xcode7.3
78
115
env :
79
116
- MB_PYTHON_VERSION=3.6
80
117
- ENABLE_CONTRIB=1
118
+ - ENABLE_HEADLESS=0
119
+
120
+ # headless contrib builds for MacOS
121
+ - os : osx
122
+ language : generic
123
+ osx_image : xcode7.3
124
+ env :
125
+ - MB_PYTHON_VERSION=2.7
126
+ - ENABLE_CONTRIB=1
127
+ - ENABLE_HEADLESS=1
128
+ - os : osx
129
+ language : generic
130
+ osx_image : xcode7.3
131
+ env :
132
+ - MB_PYTHON_VERSION=3.4
133
+ - ENABLE_CONTRIB=1
134
+ - ENABLE_HEADLESS=1
135
+ - os : osx
136
+ language : generic
137
+ osx_image : xcode7.3
138
+ env :
139
+ - MB_PYTHON_VERSION=3.5
140
+ - ENABLE_CONTRIB=1
141
+ - ENABLE_HEADLESS=1
142
+ - os : osx
143
+ language : generic
144
+ osx_image : xcode7.3
145
+ env :
146
+ - MB_PYTHON_VERSION=3.6
147
+ - ENABLE_CONTRIB=1
148
+ - ENABLE_HEADLESS=1
81
149
82
150
# default builds for Linux
83
151
- os : linux
84
152
env :
85
153
- MB_PYTHON_VERSION=2.7
86
154
- ENABLE_CONTRIB=0
155
+ - ENABLE_HEADLESS=0
156
+ - os : linux
157
+ env :
158
+ - MB_PYTHON_VERSION=2.7
159
+ - UNICODE_WIDTH=16
160
+ - ENABLE_CONTRIB=0
161
+ - ENABLE_HEADLESS=0
162
+ - os : linux
163
+ env :
164
+ - MB_PYTHON_VERSION=2.7
165
+ - PLAT=i686
166
+ - ENABLE_CONTRIB=0
167
+ - ENABLE_HEADLESS=0
168
+ - os : linux
169
+ env :
170
+ - MB_PYTHON_VERSION=2.7
171
+ - PLAT=i686
172
+ - UNICODE_WIDTH=16
173
+ - ENABLE_CONTRIB=0
174
+ - ENABLE_HEADLESS=0
175
+ - os : linux
176
+ env :
177
+ - MB_PYTHON_VERSION=3.4
178
+ - ENABLE_CONTRIB=0
179
+ - ENABLE_HEADLESS=0
180
+ - os : linux
181
+ env :
182
+ - MB_PYTHON_VERSION=3.4
183
+ - PLAT=i686
184
+ - ENABLE_CONTRIB=0
185
+ - ENABLE_HEADLESS=0
186
+ - os : linux
187
+ env :
188
+ - MB_PYTHON_VERSION=3.5
189
+ - ENABLE_CONTRIB=0
190
+ - ENABLE_HEADLESS=0
191
+ - os : linux
192
+ env :
193
+ - MB_PYTHON_VERSION=3.5
194
+ - PLAT=i686
195
+ - ENABLE_CONTRIB=0
196
+ - ENABLE_HEADLESS=0
197
+ - os : linux
198
+ env :
199
+ - MB_PYTHON_VERSION=3.6
200
+ - ENABLE_CONTRIB=0
201
+ - ENABLE_HEADLESS=0
202
+ - TEST_DEPENDS=numpy==1.11.3
203
+ - os : linux
204
+ env :
205
+ - MB_PYTHON_VERSION=3.6
206
+ - PLAT=i686
207
+ - ENABLE_CONTRIB=0
208
+ - ENABLE_HEADLESS=0
209
+ - TEST_DEPENDS=numpy==1.11.3
210
+
211
+ # headless builds for Linux
212
+ - os : linux
213
+ env :
214
+ - MB_PYTHON_VERSION=2.7
215
+ - ENABLE_CONTRIB=0
216
+ - ENABLE_HEADLESS=1
87
217
- os : linux
88
218
env :
89
219
- MB_PYTHON_VERSION=2.7
90
220
- UNICODE_WIDTH=16
91
221
- ENABLE_CONTRIB=0
222
+ - ENABLE_HEADLESS=1
92
223
- os : linux
93
224
env :
94
225
- MB_PYTHON_VERSION=2.7
95
226
- PLAT=i686
96
227
- ENABLE_CONTRIB=0
228
+ - ENABLE_HEADLESS=1
97
229
- os : linux
98
230
env :
99
231
- MB_PYTHON_VERSION=2.7
100
232
- PLAT=i686
101
233
- UNICODE_WIDTH=16
102
234
- ENABLE_CONTRIB=0
235
+ - ENABLE_HEADLESS=1
103
236
- os : linux
104
237
env :
105
238
- MB_PYTHON_VERSION=3.4
106
239
- ENABLE_CONTRIB=0
240
+ - ENABLE_HEADLESS=1
107
241
- os : linux
108
242
env :
109
243
- MB_PYTHON_VERSION=3.4
110
244
- PLAT=i686
111
245
- ENABLE_CONTRIB=0
246
+ - ENABLE_HEADLESS=1
112
247
- os : linux
113
248
env :
114
249
- MB_PYTHON_VERSION=3.5
115
250
- ENABLE_CONTRIB=0
251
+ - ENABLE_HEADLESS=1
116
252
- os : linux
117
253
env :
118
254
- MB_PYTHON_VERSION=3.5
119
255
- PLAT=i686
120
256
- ENABLE_CONTRIB=0
257
+ - ENABLE_HEADLESS=1
121
258
- os : linux
122
259
env :
123
260
- MB_PYTHON_VERSION=3.6
124
261
- ENABLE_CONTRIB=0
262
+ - ENABLE_HEADLESS=1
125
263
- TEST_DEPENDS=numpy==1.11.3
126
264
- os : linux
127
265
env :
128
266
- MB_PYTHON_VERSION=3.6
129
267
- PLAT=i686
130
268
- ENABLE_CONTRIB=0
269
+ - ENABLE_HEADLESS=1
131
270
- TEST_DEPENDS=numpy==1.11.3
132
271
133
272
# contrib builds for Linux
134
273
- os : linux
135
274
env :
136
275
- MB_PYTHON_VERSION=2.7
137
276
- ENABLE_CONTRIB=1
277
+ - ENABLE_HEADLESS=0
278
+ - os : linux
279
+ env :
280
+ - MB_PYTHON_VERSION=2.7
281
+ - UNICODE_WIDTH=16
282
+ - ENABLE_CONTRIB=1
283
+ - ENABLE_HEADLESS=0
284
+ - os : linux
285
+ env :
286
+ - MB_PYTHON_VERSION=2.7
287
+ - PLAT=i686
288
+ - ENABLE_CONTRIB=1
289
+ - ENABLE_HEADLESS=0
290
+ - os : linux
291
+ env :
292
+ - MB_PYTHON_VERSION=2.7
293
+ - PLAT=i686
294
+ - UNICODE_WIDTH=16
295
+ - ENABLE_CONTRIB=1
296
+ - ENABLE_HEADLESS=0
297
+ - os : linux
298
+ env :
299
+ - MB_PYTHON_VERSION=3.4
300
+ - ENABLE_CONTRIB=1
301
+ - ENABLE_HEADLESS=0
302
+ - os : linux
303
+ env :
304
+ - MB_PYTHON_VERSION=3.4
305
+ - PLAT=i686
306
+ - ENABLE_CONTRIB=1
307
+ - ENABLE_HEADLESS=0
308
+ - os : linux
309
+ env :
310
+ - MB_PYTHON_VERSION=3.5
311
+ - ENABLE_CONTRIB=1
312
+ - ENABLE_HEADLESS=0
313
+ - os : linux
314
+ env :
315
+ - MB_PYTHON_VERSION=3.5
316
+ - PLAT=i686
317
+ - ENABLE_CONTRIB=1
318
+ - ENABLE_HEADLESS=0
319
+ - os : linux
320
+ env :
321
+ - MB_PYTHON_VERSION=3.6
322
+ - TEST_DEPENDS=numpy==1.11.3
323
+ - ENABLE_CONTRIB=1
324
+ - ENABLE_HEADLESS=0
325
+ - os : linux
326
+ env :
327
+ - MB_PYTHON_VERSION=3.6
328
+ - PLAT=i686
329
+ - TEST_DEPENDS=numpy==1.11.3
330
+ - ENABLE_CONTRIB=1
331
+ - ENABLE_HEADLESS=0
332
+
333
+ # headless contrib builds for Linux
334
+ - os : linux
335
+ env :
336
+ - MB_PYTHON_VERSION=2.7
337
+ - ENABLE_CONTRIB=1
338
+ - ENABLE_HEADLESS=1
138
339
- os : linux
139
340
env :
140
341
- MB_PYTHON_VERSION=2.7
141
342
- UNICODE_WIDTH=16
142
343
- ENABLE_CONTRIB=1
344
+ - ENABLE_HEADLESS=1
143
345
- os : linux
144
346
env :
145
347
- MB_PYTHON_VERSION=2.7
146
348
- PLAT=i686
147
349
- ENABLE_CONTRIB=1
350
+ - ENABLE_HEADLESS=1
148
351
- os : linux
149
352
env :
150
353
- MB_PYTHON_VERSION=2.7
151
354
- PLAT=i686
152
355
- UNICODE_WIDTH=16
153
356
- ENABLE_CONTRIB=1
357
+ - ENABLE_HEADLESS=1
154
358
- os : linux
155
359
env :
156
360
- MB_PYTHON_VERSION=3.4
157
361
- ENABLE_CONTRIB=1
362
+ - ENABLE_HEADLESS=1
158
363
- os : linux
159
364
env :
160
365
- MB_PYTHON_VERSION=3.4
161
366
- PLAT=i686
162
367
- ENABLE_CONTRIB=1
368
+ - ENABLE_HEADLESS=1
163
369
- os : linux
164
370
env :
165
371
- MB_PYTHON_VERSION=3.5
166
372
- ENABLE_CONTRIB=1
373
+ - ENABLE_HEADLESS=1
167
374
- os : linux
168
375
env :
169
376
- MB_PYTHON_VERSION=3.5
170
377
- PLAT=i686
171
378
- ENABLE_CONTRIB=1
379
+ - ENABLE_HEADLESS=1
172
380
- os : linux
173
381
env :
174
382
- MB_PYTHON_VERSION=3.6
175
383
- TEST_DEPENDS=numpy==1.11.3
176
384
- ENABLE_CONTRIB=1
385
+ - ENABLE_HEADLESS=1
177
386
- os : linux
178
387
env :
179
388
- MB_PYTHON_VERSION=3.6
180
389
- PLAT=i686
181
390
- TEST_DEPENDS=numpy==1.11.3
182
391
- ENABLE_CONTRIB=1
392
+ - ENABLE_HEADLESS=1
183
393
184
394
# The first line is printed in the folding header in Travis output
185
395
before_install : |
@@ -195,6 +405,7 @@ before_install: |
195
405
# This sets -x
196
406
source multibuild_customize.sh
197
407
echo $ENABLE_CONTRIB > contrib.enabled
408
+ echo $ENABLE_HEADLESS > headless.enabled
198
409
before_install
199
410
# Not interested in travis internal scripts' output
200
411
set +x
@@ -218,9 +429,17 @@ after_success: |
218
429
pip install twine
219
430
220
431
if [[ $ENABLE_CONTRIB == 0 ]]; then
221
- echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
432
+ if [[ $ENABLE_HEADLESS == 0 ]]; then
433
+ echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
434
+ else
435
+ echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-python-headless."
436
+ fi
222
437
else
223
- echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
438
+ if [[ $ENABLE_HEADLESS == 0 ]]; then
439
+ echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
440
+ else
441
+ echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-contrib-python-headless."
442
+ fi
224
443
fi
225
444
226
445
twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
0 commit comments