diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c838c73..5f4e526 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: - python-version: '3.11' + python-version: '3.13' - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/geodepy/tests/test_convert.py b/geodepy/tests/test_convert.py index 8f96ae2..21c3bd5 100644 --- a/geodepy/tests/test_convert.py +++ b/geodepy/tests/test_convert.py @@ -72,11 +72,11 @@ def test_geo_grid_transform_interoperability(self): dtype='S4,i4,f8,f8', names=['site', 'zone', 'east', 'north']) - geoed_grid = np.array(list(grid2geo(*x) for x in test_grid_coords[['zone', 'east', 'north']])) + geoed_grid = np.array([grid2geo(*x) for x in test_grid_coords[['zone', 'east', 'north']]]) np.testing.assert_almost_equal(geoed_grid[:, :2], hp2dec_v(np.array(test_geo_coords[['lat', 'lon']].tolist())), decimal=8) - gridded_geo = np.stack(geo2grid(*x) for x in hp2dec_v(np.array(test_geo_coords[['lat', 'lon']].tolist()))) + gridded_geo = np.stack([geo2grid(*x) for x in hp2dec_v(np.array(test_geo_coords[['lat', 'lon']].tolist()))]) np.testing.assert_almost_equal(gridded_geo[:, 2:4].astype(float), np.array(test_grid_coords[['east', 'north']].tolist()), decimal=3) @@ -93,11 +93,14 @@ def test_geo_grid_transform_interoperability_isg(self): dtype='S4,i4,f8,f8', names=['site', 'zone', 'east', 'north']) - geoed_grid = np.array(list(grid2geo(*x, ellipsoid=ans, prj=isg) for x in test_grid_coords[['zone', 'east', 'north']])) + geoed_grid = np.array([grid2geo(*x, ellipsoid=ans, prj=isg) + for x in test_grid_coords[['zone', 'east', 'north']]]) np.testing.assert_almost_equal(geoed_grid[:, :2], np.array(test_geo_coords[['lat', 'lon']].tolist()), decimal=8) - gridded_geo = np.stack(geo2grid(*x, ellipsoid=ans, prj=isg) for x in np.array(test_geo_coords[['lat', 'lon']].tolist())) + gridded_geo = np.stack([geo2grid(*x, ellipsoid=ans, prj=isg) + for x in np.array(test_geo_coords[['lat', 'lon']].tolist()) + ]) np.testing.assert_almost_equal(gridded_geo[:, 2:4].astype(float), np.array(test_grid_coords[['east', 'north']].tolist()), decimal=3) diff --git a/geodepy/transform.py b/geodepy/transform.py index f37ff60..c41c772 100644 --- a/geodepy/transform.py +++ b/geodepy/transform.py @@ -58,9 +58,9 @@ def conform7(x, y, z, trans, vcv=None): # Conformal Transform Eq xyz_after = translation + scale * rot_xyz # Convert Vector to Separate Variables - xtrans = float(xyz_after[0]) - ytrans = float(xyz_after[1]) - ztrans = float(xyz_after[2]) + xtrans = float(xyz_after[0][0]) + ytrans = float(xyz_after[1][0]) + ztrans = float(xyz_after[2][0]) # Transformation uncertainty propagation # Adapted from Harvey B.R. (1998) Practical least squares and statistics for surveyors,