From d585ba971d66d8d55ac0bbe890945b484e6decae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 14:49:40 +0000 Subject: [PATCH 1/2] Bump django-geostore from 0.8.0 to 1.0.0 Bumps [django-geostore](https://github.com/Terralego/django-geostore) from 0.8.0 to 1.0.0. - [Release notes](https://github.com/Terralego/django-geostore/releases) - [Changelog](https://github.com/Terralego/django-geostore/blob/master/CHANGES.md) - [Commits](https://github.com/Terralego/django-geostore/compare/0.8.0...1.0.0) --- updated-dependencies: - dependency-name: django-geostore dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b86185a9..2d60004b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -109,7 +109,7 @@ django-crispy-forms==2.1 # crispy-bootstrap5 django-filter==23.5 # via -r requirements.in -django-geostore==0.8.0 +django-geostore==1.0.0 # via -r requirements.in django-grappelli==3.0.8 # via -r requirements.in From 8d9504fc2432544d97a4c75aaf6ff1b1c6d95d9c Mon Sep 17 00:00:00 2001 From: J-E Castagnede Date: Fri, 12 Jan 2024 15:53:46 +0100 Subject: [PATCH 2/2] fix new geostore 1.0.0 choices --- project/geosource/models.py | 2 +- project/geosource/serializers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/geosource/models.py b/project/geosource/models.py index ceddd68f..4ce40753 100644 --- a/project/geosource/models.py +++ b/project/geosource/models.py @@ -110,7 +110,7 @@ class Status(models.IntegerChoices): id_field = models.CharField(max_length=255, default="id") geom_type = models.IntegerField( - choices=GeometryTypes.choices(), null=True, blank=True + choices=GeometryTypes.choices, null=True, blank=True ) settings = models.JSONField(default=dict, blank=True) diff --git a/project/geosource/serializers.py b/project/geosource/serializers.py index c9b2c060..4ff52928 100644 --- a/project/geosource/serializers.py +++ b/project/geosource/serializers.py @@ -365,7 +365,7 @@ class CSVSourceSerializer(FileSourceSerializer): coordinates_field_count = serializers.CharField(required=False) coordinates_separator = serializers.CharField(required=False) geom_type = serializers.ChoiceField( - default=GeometryTypes.Point, choices=GeometryTypes.choices() + default=GeometryTypes.Point, choices=GeometryTypes.choices ) class Meta: