From cceb38f02cb4089547f6e72767ec8f1f2c1f71b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Thu, 28 Dec 2023 12:46:31 +0100 Subject: [PATCH 1/4] Fix invalid regex escape character causing a on Python 3.12 --- CHANGELOG.md | 2 ++ wagtailgeowidget/helpers.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b024397..5caff9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ### Added ### Changed ### Fixed +- Fix invalid regex escape character causing a `SyntaxWarning` on Python 3.12 (@jorenham) + ### Removed ## [8.1.0] - 2023.12.22 diff --git a/wagtailgeowidget/helpers.py b/wagtailgeowidget/helpers.py index c249f99..92dc21c 100644 --- a/wagtailgeowidget/helpers.py +++ b/wagtailgeowidget/helpers.py @@ -2,7 +2,7 @@ from typing import Dict, Optional geos_ptrn = re.compile( - "^SRID=([0-9]{1,});POINT\s?\((-?[0-9\.]{1,})\s(-?[0-9\.]{1,})\)$" + r"^SRID=([0-9]{1,});POINT\s?\((-?[0-9\.]{1,})\s(-?[0-9\.]{1,})\)$" ) From 94482deab295c6e484368d6a3ea3345d31ec2e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Thu, 28 Dec 2023 12:49:44 +0100 Subject: [PATCH 2/4] Upgrade example docker image python version to 3.12 --- CHANGELOG.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5caff9a..58da7ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Changed ### Fixed - Fix invalid regex escape character causing a `SyntaxWarning` on Python 3.12 (@jorenham) +- Upgrade example docker image python version to 3.12 (@marteinn) ### Removed diff --git a/Dockerfile b/Dockerfile index 890e12e..af2ec66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim MAINTAINER Frojd LABEL version="v0.1.0" From ac471c9fb9d72d3f4d97564dd1513f7d71cacbcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Fri, 29 Dec 2023 09:06:31 +0100 Subject: [PATCH 3/4] Bump endyear in LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 72233bf..858de32 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2022 Fröjd Interactive +Copyright (c) 2015-2024 Fröjd Interactive Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 8f0ea90fa8baa5fc3b5ba56fd46df24a3ea38d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Fri, 29 Dec 2023 09:13:47 +0100 Subject: [PATCH 4/4] Bump version to 8.1.1 --- CHANGELOG.md | 6 ++++-- wagtailgeowidget/__init__.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58da7ca..0db1240 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,13 @@ ### Added ### Changed ### Fixed +### Removed + +## [8.1.1] - 2023.12.29 +### Fixed - Fix invalid regex escape character causing a `SyntaxWarning` on Python 3.12 (@jorenham) - Upgrade example docker image python version to 3.12 (@marteinn) -### Removed - ## [8.1.0] - 2023.12.22 ### Added - Add tests for Wagtail 5.1 (@katdom13) diff --git a/wagtailgeowidget/__init__.py b/wagtailgeowidget/__init__.py index eddd765..6767048 100644 --- a/wagtailgeowidget/__init__.py +++ b/wagtailgeowidget/__init__.py @@ -7,8 +7,8 @@ """ __title__ = "wagtailgeowidget" -__version__ = "8.1.0" -__build__ = 801 +__version__ = "8.1.1" +__build__ = 802 __author__ = "Martin Sandström" __license__ = "MIT" __copyright__ = "Copyright 2015-Present Fröjd Interactive"