Skip to content
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
e58de0c
Adjust build environment as per https://docs.opencv.org/3.1.0/d5/de5/…
native-api Nov 13, 2017
d26f639
The best practice is to only use requirements.txt for deployments, no…
native-api Nov 20, 2017
18c608a
ignore PyCharm metadata
native-api Nov 20, 2017
d7a64de
refactor to be more modular
native-api Nov 21, 2017
2f405ae
the warnings are irrelevant in older versions
native-api Nov 21, 2017
b6f4d62
v110 toolset might introduce dependency on older runtime not likely t…
native-api Nov 21, 2017
90ef0d4
build locally with scikit-build
native-api Nov 24, 2017
033f413
adjust appveyor config to local build
native-api Nov 29, 2017
97d7d83
cleanup
native-api Nov 29, 2017
804a994
DLL load works without
native-api Nov 23, 2017
03435a2
fail appveyor build immediately when one job fails
native-api Dec 4, 2017
39fa503
* cmd doesn't expand globs
native-api Dec 1, 2017
4ed0348
ignore temporary config files
native-api Dec 17, 2017
471ed0d
Merge branch 'master' into build_locally
native-api Dec 17, 2017
7e7e5e9
Merge branch 'master' into build_locally
native-api Dec 17, 2017
6d3b3f3
Yet another .pyd naming convention in Py35 Linux.
native-api Dec 18, 2017
5f5c8d0
Update setup.py file to flag compatibility with Python 2.7-3.4-3.5-3.…
DEKHTIARJonathan Dec 14, 2017
1668690
Adjust build environment as per https://docs.opencv.org/3.1.0/d5/de5/…
native-api Nov 13, 2017
8228730
The best practice is to only use requirements.txt for deployments, no…
native-api Nov 20, 2017
359d186
ignore PyCharm metadata
native-api Nov 20, 2017
fe23cdb
refactor to be more modular
native-api Nov 21, 2017
064256e
the warnings are irrelevant in older versions
native-api Nov 21, 2017
a676ced
v110 toolset might introduce dependency on older runtime not likely t…
native-api Nov 21, 2017
21caeb8
build locally with scikit-build
native-api Nov 24, 2017
b4f3f89
adjust appveyor config to local build
native-api Nov 29, 2017
b096318
cleanup
native-api Nov 29, 2017
02ef3a2
DLL load works without
native-api Nov 23, 2017
76174b8
fail appveyor build immediately when one job fails
native-api Dec 4, 2017
6ceaa71
* cmd doesn't expand globs
native-api Dec 1, 2017
e18f857
ignore temporary config files
native-api Dec 17, 2017
a0089df
fail fast on error
native-api Dec 17, 2017
dc7cd4c
* custom build logic should be unneeded now, will uncomment as needed
native-api Dec 18, 2017
6330dcd
use the latest upstream multibuild
native-api Dec 18, 2017
626f6b5
enable tracing
native-api Dec 18, 2017
1f3ea8b
save some build time
native-api Dec 18, 2017
ef8ebbc
these somehow cause "Server does not allow request for unadvertised o…
native-api Dec 18, 2017
bf5d3b4
Revert "use the latest upstream multibuild"
native-api Dec 18, 2017
a497772
Yet another .pyd naming convention in Py35 Linux.
native-api Dec 18, 2017
64744f3
Update setup.py file to flag compatibility with Python 2.7-3.4-3.5-3.…
DEKHTIARJonathan Dec 14, 2017
d0979e1
add diagnostics
native-api Dec 18, 2017
11ef99e
* Use upstream multubuild due to the forked one abusing prebuild as b…
native-api Dec 19, 2017
51da353
save some time
native-api Dec 19, 2017
1fffd25
looks like clean_code() isn't required
native-api Dec 19, 2017
9e29ac3
* Don't make CMake try Ninja first
native-api Dec 19, 2017
a047ec2
See build progress as it goes
native-api Dec 19, 2017
ca0fcc0
update submodules on demand
native-api Dec 19, 2017
f224efc
fetch source in time for find_version.py
native-api Dec 19, 2017
653a212
use custom docker image
native-api Dec 20, 2017
2ded5f0
use custom multibuild
native-api Dec 20, 2017
55d71d5
bump submodule
native-api Dec 20, 2017
de9c286
Linux/OSX are supposed to build with Qt support
native-api Dec 20, 2017
8d2862f
* make shallow copies to save on download time
native-api Dec 22, 2017
2c1a77a
* clean up redundant syntax
native-api Dec 23, 2017
dd4c72e
IPP IW broken in Linux
native-api Dec 24, 2017
fc74bef
+ ffmpeg patch
native-api Dec 24, 2017
30769e6
additional deps required due to multibuild bug
native-api Dec 25, 2017
950ad91
+cv2.data
native-api Dec 25, 2017
1401b28
Use upstream multibuild with monkey patch
native-api Dec 27, 2017
58d6ee4
don't do anything if upload not needed
native-api Dec 30, 2017
d1b44a1
filter out irrelevant debug output
native-api Dec 30, 2017
82368e9
* clean up unused scripts
native-api Dec 31, 2017
cf86c6e
https://github.com/matthew-brett/multibuild/issues/106 fixed
native-api Jan 2, 2018
8eab1ef
* bump OpenCV version to 3.4.0
native-api Jan 2, 2018
29691ad
* https://github.com/opencv/opencv/pull/10011 is available in 3.4.0
native-api Jan 2, 2018
9c10609
* don't reinstall whatever happens to be preinstalled
native-api Jan 12, 2018
9810642
* rearrange custom CMake flags
native-api Jan 3, 2018
2131de9
fix linux detection to work in 3.3+, too
native-api Jan 13, 2018
f603717
fix data path for other OSes
native-api Jan 13, 2018
710ed1d
may be LegacyVersion, too
native-api Jan 16, 2018
7532518
don't do anything unless deployment is requested
native-api Jan 16, 2018
e23d8b6
Merge branch 'master' into build_locally_travis
native-api Jan 16, 2018
e1ecef5
use upstream ``devel`` multibuild
native-api Jan 16, 2018
1229c5e
restore from backup after rebase
native-api Jan 17, 2018
8648d52
catch fetch error
native-api Jan 17, 2018
809cf7b
use `devel` multibuild
native-api Jan 17, 2018
b6b7460
Merge branch 'master' of https://github.com/skvark/opencv-python into…
native-api Jan 19, 2018
83ddb27
Merge branch 'build_locally_travis' into build_locally
native-api Jan 19, 2018
1939480
comment not using --depth
native-api Jan 20, 2018
2cc4092
fix appveyor.yml after merge
native-api Jan 21, 2018
6e10fa4
re-delete line after merge
native-api Jan 21, 2018
1eeca2e
remove redundant command after merge
native-api Jan 21, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,8 @@ target/

#Ipython Notebook
.ipynb_checkpoints

#PyCharm
/.idea
/contrib.enabled
/cv_version.py
100 changes: 18 additions & 82 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,139 +7,70 @@ environment:

matrix:
- PYTHON: "C:/Python27"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "2.7"
NP_VERSION: "1.11.1"
ENABLE_CONTRIB: 0

- PYTHON: "C:/Python27-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "2.7"
NP_VERSION: "1.11.1"
ENABLE_CONTRIB: 0

- PYTHON: "C:/Python34"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "3.4"
NP_VERSION: "1.11.1"
ENABLE_CONTRIB: 0

- PYTHON: "C:/Python34-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "3.4"
NP_VERSION: "1.11.1"
ENABLE_CONTRIB: 0

- PYTHON: "C:/Python35"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "3.5"
NP_VERSION: "1.11.1"
ENABLE_CONTRIB: 0

- PYTHON: "C:/Python35-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "3.5"
NP_VERSION: "1.11.1"
ENABLE_CONTRIB: 0

- PYTHON: "C:/Python36"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "3.6"
NP_VERSION: "1.11.3"
ENABLE_CONTRIB: 0

- PYTHON: "C:/Python36-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "3.6"
NP_VERSION: "1.11.3"
ENABLE_CONTRIB: 0

- PYTHON: "C:/Python27"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "2.7"
NP_VERSION: "1.11.1"
ENABLE_CONTRIB: 1

- PYTHON: "C:/Python27-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "2.7"
NP_VERSION: "1.11.1"
ENABLE_CONTRIB: 1

- PYTHON: "C:/Python34"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "3.4"
NP_VERSION: "1.11.1"
ENABLE_CONTRIB: 1

- PYTHON: "C:/Python34-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "3.4"
NP_VERSION: "1.11.1"
ENABLE_CONTRIB: 1

- PYTHON: "C:/Python35"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "3.5"
NP_VERSION: "1.11.1"
ENABLE_CONTRIB: 1

- PYTHON: "C:/Python35-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "3.5"
NP_VERSION: "1.11.1"
ENABLE_CONTRIB: 1

- PYTHON: "C:/Python36"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "3.6"
NP_VERSION: "1.11.3"
ENABLE_CONTRIB: 1

- PYTHON: "C:/Python36-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "3.6"
NP_VERSION: "1.11.3"
ENABLE_CONTRIB: 1

install:
- cmd: >-

git submodule update --init --recursive

C:\Python35\python.exe find_version.py

"%PYTHON%/python.exe" -m pip install --upgrade pip

"%PYTHON%/python.exe" -m pip install -r requirements.txt

"%PYTHON%/python.exe" -m pip install "numpy==%NP_VERSION%"
matrix:
fast_finish: true


build_script:
- appveyor\build.cmd
- cmd: >-

"%PYTHON%/python.exe" setup.py bdist_wheel

before_test:
- cmd: >-
- ps: >-

cd ..
cd ${Env:APPVEYOR_BUILD_FOLDER}\tests

if %ENABLE_CONTRIB% EQU 0 ("%PYTHON%/python.exe" -m pip install --no-index --find-links=%APPVEYOR_BUILD_FOLDER%\dist\ opencv-python) else ("%PYTHON%/python.exe" -m pip install --no-index --find-links=%APPVEYOR_BUILD_FOLDER%\dist\ opencv-contrib-python)
&"${Env:PYTHON}/python.exe" -m pip install --user (ls "../dist/opencv_*.whl")

if ($LastExitCode -ne 0) {throw $LastExitCode}

test_script:
- cmd: >-
Expand All @@ -152,9 +83,14 @@ artifacts:
- path: dist\*.whl
name: wheels

before_deploy:
- cmd: >-

"%PYTHON%/python.exe" -m pip install twine

deploy_script:
- cd %APPVEYOR_BUILD_FOLDER%

- if %ENABLE_CONTRIB% EQU 0 (echo "This is default build. Deplyoment will be done to to PyPI entry opencv-python.") else (echo "This is contrib build. Deplyoment will be done to to PyPI entry opencv-contrib-python.")
- if %ENABLE_CONTRIB% EQU 0 (echo "This is a default build. Deployment will be done to PyPI entry opencv-python.") else (echo "This is a contrib build. Deployment will be done to PyPI entry opencv-contrib-python.")

- if "%APPVEYOR_REPO_TAG%"=="true" ("%PYTHON%/python.exe" -m twine upload -u %USER% -p %PASS% --skip-existing dist/opencv*) else (echo "Tag not set, deployment skipped.")
- if "%APPVEYOR_REPO_TAG%"=="true" ("%PYTHON%/python.exe" -m twine upload -u %USER% -p %PASS% --skip-existing dist/opencv*) else (echo "Tag not set, deployment skipped.")
32 changes: 0 additions & 32 deletions appveyor/build.cmd

This file was deleted.

2 changes: 0 additions & 2 deletions requirements.txt

This file was deleted.

Loading