Merge branch 'release/6.2.0'

Author: marteinn

.github/workflows/main.yml

@@ -9,9 +9,9 @@ jobs:
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10"]
         wagtail-version:
-          #- 2.14.2 (not supported due to issues with migrations)
-          - 2.15.4
-          - 2.16.1
+          - 2.15.5
+          - 2.16.2
+          - 3.0.1
     services:
       postgres:
         image: postgis/postgis:12-2.5
@@ -35,6 +35,7 @@ jobs:
       - name: Install dependencies
         run: |
           set -xe
+          sudo apt-get update
           sudo apt-get install gdal-bin libgdal-dev
           python -m pip install --upgrade pip
           pip install .[test]
@@ -61,7 +62,7 @@ jobs:
         with:
           options: "--check --verbose"
           src: "."
-          version: "21.5b1"
+          version: "22.3.0"
 
   lint-isort:
     runs-on: ubuntu-latest

.gitignore

@@ -57,3 +57,6 @@ tests/static/*
 tests/media/*
 !tests/static/.gitkeep
 !tests/media/.gitkeep
+
+# Local env
+.env.local

CHANGELOG.md

@@ -1,7 +1,20 @@
 # Changelog
 
-## [6.1.0] - 2022.02.20
+## [6.2.0] - 2022.07.03
+### Added
+- Add Wagtail 3 compability (@marteinn)
+
+### Changed
+- Make GEO_WIDGET_EMPTY_LOCATION False by default (@marteinn)
+
+### Removed
+- Drop support for Wagtail 2.14 (@marteinn)
+
+### Fixed
+- Add support for running outside of docker with custom .env file in development (@marteinn)
 
+
+## [6.1.0] - 2022.02.20
 ### Added
 - Add geocoding support for Mapbox (Martin Sandström)
 - Add Wagtail 2.16 support

Dockerfile

@@ -3,7 +3,6 @@ MAINTAINER Frojd
 LABEL version="v0.1.0"
 
 ENV PYTHONUNBUFFERED=1 \
-    REQUIREMENTS=requirements.txt \
     APP_LOG_DIR=/var/log/app
 
 ADD . /app/
@@ -21,7 +20,8 @@ RUN pip install --upgrade pip \
     && pip install -e .[test] --no-cache-dir \
     && pip install psycopg2-binary==2.9.3 \
     && pip install ipython \
-    && pip install pywatchman
+    && pip install pywatchman \
+    && pip install python-dotenv
 
 EXPOSE 8080
 

README.md

@@ -21,14 +21,14 @@ Wagtail-Geo-Widget is the complete map solution for your Wagtail site.
 
 ## Documentation
 
-- [Getting started with Google Maps](./docs/getting-started-with-google-maps.md)
-- [Getting started with Leaflet](./docs/getting-started-with-leaflet.md)
-- [Settings](./docs/settings.md)
-- [Adding the widget to a Page](./docs/adding-to-a-page.md)
-- [Integrating with GeoDjango](./docs/integrating-with-geodjango.md)
-- [Adding to a StreamField](./docs/adding-to-a-streamfield.md)
-- [Supported Geocoders](./docs/supported-geocoders.md)
-- [FAQ](./docs/faq.md)
+- [Getting started with Google Maps](https://github.com/Frojd/wagtail-geo-widget/blob/main/getting-started-with-google-maps.md)
+- [Getting started with Leaflet](https://github.com/Frojd/wagtail-geo-widget/blob/main/docs/getting-started-with-leaflet.md)
+- [Settings](https://github.com/Frojd/wagtail-geo-widget/blob/main/docs/settings.md)
+- [Adding the widget to a Page](https://github.com/Frojd/wagtail-geo-widget/blob/main/docs/adding-to-a-page.md)
+- [Integrating with GeoDjango](https://github.com/Frojd/wagtail-geo-widget/blob/main/docs/integrating-with-geodjango.md)
+- [Adding to a StreamField](https://github.com/Frojd/wagtail-geo-widget/blob/main/docs/adding-to-a-streamfield.md)
+- [Supported Geocoders](https://github.com/Frojd/wagtail-geo-widget/blob/main/docs/supported-geocoders.md)
+- [FAQ](https://github.com/Frojd/wagtail-geo-widget/blob/main/docs/faq.md)
 
 
 ## Contribute

docs/adding-to-a-page.md

@@ -132,4 +132,4 @@ class MyPageWithZoomField(Page):
 
 ### More examples
 
-For more examples, look at the [example](https://github.com/Frojd/wagtail-geo-widget/blob/develop/example/geopage/models.py).
+For more examples, look at the [example](https://github.com/Frojd/wagtail-geo-widget/blob/develop/tests/geopage/models.py).

docs/adding-to-a-streamfield.md

@@ -84,4 +84,4 @@ class GeoStreamPage(Page):
 
 ### More examples
 
-For more examples, look at the [example](https://github.com/Frojd/wagtail-geo-widget/blob/develop/example/geopage/models.py#L64).
+For more examples, look at the [example](https://github.com/Frojd/wagtail-geo-widget/blob/develop/tests/geopage/models.py#L149).

docs/integrating-with-geodjango.md

@@ -69,4 +69,4 @@ class MyPageWithZoomField(Page):
 
 ### More examples
 
-For more examples, look at the [example](https://github.com/Frojd/wagtail-geo-widget/blob/develop/example/geopage/models.py).
+For more examples, look at the [example](https://github.com/Frojd/wagtail-geo-widget/blob/develop/tests/geopage/models.py).

manage.py

@@ -1,10 +1,29 @@
 #!/usr/bin/env python
+import inspect
 import os
 import sys
 
+import dotenv
+
+
+def if_exists_load_env(name: str) -> None:
+    current_frame = inspect.currentframe()
+    if not current_frame:
+        return
+
+    inspect_file = inspect.getfile(current_frame)
+    env_path = os.path.dirname(os.path.abspath(inspect_file))
+    env_file = "{env_path}/{name}".format(env_path=env_path, name=name)
+
+    if os.path.exists(env_file):
+        dotenv.load_dotenv(env_file, override=True)
+
+
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tests.examplesite.settings.dev")
 
+    if_exists_load_env(".env.local")
+
     from django.core.management import execute_from_command_line
 
     execute_from_command_line(sys.argv)