Commit 38e94f85 authored by Jay's avatar Jay Committed by jay
Browse files

HTTPS to HTTP to try and avoid SSL error on TravisCI

parent a0aa81a3

.travis.yml

+5 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ python: 


before_install:

  - sudo apt-get update



install:

  # We do this conditionally because it saves us some downloading if the

  # version is the same.
@@ -43,8 +44,8 @@ install: 
  - sudo apt-get install -y python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev



  #Grab the source

  - curl -sL https://github.com/Itseez/opencv/archive/3.0.0.zip > opencv.zip

  - curl -sL https://github.com/Itseez/opencv_contrib/archive/3.0.0.zip > opencv_contrib.zip

  - curl -sL http://github.com/Itseez/opencv/archive/3.0.0.zip > opencv.zip

  - curl -sL http://github.com/Itseez/opencv_contrib/archive/3.0.0.zip > opencv_contrib.zip

  - unzip opencv_contrib.zip

  - unzip opencv.zip

  - cd opencv-3.0.0
@@ -71,6 +72,8 @@ install: 
  # Return to the root

  - cd ../../



  # Might need to link the cv2.so into the env?



script:

  - nosetests --with-coverage --cover-package=autocnet

autocnet/matcher/tests/test_matcher.py

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class TestMatcher(unittest.TestCase): 


        self.fd['AS15-M-0296_SML.png'] = sift.detectAndCompute(im1, None)

        self.fd['AS15-M-0297_SML.png'] = sift.detectAndCompute(im2, None)



        print(dir(self.fd))

    def test_flann_match_two_images(self):



        fmatcher = matcher.FlannMatcher()