Unverified Commit 44a3780a authored by jlaura's avatar jlaura Committed by GitHub
Browse files

Update test_two_image.py (#554) 

* Update test_two_image.py

* Update test_three_image.py

* Update test_save_load.py

* Update network.py

* Update test_three_image.py

* Update test_naive_template.py

* Update continuous_integration.yml

* Delete .travis.yml
parent 39a20caa

.github/workflows/continuous_integration.yml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ jobs: 
          mamba-version: "*"

          use-mamba: true

          channels: conda-forge, defaults

          channel-priority: true

          channel-priority: strict

          activate-environment: autocnet

          environment-file: environment.yml

          python-version: ${{ matrix.python-version }}

.travis.yml

deleted100644 → 0
+0 −89
Original line number Diff line number Diff line 
language: generic

sudo: true



branches:

  only:

    - dev

    - testing



matrix:

  include:

    - os: linux

      env: PYTHON_VERSION=3.6

    - os: linux

      env: PYTHON_VERSION=3.7

    - os: mac

      env: PYTHON_VERSION=3.6

    - os: mac

      env: PYTHON_VERSION=3.7



# Setup a postgresql instance w/postgis

services:

  - postgresql



addons:

  postgresql: 9.6

  apt:

    packages:

    - postgresql-9.6-postgis-2.4

  on:

    os: linux



before_install:

  # Create the template database that is used to instantiate the test DB 

  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then

      psql -c 'create database template_postgis;' -U postgres;

      psql template_postgis -U postgres -c 'create extension postgis';

      psql template_postgis -c 'create extension postgis_topology';

      psql -d template_postgis -c 'GRANT ALL ON geometry_columns TO PUBLIC;';

      psql -d template_postgis -c 'GRANT ALL ON geography_columns TO PUBLIC;';

      psql -d template_postgis -c 'GRANT ALL ON spatial_ref_sys TO PUBLIC;';

    fi



install:

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

  # version is the same.

  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then

      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;

    else

      curl -o miniconda.sh  https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh;

    fi

  - bash miniconda.sh -b -p $HOME/miniconda

  - ls $HOME/miniconda/bin

  - export PATH="$HOME/miniconda/bin:$PATH"

  - hash -r

  - conda config --set always_yes yes --set changeps1 no

  - conda config --add channels conda-forge

  - conda update -q conda

  # Useful for debugging any issues with conda

  - conda info -a

  # Create the env

  - conda create -q -n test python=$PYTHON_VERSION

  - source activate test



  # Install dependencies

  - conda env update -n test -f environment.yml

  - export PROJ_LIB=$CONDA_PREFIX/share/proj 

  - pip install travis-sphinx 

  - conda install -c conda-forge nbsphinx



script:

  - autocnet_config=config/test_config.yml pytest -v autocnet

  - travis-sphinx build --source=docs --nowarn # The sphinx build script



after_success:

  - coveralls



deploy:

  provider: script

  skip_cleanup: true

  script: bash deploy.sh

  on:

    branch: dev



notifications:

  webhooks:

    urls:

      - https://webhooks.gitter.im/e/6cbe4b65fff6764ed80f

    on_success: always

    on_failure: always

autocnet/graph/network.py

+1 −1
Original line number Diff line number Diff line
@@ -1945,7 +1945,7 @@ class NetworkCandidateGraph(CandidateGraph): 
        node = NetworkNode(image_path=img_path, image_name=image_name)

        node.parent = self

        node.populate_db()

        return node.id

        return node['node_id']

        

    def copy_images(self, newdir):

        """

autocnet/matcher/tests/test_naive_template.py

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




    def test_subpixel_shift(self):

        result_x, result_y, result_strength = naive_template.pattern_match_autoreg(self._shape,

        result_x, result_y, result_strength, _ = naive_template.pattern_match_autoreg(self._shape,

                                                                                   self._test_image)

        self.assertEqual(result_x, 0.5)

        self.assertEqual(result_y, -1.5)

tests/test_save_load.py

+3 −0
Original line number Diff line number Diff line 
import pytest



from autocnet.examples import get_path

from autocnet.graph.network import CandidateGraph

from autocnet.io.network import load
@@ -6,6 +8,7 @@ import numpy as np 


import pandas as pd



@pytest.mark.xfail(strict=True)

def test_save_project(tmpdir, candidategraph):

    path = tmpdir.join('prject.proj')

    candidategraph.save(path.strpath)