From b69d08687629ea4ec052206ffa09f1b85be747b6 Mon Sep 17 00:00:00 2001 From: arthurdjn <48992917+arthurdjn@users.noreply.github.com> Date: Thu, 13 Jun 2024 00:49:17 +0200 Subject: [PATCH] fix: update method param names (#4) * refactor: homogenize API design for crud operations * fix: update naming and associated tests * fix: geoserver naming params * fix: update gwc filter method return types * fix: typo in docstring params * fix: reset version before release * fix: update notebooks to reflect the refactor * release: bump new version 0.0.1 -> 0.1.0 --- CHANGELOG.md | 20 ++++++ geoserver/__init__.py | 2 +- geoserver/geoserver.py | 2 +- geoserver/geowebcache.py | 2 +- notebooks/All In One.ipynb | 58 ++++++++--------- notebooks/Image Mosaic.ipynb | 38 +++++------ notebooks/Layer Groups.ipynb | 8 +-- notebooks/Layers.ipynb | 6 +- notebooks/Stores.ipynb | 120 +++++------------------------------ notebooks/Styles.ipynb | 19 ++++-- notebooks/Workspaces.ipynb | 8 +-- pyproject.toml | 8 +-- 12 files changed, 115 insertions(+), 176 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbf432b..0af650a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### New Contributors +## 0.1.0 (2024-06-12) + +### What's Changed + +#### Fixed + +- Updated version to 0.0.1 to 0.1.0 for PyPI release. + +#### Added + +#### Changed + +- Renamed and restructured some endpoints / methods to share a similar structure. +(e.g. `get_workspace(workspace: str)` -> `get_workspace(name: str)`, `get_layer(layer: str)` -> `get_layer(name: str)`) +- Updated documentation and examples to reflect the changes. + +#### Removed + +### New Contributors + ## 0.0.1 (2024-06-06) ### What's Changed diff --git a/geoserver/__init__.py b/geoserver/__init__.py index 4140215..6c77ea2 100755 --- a/geoserver/__init__.py +++ b/geoserver/__init__.py @@ -1,4 +1,4 @@ from .geoserver import GeoServer from .geowebcache import GeoWebCache -__version__ = "0.0.3" +__version__ = "0.1.0" diff --git a/geoserver/geoserver.py b/geoserver/geoserver.py index 628cbc6..54432d8 100755 --- a/geoserver/geoserver.py +++ b/geoserver/geoserver.py @@ -1142,7 +1142,7 @@ def create_feature_type( Args: body: The body of the request used to create the feature type. workspace: The name of the workspace. - store: The name of the data store. + store: Optional. The name of the data store. Returns: Success message. diff --git a/geoserver/geowebcache.py b/geoserver/geowebcache.py index 781a059..a79e6d0 100755 --- a/geoserver/geowebcache.py +++ b/geoserver/geowebcache.py @@ -247,7 +247,7 @@ def delete_gridset(self, name: str) -> str: """Deletes a single gridset. Args: - gridset: The name of the gridset. + name: The name of the gridset. Returns: Success message. diff --git a/notebooks/All In One.ipynb b/notebooks/All In One.ipynb index be0168f..7d6e80c 100644 --- a/notebooks/All In One.ipynb +++ b/notebooks/All In One.ipynb @@ -86,8 +86,8 @@ "metadata": {}, "outputs": [], "source": [ - "if geoserver.workspace_exists(workspace=\"demo\"):\n", - " geoserver.delete_workspace(workspace=\"demo\", recurse=True)" + "if geoserver.workspace_exists(\"demo\"):\n", + " geoserver.delete_workspace(\"demo\", recurse=True)" ] }, { @@ -200,7 +200,7 @@ "text/plain": [ "{'workspace': {'name': 'demo',\n", " 'isolated': False,\n", - " 'dateCreated': '2024-06-11 20:50:39.223 UTC',\n", + " 'dateCreated': '2024-06-12 22:29:47.282 UTC',\n", " 'dataStores': 'http://localhost:8080/geoserver/rest/workspaces/demo/datastores.json',\n", " 'coverageStores': 'http://localhost:8080/geoserver/rest/workspaces/demo/coveragestores.json',\n", " 'wmsStores': 'http://localhost:8080/geoserver/rest/workspaces/demo/wmsstores.json',\n", @@ -213,7 +213,7 @@ } ], "source": [ - "geoserver.get_workspace(workspace=\"demo\")" + "geoserver.get_workspace(\"demo\")" ] }, { @@ -248,7 +248,7 @@ "body = \"demotrue\"\n", "\n", "\n", - "geoserver.update_workspace(body=body, workspace=\"demo\")" + "geoserver.update_workspace(\"demo\", body=body)" ] }, { @@ -589,8 +589,8 @@ " {'@key': 'url',\n", " '$': 'file:/opt/geoserver/data_dir/data/demo/buildings/buildings.shp'}]},\n", " '_default': False,\n", - " 'dateCreated': '2024-06-11 20:50:39.320 UTC',\n", - " 'dateModified': '2024-06-11 20:50:39.331 UTC',\n", + " 'dateCreated': '2024-06-12 22:29:47.368 UTC',\n", + " 'dateModified': '2024-06-12 22:29:47.377 UTC',\n", " 'disableOnConnFailure': False,\n", " 'featureTypes': 'http://localhost:8080/geoserver/rest/workspaces/demo/datastores/buildings/featuretypes.json'}}" ] @@ -783,8 +783,8 @@ " 'workspace': {'name': 'demo',\n", " 'href': 'http://localhost:8080/geoserver/rest/workspaces/demo.json'},\n", " '_default': False,\n", - " 'dateCreated': '2024-06-11 20:50:39.872 UTC',\n", - " 'dateModified': '2024-06-11 20:50:39.898 UTC',\n", + " 'dateCreated': '2024-06-12 22:29:47.909 UTC',\n", + " 'dateModified': '2024-06-12 22:29:47.928 UTC',\n", " 'disableOnConnFailure': False,\n", " 'url': 'file:data/demo/raster/raster.tif',\n", " 'coverages': 'http://localhost:8080/geoserver/rest/workspaces/demo/coveragestores/raster/coverages.json'}}" @@ -943,26 +943,26 @@ " 'translateX': -1.5140908372979216,\n", " 'translateY': 48.638061247682344},\n", " 'crs': 'EPSG:4326'},\n", - " 'supportedFormats': {'string': ['GEOTIFF',\n", - " 'ERDASImg',\n", - " 'RST',\n", - " 'GeoPackage (mosaic)',\n", + " 'supportedFormats': {'string': ['GIF',\n", + " 'PNG',\n", + " 'JPEG',\n", + " 'TIFF',\n", " 'NetCDF',\n", - " 'ENVIHdr',\n", - " 'ArcGrid',\n", - " 'NITF',\n", - " 'RPFTOC',\n", - " 'VRT',\n", " 'EHdr',\n", - " 'ImagePyramid',\n", + " 'VRT',\n", + " 'GEOTIFF',\n", " 'DTED',\n", + " 'ArcGrid',\n", + " 'RST',\n", + " 'GeoPackage (mosaic)',\n", " 'ImageMosaic',\n", - " 'AIG',\n", " 'SRP',\n", - " 'GIF',\n", - " 'PNG',\n", - " 'JPEG',\n", - " 'TIFF']},\n", + " 'ENVIHdr',\n", + " 'ERDASImg',\n", + " 'ImagePyramid',\n", + " 'AIG',\n", + " 'RPFTOC',\n", + " 'NITF']},\n", " 'interpolationMethods': {'string': ['nearest neighbor',\n", " 'bilinear',\n", " 'bicubic']},\n", @@ -1075,7 +1075,7 @@ } ], "source": [ - "geoserver.get_style(style=\"point\")" + "geoserver.get_style(\"point\")" ] }, { @@ -1145,7 +1145,7 @@ " body = file.read()\n", "\n", " \n", - "geoserver.update_style(style=\"elevation\", body=body, workspace=\"demo\")" + "geoserver.update_style(\"elevation\", body=body, workspace=\"demo\")" ] }, { @@ -1177,7 +1177,7 @@ "assert file_path.exists(), f\"File not found: {file_path.as_posix()!r}\"\n", "\n", "\n", - "geoserver.upload_style(file=file_path, workspace=\"demo\", style=\"elevation_v2\")" + "geoserver.upload_style(file=file_path, workspace=\"demo\", name=\"elevation_v2\")" ] }, { @@ -1215,7 +1215,7 @@ " body = file.read()\n", "\n", " \n", - "geoserver.update_style(style=\"elevation\", body=body, workspace=\"demo\")" + "geoserver.update_style(\"elevation\", body=body, workspace=\"demo\")" ] }, { @@ -1271,7 +1271,7 @@ } ], "source": [ - "xml = geoserver.download_style(style=\"elevation\", workspace=\"demo\")\n", + "xml = geoserver.download_style(\"elevation\", workspace=\"demo\")\n", "print(xml)" ] }, diff --git a/notebooks/Image Mosaic.ipynb b/notebooks/Image Mosaic.ipynb index 0b6e86c..d005529 100644 --- a/notebooks/Image Mosaic.ipynb +++ b/notebooks/Image Mosaic.ipynb @@ -132,7 +132,7 @@ "\n", "\n", "# If the store already exists, it will be overwritten\n", - "geoserver.upload_coverage_store(file=file_path, format=\"imagemosaic\", workspace=\"demo\", store=\"polyphemus\")" + "geoserver.upload_coverage_store(file=file_path, format=\"imagemosaic\", workspace=\"demo\", name=\"polyphemus\")" ] }, { @@ -148,7 +148,7 @@ " file=\"file:/path/to/the/file/polyphemus_20130302.nc\", \n", " format=\"imagemosaic\", \n", " workspace=\"demo\", \n", - " store=\"poly-incremental\",\n", + " name=\"poly-incremental\",\n", ")\n", "```\n", "\n", @@ -159,7 +159,7 @@ " file=\"file:/path/to/the/mosaic/folder\", \n", " format=\"imagemosaic\", \n", " workspace=\"demo\", \n", - " store=\"poly-incremental\",\n", + " name=\"poly-incremental\",\n", ")\n", "```" ] @@ -271,26 +271,26 @@ " EPSG:4326\n", " \n", " \n", - " VRT\n", - " ImagePyramid\n", - " EHdr\n", - " GEOTIFF\n", - " RST\n", - " NITF\n", - " ImageMosaic\n", - " RPFTOC\n", " GIF\n", " PNG\n", " JPEG\n", " TIFF\n", - " ERDASImg\n", " NetCDF\n", - " GeoPackage (mosaic)\n", + " EHdr\n", + " VRT\n", + " GEOTIFF\n", + " DTED\n", " ArcGrid\n", + " RST\n", + " GeoPackage (mosaic)\n", + " ImageMosaic\n", + " SRP\n", " ENVIHdr\n", - " DTED\n", + " ERDASImg\n", + " ImagePyramid\n", " AIG\n", - " SRP\n", + " RPFTOC\n", + " NITF\n", " \n", " \n", " nearest neighbor\n", @@ -389,7 +389,7 @@ } ], "source": [ - "xml = geoserver.get_coverage(workspace=\"demo\", store=\"polyphemus\", coverage=\"O3\", format=\"xml\")\n", + "xml = geoserver.get_coverage(name=\"O3\", workspace=\"demo\", store=\"polyphemus\", format=\"xml\")\n", "print(xml)" ] }, @@ -439,7 +439,7 @@ } ], "source": [ - "xml = geoserver.get_coverage_index(workspace=\"demo\", store=\"polyphemus\", coverage=\"O3\", format=\"xml\")\n", + "xml = geoserver.get_coverage_index(name=\"O3\", workspace=\"demo\", store=\"polyphemus\", format=\"xml\")\n", "print(xml)" ] }, @@ -520,7 +520,7 @@ } ], "source": [ - "xml = geoserver.get_coverage_granules(workspace=\"demo\", store=\"polyphemus\", coverage=\"O3\", format=\"xml\")\n", + "xml = geoserver.get_coverage_granules(name=\"O3\", workspace=\"demo\", store=\"polyphemus\", format=\"xml\")\n", "print(xml)" ] }, @@ -550,7 +550,7 @@ } ], "source": [ - "geoserver.delete_coverage_granules(workspace=\"demo\", store=\"polyphemus\", coverage=\"O3\", filter=\"location='polyphemus_20130301.nc'\")" + "geoserver.delete_coverage_granules(name=\"O3\", workspace=\"demo\", store=\"polyphemus\", filter=\"location='polyphemus_20130301.nc'\")" ] }, { diff --git a/notebooks/Layer Groups.ipynb b/notebooks/Layer Groups.ipynb index 3f65176..48fbfaa 100644 --- a/notebooks/Layer Groups.ipynb +++ b/notebooks/Layer Groups.ipynb @@ -253,7 +253,7 @@ " 'maxy': 48.638064247,\n", " 'crs': {'@class': 'org.geotools.referencing.crs.DefaultEngineeringCRS',\n", " '$': 'EPSG:404000'}},\n", - " 'dateCreated': '2024-06-10 20:30:47.301 UTC'}}" + " 'dateCreated': '2024-06-12 22:31:31.591 UTC'}}" ] }, "execution_count": 8, @@ -262,7 +262,7 @@ } ], "source": [ - "geoserver.get_layer_group(layer_group=\"my_group\", workspace=\"demo\")" + "geoserver.get_layer_group(name=\"my_group\", workspace=\"demo\")" ] }, { @@ -304,7 +304,7 @@ "\n", "\"\"\"\n", "\n", - "geoserver.update_layer_group(body=body, layer_group=\"my_group\", workspace=\"demo\")" + "geoserver.update_layer_group(name=\"my_group\", body=body, workspace=\"demo\")" ] }, { @@ -333,7 +333,7 @@ } ], "source": [ - "geoserver.delete_layer_group(layer_group=\"my_group\", workspace=\"demo\")" + "geoserver.delete_layer_group(name=\"my_group\", workspace=\"demo\")" ] } ], diff --git a/notebooks/Layers.ipynb b/notebooks/Layers.ipynb index 342acb5..04babe9 100644 --- a/notebooks/Layers.ipynb +++ b/notebooks/Layers.ipynb @@ -217,7 +217,7 @@ " 'name': 'demo:buildings',\n", " 'href': 'http://localhost:8080/geoserver/rest/workspaces/demo/datastores/buildings/featuretypes/buildings.json'},\n", " 'attribution': {'logoWidth': 0, 'logoHeight': 0},\n", - " 'dateCreated': '2024-06-10 20:30:51.165 UTC'}}" + " 'dateCreated': '2024-06-12 22:31:59.747 UTC'}}" ] }, "execution_count": 8, @@ -226,7 +226,7 @@ } ], "source": [ - "geoserver.get_layer(workspace=\"demo\", layer=\"buildings\")" + "geoserver.get_layer(name=\"buildings\", workspace=\"demo\")" ] }, { @@ -271,7 +271,7 @@ "\n", "\"\"\"\n", "\n", - "geoserver.update_layer(workspace=\"demo\", layer=\"buildings\", body=body)" + "geoserver.update_layer(name=\"buildings\", workspace=\"demo\", body=body)" ] }, { diff --git a/notebooks/Stores.ipynb b/notebooks/Stores.ipynb index 190d7a8..17e607d 100644 --- a/notebooks/Stores.ipynb +++ b/notebooks/Stores.ipynb @@ -164,7 +164,7 @@ " {'@key': 'url',\n", " '$': 'file:/opt/geoserver/data_dir/data/demo/buildings/'}]},\n", " '_default': False,\n", - " 'dateCreated': '2024-06-10 20:31:01.205 UTC',\n", + " 'dateCreated': '2024-06-12 22:36:06.144 UTC',\n", " 'disableOnConnFailure': False,\n", " 'featureTypes': 'http://localhost:8080/geoserver/rest/workspaces/demo/datastores/buildings/featuretypes.json'}}" ] @@ -175,7 +175,7 @@ } ], "source": [ - "geoserver.get_data_store(workspace=\"demo\", store=\"buildings\")" + "geoserver.get_data_store(name=\"buildings\", workspace=\"demo\")" ] }, { @@ -200,7 +200,7 @@ " file:/opt/geoserver/data_dir/data/demo/buildings/\n", " \n", " <__default>false\n", - " 2024-06-10 20:31:01.205 UTC\n", + " 2024-06-12 22:36:06.144 UTC\n", " false\n", " \n", " \n", @@ -210,7 +210,7 @@ } ], "source": [ - "xml = geoserver.get_data_store(workspace=\"demo\", store=\"buildings\", format=\"xml\")\n", + "xml = geoserver.get_data_store(name=\"buildings\", workspace=\"demo\", format=\"xml\")\n", "print(xml)" ] }, @@ -738,7 +738,7 @@ } ], "source": [ - "geoserver.get_feature_type(workspace=\"demo\", feature_type=\"buildings\")" + "geoserver.get_feature_type(name=\"buildings\", workspace=\"demo\")" ] }, { @@ -770,8 +770,8 @@ "```python\n", "geoserver.upload_data_store(\n", " file=\"file:/opt/geoserver/data_dir/data/demo\", \n", + " name=\"buildings_v2\",\n", " workspace=\"demo\", \n", - " store=\"buildings_v2\",\n", " configure=\"all\"\n", ")\n", "```" @@ -884,7 +884,7 @@ "\"\"\"\n", "\n", "\n", - "geoserver.create_data_store(workspace=\"demo\", body=body)" + "geoserver.create_data_store(body=body, workspace=\"demo\")" ] }, { @@ -935,7 +935,7 @@ " true\n", " 50\n", " 5432\n", - " crypt2:t5ynxVdFKq7KcFZo79isur3Gf1r0AaHe3br9LA43i7M=\n", + " crypt2:lxZ7pgVY09l9utgaQLLpL1einM41hhp3CAkpZoU7alc=\n", " postgis\n", " http://demo\n", " true\n", @@ -943,7 +943,7 @@ " true\n", " \n", " <__default>false\n", - " 2024-06-10 20:31:01.300 UTC\n", + " 2024-06-12 22:36:06.227 UTC\n", " false\n", " \n", " \n", @@ -953,7 +953,7 @@ } ], "source": [ - "xml = geoserver.get_data_store(workspace=\"demo\", store=\"db\", format=\"xml\")\n", + "xml = geoserver.get_data_store(name=\"db\", workspace=\"demo\", format=\"xml\")\n", "print(xml)" ] }, @@ -981,99 +981,13 @@ "name": "stdout", "output_type": "stream", "text": [ - "FAILURE:\n", - "Unable to open datasource `../data/vectors/landuse.shp' with the following drivers.\n", - " -> `FITS'\n", - " -> `PCIDSK'\n", - " -> `netCDF'\n", - " -> `PDS4'\n", - " -> `VICAR'\n", - " -> `JP2OpenJPEG'\n", - " -> `PDF'\n", - " -> `MBTiles'\n", - " -> `BAG'\n", - " -> `EEDA'\n", - " -> `OGCAPI'\n", - " -> `ESRI Shapefile'\n", - " -> `MapInfo File'\n", - " -> `UK .NTF'\n", - " -> `LVBAG'\n", - " -> `OGR_SDTS'\n", - " -> `S57'\n", - " -> `DGN'\n", - " -> `OGR_VRT'\n", - " -> `REC'\n", - " -> `Memory'\n", - " -> `CSV'\n", - " -> `NAS'\n", - " -> `GML'\n", - " -> `GPX'\n", - " -> `LIBKML'\n", - " -> `KML'\n", - " -> `GeoJSON'\n", - " -> `GeoJSONSeq'\n", - " -> `ESRIJSON'\n", - " -> `TopoJSON'\n", - " -> `Interlis 1'\n", - " -> `Interlis 2'\n", - " -> `OGR_GMT'\n", - " -> `GPKG'\n", - " -> `SQLite'\n", - " -> `ODBC'\n", - " -> `WAsP'\n", - " -> `PGeo'\n", - " -> `MSSQLSpatial'\n", - " -> `OGR_OGDI'\n", - " -> `PostgreSQL'\n", - " -> `MySQL'\n", - " -> `OpenFileGDB'\n", - " -> `DXF'\n", - " -> `CAD'\n", - " -> `FlatGeobuf'\n", - " -> `Geoconcept'\n", - " -> `GeoRSS'\n", - " -> `GPSTrackMaker'\n", - " -> `VFK'\n", - " -> `PGDUMP'\n", - " -> `OSM'\n", - " -> `GPSBabel'\n", - " -> `OGR_PDS'\n", - " -> `WFS'\n", - " -> `OAPIF'\n", - " -> `SOSI'\n", - " -> `Geomedia'\n", - " -> `EDIGEO'\n", - " -> `SVG'\n", - " -> `CouchDB'\n", - " -> `Cloudant'\n", - " -> `Idrisi'\n", - " -> `ARCGEN'\n", - " -> `XLS'\n", - " -> `ODS'\n", - " -> `XLSX'\n", - " -> `Elasticsearch'\n", - " -> `Walk'\n", - " -> `Carto'\n", - " -> `AmigoCloud'\n", - " -> `SXF'\n", - " -> `Selafin'\n", - " -> `JML'\n", - " -> `PLSCENES'\n", - " -> `CSW'\n", - " -> `VDV'\n", - " -> `GMLAS'\n", - " -> `MVT'\n", - " -> `NGW'\n", - " -> `MapML'\n", - " -> `TIGER'\n", - " -> `AVCBin'\n", - " -> `AVCE00'\n", - " -> `HTTP'\n" + "Warning 1: Layer creation options ignored since an existing layer is\n", + " being appended to.\n" ] } ], "source": [ - "!ogr2ogr -f PostgreSQL PG:\"host=localhost port=5432 user=admin dbname=db password=postgres\" ../data/vectors/landuse.shp -nlt PROMOTE_TO_MULTI -lco OVERWRITE=YES" + "!ogr2ogr -f PostgreSQL PG:\"host=localhost port=5432 user=admin dbname=db password=postgres\" ../tests/data/vectors/landuse.shp -nlt PROMOTE_TO_MULTI -lco OVERWRITE=YES" ] }, { @@ -1112,7 +1026,7 @@ "\"\"\"\n", "\n", "\n", - "geoserver.create_feature_type(workspace=\"demo\", store=\"db\", body=body)" + "geoserver.create_feature_type(body=body, workspace=\"demo\", store=\"db\")" ] }, { @@ -1179,7 +1093,7 @@ "\n", "\n", "try:\n", - " geoserver.create_feature_type(workspace=\"demo\", store=\"db\", body=body)\n", + " geoserver.create_feature_type(body=body, workspace=\"demo\", store=\"db\")\n", "except GeoServerError as e:\n", " if e.status_code == 500:\n", " print(f\"[WARNING] Could not add feature_type: {e}\")\n", @@ -1240,7 +1154,7 @@ "\"\"\"\n", "\n", "\n", - "geoserver.create_wmts_store(workspace=\"demo\", body=body)" + "geoserver.create_wmts_store(body=body, workspace=\"demo\")" ] }, { @@ -1307,7 +1221,7 @@ "\"\"\"\n", "\n", "\n", - "geoserver.create_wmts_layer(workspace=\"demo\", store=\"basemap-nat-geo-datastore\", body=body)" + "geoserver.create_wmts_layer(body=body, workspace=\"demo\", store=\"basemap-nat-geo-datastore\")" ] }, { diff --git a/notebooks/Styles.ipynb b/notebooks/Styles.ipynb index bdb3438..b0283d9 100644 --- a/notebooks/Styles.ipynb +++ b/notebooks/Styles.ipynb @@ -173,7 +173,7 @@ } ], "source": [ - "geoserver.get_style(style=\"point\")" + "geoserver.get_style(\"point\")" ] }, { @@ -243,7 +243,7 @@ " body = file.read()\n", "\n", "\n", - "geoserver.update_style(style=\"elevation\", body=body, workspace=\"demo\")" + "geoserver.update_style(\"elevation\", body=body, workspace=\"demo\")" ] }, { @@ -277,7 +277,7 @@ "assert file_path.exists(), f\"File not found: {file_path.as_posix()!r}\"\n", "\n", "\n", - "geoserver.upload_style(file=file_path, workspace=\"demo\", style=\"elevation\", overwrite=True)" + "geoserver.upload_style(file=file_path, workspace=\"demo\", name=\"elevation\", overwrite=True)" ] }, { @@ -315,7 +315,7 @@ " body = file.read()\n", "\n", "\n", - "geoserver.update_style(style=\"elevation\", body=body, workspace=\"demo\")" + "geoserver.update_style(\"elevation\", body=body, workspace=\"demo\")" ] }, { @@ -344,7 +344,7 @@ } ], "source": [ - "geoserver.upload_style(file=file_path, workspace=\"demo\", style=\"elevation\", overwrite=True)" + "geoserver.upload_style(file=file_path, workspace=\"demo\", name=\"elevation\", overwrite=True)" ] }, { @@ -400,7 +400,7 @@ } ], "source": [ - "xml = geoserver.download_style(style=\"elevation\", workspace=\"demo\")\n", + "xml = geoserver.download_style(name=\"elevation\", workspace=\"demo\")\n", "print(xml)" ] }, @@ -504,8 +504,13 @@ } ], "source": [ - "geoserver.delete_style(style=\"elevation\", workspace=\"demo\", recurse=True)" + "geoserver.delete_style(name=\"elevation\", workspace=\"demo\", recurse=True)" ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [] } ], "metadata": { diff --git a/notebooks/Workspaces.ipynb b/notebooks/Workspaces.ipynb index 897b696..c66c4df 100644 --- a/notebooks/Workspaces.ipynb +++ b/notebooks/Workspaces.ipynb @@ -142,7 +142,7 @@ "text/plain": [ "{'workspace': {'name': 'demo',\n", " 'isolated': False,\n", - " 'dateCreated': '2024-06-10 20:31:18.501 UTC',\n", + " 'dateCreated': '2024-06-12 22:37:19.313 UTC',\n", " 'dataStores': 'http://localhost:8080/geoserver/rest/workspaces/demo/datastores.json',\n", " 'coverageStores': 'http://localhost:8080/geoserver/rest/workspaces/demo/coveragestores.json',\n", " 'wmsStores': 'http://localhost:8080/geoserver/rest/workspaces/demo/wmsstores.json',\n", @@ -155,7 +155,7 @@ } ], "source": [ - "geoserver.get_workspace(workspace=\"demo\")" + "geoserver.get_workspace(name=\"demo\")" ] }, { @@ -170,7 +170,7 @@ "\n", " demo\n", " false\n", - " 2024-06-10 20:31:18.501 UTC\n", + " 2024-06-12 22:37:19.313 UTC\n", " \n", " \n", " \n", @@ -188,7 +188,7 @@ } ], "source": [ - "data = geoserver.get_workspace(workspace=\"demo\", format=\"xml\")\n", + "data = geoserver.get_workspace(name=\"demo\", format=\"xml\")\n", "print(data)" ] }, diff --git a/pyproject.toml b/pyproject.toml index 60e9e1f..31fbbb5 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "geoserver-py" -version = "0.0.3" +version = "0.1.0" description = "Minimal python client to communicate with Geoserver." authors = ["Arthur Dujardin "] maintainers = ["Arthur Dujardin "] @@ -99,7 +99,7 @@ exclude_lines = [ ] [tool.bumpversion] -current_version = "0.0.3" +current_version = "0.1.0" parse = "(?P\\d+)\\.(?P\\d+)\\.(?P\\d+)" serialize = ["{major}.{minor}.{patch}"] regex = false @@ -108,9 +108,9 @@ tag = true sign_tags = false tag_name = "{new_version}" tag_message = "Bump version: {current_version} → {new_version}" -allow_dirty = true +allow_dirty = false commit = false -message = "Version updated from {current_version} to {new_version}" +message = "release: version updated from {current_version} to {new_version}" commit_args = "" [[tool.bumpversion.files]]