Merge branch 'release/6.1.0'

Author: marteinn

.github/workflows/main.yml

@@ -9,24 +9,48 @@ jobs:
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10"]
         wagtail-version:
-        - 2.11.8
-        - 2.13.5
-        - 2.14.2
-        - 2.15.1
+          #- 2.14.2 (not supported due to issues with migrations)
+          - 2.15.4
+          - 2.16.1
+    services:
+      postgres:
+        image: postgis/postgis:12-2.5
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_USER: postgres
+          POSTGRES_DB: postgres
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements/tests.txt
-        pip install -q wagtail==${{ matrix.wagtail-version }}
-    - name: Run tests
-      run: |
-        python runtests.py
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          set -xe
+          sudo apt-get install gdal-bin libgdal-dev
+          python -m pip install --upgrade pip
+          pip install .[test]
+          pip install psycopg2-binary>=2.9.3
+      - name: Install wagtail ${{ matrix.wagtail-version }}
+        run: pip install wagtail==${{ matrix.wagtail-version }}
+      - name: Run tests
+        run: |
+          pytest
+        env:
+          DATABASE_NAME: postgres
+          DATABASE_USER: postgres
+          DATABASE_PASSWORD: postgres
+          DATABASE_HOST: localhost
+          DATABASE_PORT: 5432
+          GOOGLE_MAPS_V3_APIKEY: X
 
   lint-black:
     runs-on: ubuntu-latest

.gitignore

@@ -49,6 +49,11 @@ venv*
 # Editor
 .idea
 
-example/wagtailgeowidget
-example/wagtail
-example/wagtail-2.0b1
+# Docker
+web.env
+
+# Static
+tests/static/*
+tests/media/*
+!tests/static/.gitkeep
+!tests/media/.gitkeep

CHANGELOG.md

@@ -1,43 +1,70 @@
 # Changelog
 
-## 6.0.0 (2022.02.06)
+## [6.1.0] - 2022.02.20
 
+### Added
+- Add geocoding support for Mapbox (Martin Sandström)
+- Add Wagtail 2.16 support
+
+### Fixed
+- Fix: Replace ugettext with gettext (@mariusboe)
+- Fix: Add documentation on leaflet settings (Martin Sandström)
+- Fix: Replace test runniner with pytest
+- Fix: Drop duplicated tests from wagtailgeowidget/tests
+
+
+## [6.0.0] - 2022.02.06
+
+### Added
 - Add support for Leaflet with LeafletPanel/LeafletBlock (Martin Sandström)
 - Add standalone block and panel for GoogleMaps (Martin Sandström)
-- Deprecate GeoPanel, GeoBlock and GeoWidget in favour of GoogleMapsPanel, GoogleMapsBlock and GoogleMapsWidget (Martin Sandström)
 - Add panel for address field (Martin Sandström)
 - Add geocoding support for Nominatim (Martin Sandström)
 - Add telepath to widgets (Martin Sandström)
-- Drop support for Wagtail < 2.14 (Martin Sandström)
+
+### Changed
+- Deprecate GeoPanel, GeoBlock and GeoWidget in favour of GoogleMapsPanel, GoogleMapsBlock and GoogleMapsWidget (Martin Sandström)
 - Add Swedish translations (Martin Sandströms)
+
+### Fixed
 - Fix: Disable form submit on latlang field enter (Martin Sandström)
 - Fix: Apply prettier formatting to all js (Martin Sandström)
 
-**Note: Upgrading from 5 to 6**
+### Removed
+- Drop support for Wagtail < 2.14 (Martin Sandström)
+
+### Note: Upgrading from 5 to 6
 
 - Replace `GeoPanel` with `GoogleMapsPanel`
 - Replace `GeoBlock` with `GoogleMapsBlock`
 - Replace `FieldPanel('address')` with `GeoAddressPanel("address", geocoder=geocoders.GOOGLE_MAPS)`
 
 
-## 5.3.0 (2022.01.05)
+## [5.3.0] - 2022.01.05
 
+### Added
 - Add persistant and user editable zoom for map widget (Martin Sandström)
 - Enable loading Google Maps API key dynamically (Martin Sandström)
 - Make it possible to hide latlng field for GeoBlock (@vladox)
+
+### Fixed
 - Fix: Solve issue with address not working streamfield in Wagtail 1.13+ (@vladox)
 - Fix: Drop six dependency (Martin Sandström)
 
 
-## 5.2.0 (2022.01.04)
+## [5.2.0] - 2022.01.04
 
+### Removed
 - Drop support for Python 3.6
 - Drop support for EOL Wagtail
 
 
-## 5.1.0 (2020.11.21)
+## [5.1.0] - 2020.11.21
 
+### Added
 - Implement setting for leaving location field empty (Andreas Bernacca)
+
+### Fixed
 - Update docs for services that needs to be activated (Timothy Allen)
 - Fix: Move CI from Travis to Github Actions (Martin Sandström)
 

example/Dockerfile Dockerfileexample/Dockerfile renamed to Dockerfile

@@ -18,7 +18,8 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 RUN pip install --upgrade pip \
-    && pip install -r $REQUIREMENTS --no-cache-dir \
+    && pip install -e .[test] --no-cache-dir \
+    && pip install psycopg2-binary==2.9.3 \
     && pip install ipython \
     && pip install pywatchman
 

MANIFEST.in

@@ -1,4 +1,4 @@
 include README.md LICENSE requirements/install.txt requirements/tests.txt
 recursive-include wagtailgeowidget/static *
 recursive-include wagtailgeowidget/locale *
-prune example*
+prune tests* manage.py

Makefile

@@ -0,0 +1,3 @@
+init:
+	cp web.example.env web.env
+	docker-compose up

README.md

@@ -9,11 +9,11 @@ Wagtail-Geo-Widget is the complete map solution for your Wagtail site.
 
 ## Features
 
-- Supports Google Maps or any title provider supported by Leaflet (such as Open Street Map or Mapbox)
+- Supports Google Maps or any tile provider supported by Leaflet (such as Open Street Map or Mapbox)
 - Real spatial support (with GeoDjango and PointField)
 - Storing coordinates as strings (for no-GeoDjango setups)
 - StreamField integration
-- Searching with geoencoding
+- Searching with geocoding (supports Google Geocoding, Nominatim and Mapbox)
 - Inline panel support
 - Optional address search field
 - Language support

example/docker-compose.yml docker-compose.ymlexample/docker-compose.yml renamed to docker-compose.yml

@@ -86,7 +86,7 @@ The address field are optional and needs to be added separately, the panel accep
 
 ```python
 from django.db import models
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel
 from wagtailgeowidget import geocoders
 from wagtailgeowidget.edit_handlers import GeoAddressPanel, GoogleMapsPanel
@@ -112,7 +112,7 @@ The zoom field works in a similar way as the address field and needs to be added
 
 ```python
 from django.db import models
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel
 from wagtailgeowidget.edit_handlers import GoogleMapsPanel