diff --git a/.travis.yml b/.travis.yml index 8050f4b2c19f4a77b2ccf2ab12f6f9db3694f2f5..2981313d9d7de495891b744e31a9b39835f7e153 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ python: - "3.5" before_install: - - git clone -q --branch=master https://github.com/Itseez/opencv.git "%APPVEYOR_BUILD_FOLDER%\opencv + - git clone -q --branch=master https://github.com/Itseez/opencv.git opencv - python find_version.py > tmp - opencv_version=$(cat tmp) - rm tmp @@ -31,4 +31,3 @@ before_script: script: - cd tests - python -m unittest test - \ No newline at end of file diff --git a/travis.yml b/travis.yml deleted file mode 100644 index 2981313d9d7de495891b744e31a9b39835f7e153..0000000000000000000000000000000000000000 --- a/travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -language: python - -python: - - "2.7" - - "3.5" - -before_install: - - git clone -q --branch=master https://github.com/Itseez/opencv.git opencv - - python find_version.py > tmp - - opencv_version=$(cat tmp) - - rm tmp - - echo $opencv_version - -install: - - python -m pip install --upgrade pip - - pip install -r requirements.txt - - cd ../opencv - - mkdir build - - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then cmake -H"." -B"build" -DBUILD_opencv_python3=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DPYTHON2_EXECUTABLE=$VIRTUAL_ENV/python27 -DPYTHON2_LIBRARY=$VIRTUAL_ENV/lib/python27.lib -DPYTHON2_INCLUDE_DIR=$VIRTUAL_ENV/include -Wno-dev; fi - - if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then cmake -H"." -B"build" -DBUILD_opencv_python2=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DPYTHON3_EXECUTABLE=$VIRTUAL_ENV/python35 -DPYTHON3_LIBRARY=$VIRTUAL_ENV/lib/python35.lib -DPYTHON3_INCLUDE_DIR=$VIRTUAL_ENV/include -Wno-dev; fi - - cd build - - cmake --build . --config Release - - cd ../.. - - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then cp opencv\build\lib\RELEASE\*.pyd opencv-python/cv2; fi - - if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then cp opencv\build\lib\python3\Release\*.pyd opencv-python/cv2; fi - - python setup.py bdist_wheel --opencv-version "$opencv_version-$TRAVIS_BUILD_NUMBER" - -before_script: - - pip install --no-index --find-links=opencv-python\dist\ opencv-python - -script: - - cd tests - - python -m unittest test