Skip to content

Commit 6ee82a3

Browse files
committed
fix line endings
1 parent 1180f1e commit 6ee82a3

File tree

5 files changed

+759
-759
lines changed

5 files changed

+759
-759
lines changed

appveyor.yml

+191-191
Original file line numberDiff line numberDiff line change
@@ -1,191 +1,191 @@
1-
environment:
2-
USER:
3-
secure: fXgF9uyy6sT0JoVOR7BoqA==
4-
5-
PASS:
6-
secure: 0bXSOVjf9x8L7nErTivu92TF1FwNosTjFJQPmxp8Dys=
7-
8-
matrix:
9-
- PYTHON: "C:/Python36"
10-
ENABLE_CONTRIB: 0
11-
ENABLE_HEADLESS: 0
12-
13-
- PYTHON: "C:/Python36-x64"
14-
ENABLE_CONTRIB: 0
15-
ENABLE_HEADLESS: 0
16-
17-
- PYTHON: "C:/Python37"
18-
ENABLE_CONTRIB: 0
19-
ENABLE_HEADLESS: 0
20-
21-
- PYTHON: "C:/Python37-x64"
22-
ENABLE_CONTRIB: 0
23-
ENABLE_HEADLESS: 0
24-
25-
- PYTHON: "C:/Python38"
26-
ENABLE_CONTRIB: 0
27-
ENABLE_HEADLESS: 0
28-
29-
- PYTHON: "C:/Python38-x64"
30-
ENABLE_CONTRIB: 0
31-
ENABLE_HEADLESS: 0
32-
33-
- PYTHON: "C:/Python39"
34-
ENABLE_CONTRIB: 0
35-
ENABLE_HEADLESS: 0
36-
37-
- PYTHON: "C:/Python39-x64"
38-
ENABLE_CONTRIB: 0
39-
ENABLE_HEADLESS: 0
40-
41-
- PYTHON: "C:/Python36"
42-
ENABLE_CONTRIB: 1
43-
ENABLE_HEADLESS: 0
44-
45-
- PYTHON: "C:/Python36-x64"
46-
ENABLE_CONTRIB: 1
47-
ENABLE_HEADLESS: 0
48-
49-
- PYTHON: "C:/Python37"
50-
ENABLE_CONTRIB: 1
51-
ENABLE_HEADLESS: 0
52-
53-
- PYTHON: "C:/Python37-x64"
54-
ENABLE_CONTRIB: 1
55-
ENABLE_HEADLESS: 0
56-
57-
- PYTHON: "C:/Python38"
58-
ENABLE_CONTRIB: 1
59-
ENABLE_HEADLESS: 0
60-
61-
- PYTHON: "C:/Python38-x64"
62-
ENABLE_CONTRIB: 1
63-
ENABLE_HEADLESS: 0
64-
65-
- PYTHON: "C:/Python39"
66-
ENABLE_CONTRIB: 1
67-
ENABLE_HEADLESS: 0
68-
69-
- PYTHON: "C:/Python39-x64"
70-
ENABLE_CONTRIB: 1
71-
ENABLE_HEADLESS: 0
72-
73-
- PYTHON: "C:/Python36"
74-
ENABLE_CONTRIB: 0
75-
ENABLE_HEADLESS: 1
76-
77-
- PYTHON: "C:/Python36-x64"
78-
ENABLE_CONTRIB: 0
79-
ENABLE_HEADLESS: 1
80-
81-
- PYTHON: "C:/Python37"
82-
ENABLE_CONTRIB: 0
83-
ENABLE_HEADLESS: 1
84-
85-
- PYTHON: "C:/Python37-x64"
86-
ENABLE_CONTRIB: 0
87-
ENABLE_HEADLESS: 1
88-
89-
- PYTHON: "C:/Python38"
90-
ENABLE_CONTRIB: 0
91-
ENABLE_HEADLESS: 1
92-
93-
- PYTHON: "C:/Python38-x64"
94-
ENABLE_CONTRIB: 0
95-
ENABLE_HEADLESS: 1
96-
97-
- PYTHON: "C:/Python39"
98-
ENABLE_CONTRIB: 0
99-
ENABLE_HEADLESS: 1
100-
101-
- PYTHON: "C:/Python39-x64"
102-
ENABLE_CONTRIB: 0
103-
ENABLE_HEADLESS: 1
104-
105-
- PYTHON: "C:/Python36"
106-
ENABLE_CONTRIB: 1
107-
ENABLE_HEADLESS: 1
108-
109-
- PYTHON: "C:/Python36-x64"
110-
ENABLE_CONTRIB: 1
111-
ENABLE_HEADLESS: 1
112-
113-
- PYTHON: "C:/Python37"
114-
ENABLE_CONTRIB: 1
115-
ENABLE_HEADLESS: 1
116-
117-
- PYTHON: "C:/Python37-x64"
118-
ENABLE_CONTRIB: 1
119-
ENABLE_HEADLESS: 1
120-
121-
- PYTHON: "C:/Python38"
122-
ENABLE_CONTRIB: 1
123-
ENABLE_HEADLESS: 1
124-
125-
- PYTHON: "C:/Python38-x64"
126-
ENABLE_CONTRIB: 1
127-
ENABLE_HEADLESS: 1
128-
129-
- PYTHON: "C:/Python39"
130-
ENABLE_CONTRIB: 1
131-
ENABLE_HEADLESS: 1
132-
133-
- PYTHON: "C:/Python39-x64"
134-
ENABLE_CONTRIB: 1
135-
ENABLE_HEADLESS: 1
136-
137-
matrix:
138-
fast_finish: true
139-
140-
build_script:
141-
- cmd: |
142-
"%PYTHON%/python.exe" -m pip install --upgrade pip
143-
"%PYTHON%/python.exe" -m pip install --upgrade setuptools
144-
set "CI_BUILD=1" && "%PYTHON%/python.exe" -m pip wheel --wheel-dir=%cd%\dist . --verbose
145-
146-
before_test:
147-
- ps: |
148-
149-
cd ${Env:APPVEYOR_BUILD_FOLDER}\tests
150-
$env:PYTHONWARNINGS = "ignore:::pip._internal.cli.base_command"
151-
&"${Env:PYTHON}/python.exe" -m pip install --user --no-warn-script-location (ls "../dist/opencv_*.whl")
152-
if ($LastExitCode -ne 0) {throw $LastExitCode}
153-
154-
test_script:
155-
- cmd: |
156-
157-
cd %APPVEYOR_BUILD_FOLDER%\tests
158-
"%PYTHON%/python.exe" -m unittest test
159-
160-
artifacts:
161-
- path: dist\opencv*.whl
162-
name: wheels
163-
164-
deploy_script:
165-
- ps: |
166-
167-
if (${Env:APPVEYOR_REPO_TAG} -eq "true") {
168-
cd ${Env:APPVEYOR_BUILD_FOLDER}
169-
if (${Env:ENABLE_CONTRIB} -eq 0) {
170-
if (${Env:ENABLE_HEADLESS} -eq 0) {
171-
echo "This is a default build. Deployment will be done to PyPI entry opencv-python."
172-
}
173-
else {
174-
echo "This is a headless build. Deployment will be done to PyPI entry opencv-python-headless."
175-
}
176-
}
177-
else {
178-
if (${Env:ENABLE_HEADLESS} -eq 0) {
179-
echo "This is a contrib build. Deployment will be done to PyPI entry opencv-contrib-python."
180-
}
181-
else {
182-
echo "This is a headless contrib build. Deployment will be done to PyPI entry opencv-contrib-python-headless."
183-
}
184-
}
185-
186-
&"${Env:PYTHON}/python.exe" -m pip install twine
187-
&"${Env:PYTHON}/python.exe" -m twine upload -u ${Env:USER} -p ${Env:PASS} --skip-existing dist/opencv*
188-
}
189-
else {
190-
echo "Tag not set, deployment skipped."
191-
}
1+
environment:
2+
USER:
3+
secure: fXgF9uyy6sT0JoVOR7BoqA==
4+
5+
PASS:
6+
secure: 0bXSOVjf9x8L7nErTivu92TF1FwNosTjFJQPmxp8Dys=
7+
8+
matrix:
9+
- PYTHON: "C:/Python36"
10+
ENABLE_CONTRIB: 0
11+
ENABLE_HEADLESS: 0
12+
13+
- PYTHON: "C:/Python36-x64"
14+
ENABLE_CONTRIB: 0
15+
ENABLE_HEADLESS: 0
16+
17+
- PYTHON: "C:/Python37"
18+
ENABLE_CONTRIB: 0
19+
ENABLE_HEADLESS: 0
20+
21+
- PYTHON: "C:/Python37-x64"
22+
ENABLE_CONTRIB: 0
23+
ENABLE_HEADLESS: 0
24+
25+
- PYTHON: "C:/Python38"
26+
ENABLE_CONTRIB: 0
27+
ENABLE_HEADLESS: 0
28+
29+
- PYTHON: "C:/Python38-x64"
30+
ENABLE_CONTRIB: 0
31+
ENABLE_HEADLESS: 0
32+
33+
- PYTHON: "C:/Python39"
34+
ENABLE_CONTRIB: 0
35+
ENABLE_HEADLESS: 0
36+
37+
- PYTHON: "C:/Python39-x64"
38+
ENABLE_CONTRIB: 0
39+
ENABLE_HEADLESS: 0
40+
41+
- PYTHON: "C:/Python36"
42+
ENABLE_CONTRIB: 1
43+
ENABLE_HEADLESS: 0
44+
45+
- PYTHON: "C:/Python36-x64"
46+
ENABLE_CONTRIB: 1
47+
ENABLE_HEADLESS: 0
48+
49+
- PYTHON: "C:/Python37"
50+
ENABLE_CONTRIB: 1
51+
ENABLE_HEADLESS: 0
52+
53+
- PYTHON: "C:/Python37-x64"
54+
ENABLE_CONTRIB: 1
55+
ENABLE_HEADLESS: 0
56+
57+
- PYTHON: "C:/Python38"
58+
ENABLE_CONTRIB: 1
59+
ENABLE_HEADLESS: 0
60+
61+
- PYTHON: "C:/Python38-x64"
62+
ENABLE_CONTRIB: 1
63+
ENABLE_HEADLESS: 0
64+
65+
- PYTHON: "C:/Python39"
66+
ENABLE_CONTRIB: 1
67+
ENABLE_HEADLESS: 0
68+
69+
- PYTHON: "C:/Python39-x64"
70+
ENABLE_CONTRIB: 1
71+
ENABLE_HEADLESS: 0
72+
73+
- PYTHON: "C:/Python36"
74+
ENABLE_CONTRIB: 0
75+
ENABLE_HEADLESS: 1
76+
77+
- PYTHON: "C:/Python36-x64"
78+
ENABLE_CONTRIB: 0
79+
ENABLE_HEADLESS: 1
80+
81+
- PYTHON: "C:/Python37"
82+
ENABLE_CONTRIB: 0
83+
ENABLE_HEADLESS: 1
84+
85+
- PYTHON: "C:/Python37-x64"
86+
ENABLE_CONTRIB: 0
87+
ENABLE_HEADLESS: 1
88+
89+
- PYTHON: "C:/Python38"
90+
ENABLE_CONTRIB: 0
91+
ENABLE_HEADLESS: 1
92+
93+
- PYTHON: "C:/Python38-x64"
94+
ENABLE_CONTRIB: 0
95+
ENABLE_HEADLESS: 1
96+
97+
- PYTHON: "C:/Python39"
98+
ENABLE_CONTRIB: 0
99+
ENABLE_HEADLESS: 1
100+
101+
- PYTHON: "C:/Python39-x64"
102+
ENABLE_CONTRIB: 0
103+
ENABLE_HEADLESS: 1
104+
105+
- PYTHON: "C:/Python36"
106+
ENABLE_CONTRIB: 1
107+
ENABLE_HEADLESS: 1
108+
109+
- PYTHON: "C:/Python36-x64"
110+
ENABLE_CONTRIB: 1
111+
ENABLE_HEADLESS: 1
112+
113+
- PYTHON: "C:/Python37"
114+
ENABLE_CONTRIB: 1
115+
ENABLE_HEADLESS: 1
116+
117+
- PYTHON: "C:/Python37-x64"
118+
ENABLE_CONTRIB: 1
119+
ENABLE_HEADLESS: 1
120+
121+
- PYTHON: "C:/Python38"
122+
ENABLE_CONTRIB: 1
123+
ENABLE_HEADLESS: 1
124+
125+
- PYTHON: "C:/Python38-x64"
126+
ENABLE_CONTRIB: 1
127+
ENABLE_HEADLESS: 1
128+
129+
- PYTHON: "C:/Python39"
130+
ENABLE_CONTRIB: 1
131+
ENABLE_HEADLESS: 1
132+
133+
- PYTHON: "C:/Python39-x64"
134+
ENABLE_CONTRIB: 1
135+
ENABLE_HEADLESS: 1
136+
137+
matrix:
138+
fast_finish: true
139+
140+
build_script:
141+
- cmd: |
142+
"%PYTHON%/python.exe" -m pip install --upgrade pip
143+
"%PYTHON%/python.exe" -m pip install --upgrade setuptools
144+
set "CI_BUILD=1" && "%PYTHON%/python.exe" -m pip wheel --wheel-dir=%cd%\dist . --verbose
145+
146+
before_test:
147+
- ps: |
148+
149+
cd ${Env:APPVEYOR_BUILD_FOLDER}\tests
150+
$env:PYTHONWARNINGS = "ignore:::pip._internal.cli.base_command"
151+
&"${Env:PYTHON}/python.exe" -m pip install --user --no-warn-script-location (ls "../dist/opencv_*.whl")
152+
if ($LastExitCode -ne 0) {throw $LastExitCode}
153+
154+
test_script:
155+
- cmd: |
156+
157+
cd %APPVEYOR_BUILD_FOLDER%\tests
158+
"%PYTHON%/python.exe" -m unittest test
159+
160+
artifacts:
161+
- path: dist\opencv*.whl
162+
name: wheels
163+
164+
deploy_script:
165+
- ps: |
166+
167+
if (${Env:APPVEYOR_REPO_TAG} -eq "true") {
168+
cd ${Env:APPVEYOR_BUILD_FOLDER}
169+
if (${Env:ENABLE_CONTRIB} -eq 0) {
170+
if (${Env:ENABLE_HEADLESS} -eq 0) {
171+
echo "This is a default build. Deployment will be done to PyPI entry opencv-python."
172+
}
173+
else {
174+
echo "This is a headless build. Deployment will be done to PyPI entry opencv-python-headless."
175+
}
176+
}
177+
else {
178+
if (${Env:ENABLE_HEADLESS} -eq 0) {
179+
echo "This is a contrib build. Deployment will be done to PyPI entry opencv-contrib-python."
180+
}
181+
else {
182+
echo "This is a headless contrib build. Deployment will be done to PyPI entry opencv-contrib-python-headless."
183+
}
184+
}
185+
186+
&"${Env:PYTHON}/python.exe" -m pip install twine
187+
&"${Env:PYTHON}/python.exe" -m twine upload -u ${Env:USER} -p ${Env:PASS} --skip-existing dist/opencv*
188+
}
189+
else {
190+
echo "Tag not set, deployment skipped."
191+
}

0 commit comments

Comments
 (0)