diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62c74d7dcae993ed8e1e7cc973ad7659382fac72..ea1f0f53eaed04abd8c9db70cba19ef833a56659 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,9 +33,6 @@ jobs: auto-activate-base: false auto-update-conda: true python-version: ${{ matrix.python-version }} - - name: Add test requirements - run: | - pip install -r requirements_test.txt - name: Check build environment run: | conda list diff --git a/environment.yml b/environment.yml index 3f900b3aeb8d98f186729b3f7c5ef7f534c38aa8..792cdf89b07b606594199553573e298dbccc8b20 100644 --- a/environment.yml +++ b/environment.yml @@ -19,6 +19,8 @@ dependencies: - plotly-orca - psutil - pvl + - pytest + - pytest-xdist - pyproj - kalasiris - python>=3 diff --git a/knoten/csm.py b/knoten/csm.py index fcd24678a80c62cc10f2e87d330eb8c8752383eb..da04ae9596101ad51ba9f5e30dabf51cf4fbfc43 100644 --- a/knoten/csm.py +++ b/knoten/csm.py @@ -127,7 +127,7 @@ def generate_ground_point(dem, image_pt, camera): GeoDataset object generated from Plio off of a Digital Elevation Model (DEM) image_pt : tuple - Pair of x, y (line, sample) coordinates in pixel space + Pair of x, y (sample, line) coordinates in pixel space camera : object USGSCSM camera model object max_its : int, optional diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 215af236191ed6de50acbfc4c74c47993dd5393f..50d5571872f77561ab4e1db558257debe843212f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,7 @@ requirements: - python - setuptools run: - - ale>=0.3.2 + - ale>=0.10.0 - python - csmapi>=1.0 - gdal>=3.0.0 @@ -34,7 +34,7 @@ requirements: - requests - scipy - shapely - - usgscsm>=1.3.1 + - usgscsm>=2.0 test: imports: diff --git a/requirements_test.txt b/requirements_test.txt deleted file mode 100644 index 8883f14a15f130f71c8f74f3730c6a5c25d02439..0000000000000000000000000000000000000000 --- a/requirements_test.txt +++ /dev/null @@ -1,2 +0,0 @@ -pytest -pytest-xdist \ No newline at end of file