Commit 5370ca10 authored by Laura, Jason R's avatar Laura, Jason R
Browse files

Merge branch 'main' into 'main' 

Main

See merge request astrogeology/autocnet!682
parents fdc7b868 8e295398

CHANGELOG.md

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ release. 
-->

## [Unreleased]



## [1.0.2]

### Fixed

- API updates for numpy changing types and SQLAlchemy2.0.

- Tests updated or marked xfail for API changes



## [1.0.1]

### Added

- Logging to `affine` transformation that warns when the absolute value of the shear on the affine transformation is greater than 1e-2. High shear in the transformation matric was observed attempting to match nadir LROC-NAC to high slew LROC-NAC data. These high slew images do not match well to nadir images. Additionally, the `x_read_length` and `y_read_length` variables in the `Roi` class (`roi.py`) have a hard coded read length of two times the passed size. This read size is insufficient as the affine shear increases. A candidate enhancement would be to automatically compute the read size based on the affine transformation. This was not done in this addition as matching between high slew and nadir images using a correlation coefficient based approach is quite poor.

conda/meta.yaml

+39 −37
Original line number Diff line number Diff line 
package:

  name: autocnet

  version: 1.0.1

  version: 1.0.2

  

channels:

  - conda-forge

  - menpo

  - usgs-astrogeology

  

source:

   git_url: https://github.com/USGS-Astrogeology/autocnet.git

   git_rev: dev

   git_url: https://code.usgs.gov/astrogeology/autocnet

   git_rev: main



requirements:

    build:

      - csmapi>=1.0.1

      - dill=0.3.2

      - csmapi

      - dill

      - geoalchemy2

      - geopandas=0.8.1

      - geopandas

      - kalasiris

      - knoten>=0.2.1

      - networkx=2.4

      - opencv<=3.5

      - plio>=1.2.3

      - plurmy>=0.1.1

      - pyyaml=5.3.1

      - knoten

      - networkx

      - opencv

      - plio

      - plurmy

      - pyyaml

      - redis-py

      - scikit-image=0.17.2

      - scipy=1.5.1

      - shapely=1.7.0

      - sqlalchemy-utils>=0.37.0

      - scikit-image

      - scipy

      - shapely

      - sqlalchemy-utils

    host:

      - python>=3

      - pip

      - python>=3.10

    run:

      - python>=3.10

      - csmapi

      - cython

      - cyvlfeat

      - matplotlib

      - dill

      - conda-forge::gdal

      - geoalchemy2

      - geopandas

      - hoggorm

      - imageio

      - ipykernel

      - jupyter

      - kalasiris

      - knoten

      - ncurses

      - networkx

      - conda-forge::knoten

      - networkx>=2,<3

      - numpy

      - opencv<=3.5

      - pillow

      - plio>=1.3

      - opencv

      - conda-forge::plio>=1.3

      - pandas

      - pyyaml

      - plio>=1.5.4

      - plurmy

      - proj >= 7.0.0, <8

      - pvl >= 1.0

      - psycopg2

      - pyproj

      - python>=3

      - pyyaml

      - redis-py

      - scikit-image

      - pvl>=1.0,<2

      - proj

      - conda-forge::pyproj 

      - richdem

      - scikit-image>=0.17

      - scikit-learn

      - scipy<=1.2.1

      - scipy

      - shapely

      - sqlalchemy

      - sqlalchemy-utils>=0.37.0

      - usgscsm

      - sqlalchemy-utils

      - redis-py<5

      - conda-forge::usgscsm>=1.7.0

      - vlfeat

      - protobuf



test:

  imports:

setup.py

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ from setuptools import setup, find_packages 
with open('README.md', 'r') as f:

    long_description = f.read()



__version__ = '1.0.1'

__version__ = '1.0.2'



def setup_package():

    setup(