diff --git a/.github/workflows/linux-test.yml b/.github/workflows/linux-test.yml index f1aa9e0..dd7b564 100644 --- a/.github/workflows/linux-test.yml +++ b/.github/workflows/linux-test.yml @@ -73,4 +73,5 @@ jobs: - name: Run tests with pytest run: | + pip install . pytest diff --git a/pyproject.toml b/pyproject.toml index e8abee3..55cbf10 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,13 +1,13 @@ [build-system] requires = [ - "setuptools>=61.0.0", + "setuptools>=64", "wheel" ] build-backend = "setuptools.build_meta" [project] name = "geoapis" -version = "0.3.3" +version = "0.3.4" description = "A package for downloading geospatial data from web APIs." readme = "README.md" authors = [{ name = "Rose pearson", email = "rose.pearson@niwa.co.nz" }] diff --git a/setup.py b/setup.py deleted file mode 100644 index 8ef9667..0000000 --- a/setup.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8 -*- -""" -Created on Wed Jun 30 11:22:08 2021 - -@author: pearsonra -""" -import setuptools - -setuptools.setup( - package_dir={"": "src"}, - packages=setuptools.find_packages(where="src"), -) diff --git a/src/geoapis/__init__.py b/src/geoapis/__init__.py index e840111..04838bb 100644 --- a/src/geoapis/__init__.py +++ b/src/geoapis/__init__.py @@ -4,4 +4,4 @@ @author: pearsonra """ -__version__ = "0.3.3" +__version__ = "0.3.4" diff --git a/tests/test_lidar/test_lidar.py b/tests/test_lidar/test.py similarity index 99% rename from tests/test_lidar/test_lidar.py rename to tests/test_lidar/test.py index 31ffe49..21dab23 100644 --- a/tests/test_lidar/test_lidar.py +++ b/tests/test_lidar/test.py @@ -13,7 +13,7 @@ import shutil import numpy -from src.geoapis import lidar +from geoapis import lidar class OpenTopographyTest(unittest.TestCase): diff --git a/tests/test_lidar_by_name/test_lidar_by_name.py b/tests/test_lidar_by_name/test.py similarity index 99% rename from tests/test_lidar_by_name/test_lidar_by_name.py rename to tests/test_lidar_by_name/test.py index 66fcae1..505faa6 100644 --- a/tests/test_lidar_by_name/test_lidar_by_name.py +++ b/tests/test_lidar_by_name/test.py @@ -13,7 +13,7 @@ import shutil import numpy -from src.geoapis import lidar +from geoapis import lidar class OpenTopographyTestByName(unittest.TestCase): diff --git a/tests/test_lidar_subfolders/test_lidar_subfolders.py b/tests/test_lidar_subfolders/test.py similarity index 99% rename from tests/test_lidar_subfolders/test_lidar_subfolders.py rename to tests/test_lidar_subfolders/test.py index 8a3a596..dc01b8e 100644 --- a/tests/test_lidar_subfolders/test_lidar_subfolders.py +++ b/tests/test_lidar_subfolders/test.py @@ -13,7 +13,7 @@ import shutil import numpy -from src.geoapis import lidar +from geoapis import lidar class OpenTopographyTestSubfolders(unittest.TestCase): diff --git a/tests/test_raster_linz_in_bounds/test_raster_linz_in_bounds.py b/tests/test_raster_linz_in_bounds/test.py similarity index 99% rename from tests/test_raster_linz_in_bounds/test_raster_linz_in_bounds.py rename to tests/test_raster_linz_in_bounds/test.py index 5a7c2e7..8dbe839 100644 --- a/tests/test_raster_linz_in_bounds/test_raster_linz_in_bounds.py +++ b/tests/test_raster_linz_in_bounds/test.py @@ -15,7 +15,7 @@ import os import logging -from src.geoapis import raster +from geoapis import raster class LinzRasterTest(unittest.TestCase): diff --git a/tests/test_raster_lris_in_bounds/test_raster_lris_in_bounds.py b/tests/test_raster_lris_in_bounds/test.py similarity index 99% rename from tests/test_raster_lris_in_bounds/test_raster_lris_in_bounds.py rename to tests/test_raster_lris_in_bounds/test.py index 102d0a2..cc30b1c 100644 --- a/tests/test_raster_lris_in_bounds/test_raster_lris_in_bounds.py +++ b/tests/test_raster_lris_in_bounds/test.py @@ -15,7 +15,7 @@ import os import logging -from src.geoapis import raster +from geoapis import raster class LrisRasterTest(unittest.TestCase): diff --git a/tests/test_vector_linz/test_vector_linz.py b/tests/test_vector_linz/test.py similarity index 99% rename from tests/test_vector_linz/test_vector_linz.py rename to tests/test_vector_linz/test.py index 2c8fd8f..8eef9e2 100644 --- a/tests/test_vector_linz/test_vector_linz.py +++ b/tests/test_vector_linz/test.py @@ -13,7 +13,7 @@ import os import geopandas -from src.geoapis import vector +from geoapis import vector class LinzVectorsTest(unittest.TestCase): diff --git a/tests/test_vector_linz_in_bounds/test_vector_linz_in_bounds.py b/tests/test_vector_linz_in_bounds/test.py similarity index 99% rename from tests/test_vector_linz_in_bounds/test_vector_linz_in_bounds.py rename to tests/test_vector_linz_in_bounds/test.py index aba72aa..9636922 100644 --- a/tests/test_vector_linz_in_bounds/test_vector_linz_in_bounds.py +++ b/tests/test_vector_linz_in_bounds/test.py @@ -14,7 +14,7 @@ import dotenv import os -from src.geoapis import vector +from geoapis import vector class LinzVectorsTest(unittest.TestCase): diff --git a/tests/test_vector_lris/test_vector_lris.py b/tests/test_vector_lris/test.py similarity index 99% rename from tests/test_vector_lris/test_vector_lris.py rename to tests/test_vector_lris/test.py index 33734e5..5576ff2 100644 --- a/tests/test_vector_lris/test_vector_lris.py +++ b/tests/test_vector_lris/test.py @@ -13,7 +13,7 @@ import os import geopandas -from src.geoapis import vector +from geoapis import vector class LrisVectorsTest(unittest.TestCase): diff --git a/tests/test_vector_lris_in_bounds/test_vector_lris_in_bounds.py b/tests/test_vector_lris_in_bounds/test.py similarity index 99% rename from tests/test_vector_lris_in_bounds/test_vector_lris_in_bounds.py rename to tests/test_vector_lris_in_bounds/test.py index 7eae5f3..1d67f86 100644 --- a/tests/test_vector_lris_in_bounds/test_vector_lris_in_bounds.py +++ b/tests/test_vector_lris_in_bounds/test.py @@ -14,7 +14,7 @@ import dotenv import os -from src.geoapis import vector +from geoapis import vector class LrisVectorsTest(unittest.TestCase): diff --git a/tests/test_vector_stats_nz/test_vector_stats_nz.py b/tests/test_vector_stats_nz/test.py similarity index 99% rename from tests/test_vector_stats_nz/test_vector_stats_nz.py rename to tests/test_vector_stats_nz/test.py index dda7b8c..7db2421 100644 --- a/tests/test_vector_stats_nz/test_vector_stats_nz.py +++ b/tests/test_vector_stats_nz/test.py @@ -13,7 +13,7 @@ import os import geopandas -from src.geoapis import vector +from geoapis import vector class StatsNzVectorsTest(unittest.TestCase): diff --git a/tests/test_vector_stats_nz_in_bounds/test_vector_stats_nz_in_bounds.py b/tests/test_vector_stats_nz_in_bounds/test.py similarity index 99% rename from tests/test_vector_stats_nz_in_bounds/test_vector_stats_nz_in_bounds.py rename to tests/test_vector_stats_nz_in_bounds/test.py index 2cf9a41..9331fd4 100644 --- a/tests/test_vector_stats_nz_in_bounds/test_vector_stats_nz_in_bounds.py +++ b/tests/test_vector_stats_nz_in_bounds/test.py @@ -14,7 +14,7 @@ import dotenv import os -from src.geoapis import vector +from geoapis import vector class StatsNzVectorsTest(unittest.TestCase):