Commit 86e87d7
Build via setup.py proper using scikit-build (opencv#58)
* Adjust build environment as per https://docs.opencv.org/3.1.0/d5/de5/tutorial_py_setup_in_windows.html and https://wiki.python.org/moin/WindowsCompilers#Which_Microsoft_Visual_C.2B-.2B-_compiler_to_use_with_a_specific_Python_version_.3F
* The best practice is to only use requirements.txt for deployments, not for packaging
* ignore PyCharm metadata
* refactor to be more modular
* the warnings are irrelevant in older versions
* v110 toolset might introduce dependency on older runtime not likely to be present in newer systems, potentially breaking upgrade
* build locally with scikit-build
* adjust appveyor config to local build
* cleanup
* DLL load works without
* fail appveyor build immediately when one job fails
* * cmd doesn't expand globs
* - diplication
* - WinXP-related bits
* pip erroneously considers cv2/ as installed package when in sourceroot
* require CMake output entries to be found
* 3.5+ uses different .pyd naming scheme
* .pyd is placed differently in Linux
* DLL is only in Windows
* ignore temporary config files
* Yet another .pyd naming convention in Py35 Linux.
Screw checking.
* Update setup.py file to flag compatibility with Python 2.7-3.4-3.5-3.6 (opencv#57)
# Conflicts:
# setup.py
* Adjust build environment as per https://docs.opencv.org/3.1.0/d5/de5/tutorial_py_setup_in_windows.html and https://wiki.python.org/moin/WindowsCompilers#Which_Microsoft_Visual_C.2B-.2B-_compiler_to_use_with_a_specific_Python_version_.3F
* The best practice is to only use requirements.txt for deployments, not for packaging
* ignore PyCharm metadata
* refactor to be more modular
* the warnings are irrelevant in older versions
* v110 toolset might introduce dependency on older runtime not likely to be present in newer systems, potentially breaking upgrade
* build locally with scikit-build
* adjust appveyor config to local build
* cleanup
* DLL load works without
* fail appveyor build immediately when one job fails
* * cmd doesn't expand globs
* - diplication
* - WinXP-related bits
* pip erroneously considers cv2/ as installed package when in sourceroot
* require CMake output entries to be found
* 3.5+ uses different .pyd naming scheme
* .pyd is placed differently in Linux
* DLL is only in Windows
* ignore temporary config files
* fail fast on error
* * custom build logic should be unneeded now, will uncomment as needed
* use the latest upstream multibuild
* enable tracing
- more suspicious things
* save some build time
* these somehow cause "Server does not allow request for unadvertised object" for GitHub
* Revert "use the latest upstream multibuild"
This reverts commit 915ba42.
* Yet another .pyd naming convention in Py35 Linux.
Screw checking.
* Update setup.py file to flag compatibility with Python 2.7-3.4-3.5-3.6 (opencv#57)
# Conflicts:
# setup.py
* add diagnostics
* * Use upstream multubuild due to the forked one abusing prebuild as build
* save some time
* looks like clean_code() isn't required
* * Don't make CMake try Ninja first
* MacOS LAPACK on Travis is still broken
* See build progress as it goes
* update submodules on demand
* fetch source in time for find_version.py
* use custom docker image
* use custom multibuild
* bump submodule
* Linux/OSX are supposed to build with Qt support
* * make shallow copies to save on download time
* manylinux git is an old version
* * clean up redundant syntax
* reformat codeas YML multiline with dedent
* IPP IW broken in Linux
* + ffmpeg patch
* additional deps required due to multibuild bug
* +cv2.data
* Use upstream multibuild with monkey patch
* don't do anything if upload not needed
* filter out irrelevant debug output
* * clean up unused scripts
* inline the remaining standalone scripts
* https://github.com/matthew-brett/multibuild/issues/106 fixed
* * bump OpenCV version to 3.4.0
* * opencv/opencv#10011 is available in 3.4.0
* allow for if the sourcetree is a submodule
* * don't reinstall whatever happens to be preinstalled
* re-add workaround for travis-ci/travis-ci#9055
* * rearrange custom CMake flags
* -DWITH_GTK=OFF proved to be unneeded, gthread is among manylinux requirements
* fix linux detection to work in 3.3+, too
* fix data path for other OSes
* don't do anything unless deployment is requested
* use upstream ``devel`` multibuild
* restore from backup after rebase
* catch fetch error
* use `devel` multibuild
* comment not using --depth
* remove redundant command after merge1 parent 4b07137 commit 86e87d7
File tree
17 files changed
+479
-632
lines changed- appveyor
- cv2
- travis
17 files changed
+479
-632
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
| 3 | + | |
| 4 | + | |
11 | 5 | | |
| 6 | + | |
12 | 7 | | |
13 | 8 | | |
14 | 9 | | |
15 | 10 | | |
16 | 11 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
21 | 16 | | |
22 | | - | |
23 | 17 | | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
24 | 26 | | |
25 | 27 | | |
26 | | - | |
27 | | - | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
34 | 33 | | |
35 | 34 | | |
36 | 35 | | |
37 | 36 | | |
38 | 37 | | |
39 | | - | |
40 | 38 | | |
41 | 39 | | |
42 | 40 | | |
43 | 41 | | |
44 | 42 | | |
45 | | - | |
46 | 43 | | |
47 | 44 | | |
48 | 45 | | |
49 | 46 | | |
50 | 47 | | |
51 | | - | |
52 | 48 | | |
53 | 49 | | |
54 | 50 | | |
55 | 51 | | |
56 | 52 | | |
57 | 53 | | |
58 | 54 | | |
59 | | - | |
60 | 55 | | |
61 | 56 | | |
62 | 57 | | |
63 | 58 | | |
64 | 59 | | |
65 | | - | |
66 | 60 | | |
67 | 61 | | |
68 | 62 | | |
69 | 63 | | |
70 | 64 | | |
71 | | - | |
72 | 65 | | |
73 | 66 | | |
74 | 67 | | |
75 | 68 | | |
76 | 69 | | |
77 | | - | |
78 | 70 | | |
79 | 71 | | |
80 | 72 | | |
| |||
123 | 115 | | |
124 | 116 | | |
125 | 117 | | |
126 | | - | |
| 118 | + | |
127 | 119 | | |
128 | 120 | | |
129 | 121 | | |
130 | 122 | | |
131 | 123 | | |
132 | 124 | | |
133 | | - | |
| 125 | + | |
134 | 126 | | |
135 | 127 | | |
136 | 128 | | |
| |||
184 | 176 | | |
185 | 177 | | |
186 | 178 | | |
187 | | - | |
| 179 | + | |
188 | 180 | | |
189 | 181 | | |
190 | 182 | | |
| |||
193 | 185 | | |
194 | 186 | | |
195 | 187 | | |
196 | | - | |
| 188 | + | |
197 | 189 | | |
198 | 190 | | |
199 | 191 | | |
200 | | - | |
201 | | - | |
202 | | - | |
203 | | - | |
204 | | - | |
205 | | - | |
206 | | - | |
207 | | - | |
208 | | - | |
209 | | - | |
210 | | - | |
211 | | - | |
212 | | - | |
213 | | - | |
214 | | - | |
215 | | - | |
216 | | - | |
217 | | - | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | | - | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
0 commit comments