diff --git a/pyproject.toml b/pyproject.toml index 5020193b..2c105c5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -119,7 +119,8 @@ raven-wps = "raven.cli:cli" target-version = [ "py39", "py310", - "py311" + "py311", + "py312" ] [tool.bumpversion] diff --git a/tests/test_wps_caps.py b/tests/test_wps_caps.py index ca73a6d3..04af0df0 100644 --- a/tests/test_wps_caps.py +++ b/tests/test_wps_caps.py @@ -1,9 +1,8 @@ +from common import client_for from pywps import Service from raven.processes import processes -from .common import client_for - def test_wps_caps(): client = client_for(Service(processes=processes)) diff --git a/tests/test_wps_client.py b/tests/test_wps_client.py index 68f167e8..2b904100 100644 --- a/tests/test_wps_client.py +++ b/tests/test_wps_client.py @@ -1,9 +1,8 @@ +from common import client_for from pywps import Service from raven.processes import processes -from .common import client_for - URL = "http://localhost:9099" diff --git a/tests/test_wps_generic_raster_subset.py b/tests/test_wps_generic_raster_subset.py index 6378f40b..256bc34c 100644 --- a/tests/test_wps_generic_raster_subset.py +++ b/tests/test_wps_generic_raster_subset.py @@ -1,14 +1,13 @@ import tempfile import rasterio as rio +from common import CFG_FILE, client_for, get_output from metalink import download as md from pywps import Service from pywps.tests import assert_response_success from raven.processes import RasterSubsetProcess -from .common import CFG_FILE, client_for, get_output - class TestGenericRasterSubsetProcess: def test_simple(self, get_local_testdata): diff --git a/tests/test_wps_generic_shape_properties.py b/tests/test_wps_generic_shape_properties.py index d7673e33..f98e0628 100644 --- a/tests/test_wps_generic_shape_properties.py +++ b/tests/test_wps_generic_shape_properties.py @@ -3,13 +3,12 @@ import geojson import numpy as np +from common import CFG_FILE, client_for, get_output from pywps import Service from pywps.tests import assert_response_success from raven.processes import ShapePropertiesProcess -from .common import CFG_FILE, client_for, get_output - class TestGenericShapePropertiesProcess: @staticmethod diff --git a/tests/test_wps_generic_terrain_analysis.py b/tests/test_wps_generic_terrain_analysis.py index 44750d98..cfc7a8b3 100644 --- a/tests/test_wps_generic_terrain_analysis.py +++ b/tests/test_wps_generic_terrain_analysis.py @@ -1,13 +1,12 @@ import json import pytest +from common import CFG_FILE, client_for, get_output from pywps import Service from pywps.tests import assert_response_success from raven.processes import TerrainAnalysisProcess -from .common import CFG_FILE, client_for, get_output - class TestGenericTerrainAnalysisProcess: def test_shape_subset(self, get_local_testdata): diff --git a/tests/test_wps_generic_zonal_stats.py b/tests/test_wps_generic_zonal_stats.py index d3e1e77a..9c69339b 100644 --- a/tests/test_wps_generic_zonal_stats.py +++ b/tests/test_wps_generic_zonal_stats.py @@ -1,14 +1,13 @@ import json import pytest +from common import CFG_FILE, client_for, count_pixels, get_output from pywps import Service from pywps.tests import assert_response_success from shapely.geometry import MultiPolygon, shape from raven.processes import ZonalStatisticsProcess -from .common import CFG_FILE, client_for, count_pixels, get_output - class TestGenericZonalStatsProcess: def test_simple(self, get_local_testdata): diff --git a/tests/test_wps_hydrobasins_shape_selection.py b/tests/test_wps_hydrobasins_shape_selection.py index 9101c9fa..4ba95b43 100644 --- a/tests/test_wps_hydrobasins_shape_selection.py +++ b/tests/test_wps_hydrobasins_shape_selection.py @@ -1,14 +1,13 @@ import json import pytest +from common import CFG_FILE, client_for, get_output from pywps import Service from pywps.tests import assert_response_success from raven.processes import HydroBasinsSelectionProcess from raven.utils import parse_lonlat -from .common import CFG_FILE, client_for, get_output - class TestParser: def test_parse_lonlat(self): diff --git a/tests/test_wps_nalcms_zonal_stats.py b/tests/test_wps_nalcms_zonal_stats.py index 39e516ee..3dabca59 100644 --- a/tests/test_wps_nalcms_zonal_stats.py +++ b/tests/test_wps_nalcms_zonal_stats.py @@ -1,6 +1,7 @@ import json import pytest +from common import CFG_FILE, client_for, count_pixels, get_output from metalink import download as md from pywps import Service, get_ElementMakerForVersion from pywps.app.basic import get_xpath_ns @@ -12,8 +13,6 @@ NALCMSZonalStatisticsRasterProcess, ) -from .common import CFG_FILE, client_for, count_pixels, get_output - VERSION = "1.0.0" WPS, OWS = get_ElementMakerForVersion(VERSION) xpath_ns = get_xpath_ns(VERSION)