From 29e1c84a1be4996e9cbc1b0c76143d74759d23e1 Mon Sep 17 00:00:00 2001 From: Ardt Klapwijk <59741981+ArdtK@users.noreply.github.com> Date: Tue, 13 Aug 2024 15:22:00 +0200 Subject: [PATCH 1/3] =?UTF-8?q?bump:=20version=202.3.0=20=E2=86=92=202.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- geolib/__init__.py | 2 +- pyproject.toml | 4 ++-- tests/test_geolib.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/geolib/__init__.py b/geolib/__init__.py index 11c8047c..50105676 100644 --- a/geolib/__init__.py +++ b/geolib/__init__.py @@ -2,4 +2,4 @@ GEOLib Library """ -__version__ = "2.3.0" +__version__ = "2.4.0" diff --git a/pyproject.toml b/pyproject.toml index b7e4ac06..f8032df6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "d-geolib" -version = "2.3.0" +version = "2.4.0" description = "Python wrappers around the input and output files of the Deltares D-Serie and D-GEO Suite models" authors = ["Maarten Pronk ", "Deltares"] license = "MIT" @@ -74,7 +74,7 @@ profile = "black" [tool.commitizen] name = "cz_conventional_commits" -version = "2.3.0" +version = "2.4.0" tag_format = "v$major.$minor.$patch$prerelease" version_files = [ "pyproject.toml:^version", diff --git a/tests/test_geolib.py b/tests/test_geolib.py index 1906eb5a..5e9337aa 100644 --- a/tests/test_geolib.py +++ b/tests/test_geolib.py @@ -4,7 +4,7 @@ from .context import geolib -version = "2.3.0" +version = "2.4.0" @pytest.mark.systemtest From fb8b2ee8dc69fc461857351d1b73927f1da5e312 Mon Sep 17 00:00:00 2001 From: Ardt Klapwijk <59741981+ArdtK@users.noreply.github.com> Date: Thu, 15 Aug 2024 16:41:12 +0200 Subject: [PATCH 2/3] fix: restore import of all models at geolib level to aviod circular dependencies --- geolib/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/geolib/__init__.py b/geolib/__init__.py index 50105676..fdba54e2 100644 --- a/geolib/__init__.py +++ b/geolib/__init__.py @@ -3,3 +3,5 @@ """ __version__ = "2.4.0" + +from .models import * From f750937d56142860bd42c95110dabf2718e02127 Mon Sep 17 00:00:00 2001 From: Ardt Klapwijk <59741981+ArdtK@users.noreply.github.com> Date: Thu, 15 Aug 2024 16:42:16 +0200 Subject: [PATCH 3/3] chore: remove double import --- geolib/models/dstability/dstability_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geolib/models/dstability/dstability_model.py b/geolib/models/dstability/dstability_model.py index cff727be..8bd7810b 100644 --- a/geolib/models/dstability/dstability_model.py +++ b/geolib/models/dstability/dstability_model.py @@ -5,7 +5,7 @@ import matplotlib.pyplot as plt from pydantic import DirectoryPath, FilePath -from shapely.geometry import LineString, Point, Polygon +from shapely.geometry import LineString, Polygon from shapely.ops import polygonize from shapely.validation import make_valid