From a869891244188b3140b4a829a6548f198db84975 Mon Sep 17 00:00:00 2001
From: "Laura, Jason R" <jlaura@usgs.gov>
Date: Tue, 2 Apr 2024 13:16:59 -0700
Subject: [PATCH] Updates based on review comments
---
.github/workflows/ci.yml | 3 ---
environment.yml | 2 ++
knoten/csm.py | 2 +-
recipe/meta.yaml | 4 ++--
requirements_test.txt | 2 --
5 files changed, 5 insertions(+), 8 deletions(-)
delete mode 100644 requirements_test.txt
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 62c74d7..ea1f0f5 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 3f900b3..792cdf8 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 fcd2467..da04ae9 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 215af23..50d5571 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 8883f14..0000000
--- a/requirements_test.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-pytest
-pytest-xdist
\ No newline at end of file
--
GitLab