Skip to content

Commit

Permalink
Merge branch 'refs/heads/devel' into performances-seen-unseen
Browse files Browse the repository at this point in the history
  • Loading branch information
niconoe committed Jul 26, 2024
2 parents 77445a5 + 1dc0781 commit edc8656
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 9 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# v1.7.6 (2024-07-26)

- Another map performance improvement (missing index)

# v1.7.5 (2024-07-25)

- Fix a compatibility issue with Windows platform (data import script). Thanks, @sronveaux!
Expand Down
6 changes: 3 additions & 3 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ properly configured.
### Prerequisites

- Make sure [Docker](https://docs.docker.com/get-docker/) is installed on your system
- Identify the latest release of GBIF Alert on GitHub at https://github.com/riparias/gbif-alert/tags (currently [v1.7.5](https://github.com/riparias/gbif-alert/releases/tag/v1.7.5))
- Identify the latest release of GBIF Alert on GitHub at https://github.com/riparias/gbif-alert/tags (currently [v1.7.6](https://github.com/riparias/gbif-alert/releases/tag/v1.7.6))

### Installation steps

- Create a new directory on your system, e.g. `invasive-fishes-nz` following the example above.
- Go to the `docker-compose.yml` file from the latest release of GBIF Alert on GitHub: at the moment https://github.com/riparias/gbif-alert/blob/v1.7.5/docker-compose.yml (note that the URL contains the version number).
- Go to the `docker-compose.yml` file from the latest release of GBIF Alert on GitHub: at the moment https://github.com/riparias/gbif-alert/blob/v1.7.6/docker-compose.yml (note that the URL contains the version number).
- Save the file in the directory you have just created.
- Go to the `local_settings_docker.template.py` file from the latest release of GBIF Alert on GitHub: at the moment https://github.com/riparias/gbif-alert/blob/v1.7.5/djangoproject/local_settings_docker.template.py.
- Go to the `local_settings_docker.template.py` file from the latest release of GBIF Alert on GitHub: at the moment https://github.com/riparias/gbif-alert/blob/v1.7.6/djangoproject/local_settings_docker.template.py.
- Save the file in the directory you have just created.
- Rename this file to `local_settings_docker.py`.
- Open a terminal, navigate to the `invasive-fishes-nz` directory and run the following command: `docker-compose up`.
Expand Down
7 changes: 6 additions & 1 deletion dashboard/views/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,13 @@ def create_or_refresh_single_materialized_view(hex_size_meters: int):
) WITH NO DATA;
REFRESH MATERIALIZED VIEW hexa_$hex_size_meters;
CREATE INDEX IF NOT EXISTS hexa_$hex_size_meters_idx ON hexa_$hex_size_meters USING gist (location);
"""
).substitute(hex_size_meters=hex_size_meters)
).substitute(
hex_size_meters=hex_size_meters,
hex_size_meters_idx=f"{hex_size_meters}_idx",
)
)

j = JinjaSql()
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
nginx:
image: niconoe/gbif-alert-nginx:1.7.5
image: niconoe/gbif-alert-nginx:1.7.6
ports:
- "1337:80"
depends_on:
Expand All @@ -28,7 +28,7 @@ services:
expose:
- 6379
gbif-alert:
image : niconoe/gbif-alert:1.7.5
image : niconoe/gbif-alert:1.7.6
expose:
- 8000
depends_on:
Expand All @@ -44,7 +44,7 @@ services:
target: /app/djangoproject/local_settings_docker.py
read_only: true
rqworker:
image: niconoe/gbif-alert:1.7.5
image: niconoe/gbif-alert:1.7.6
entrypoint: poetry run python manage.py rqworker default
depends_on:
db:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gbif-alert",
"version": "1.7.5",
"version": "1.7.6",
"description": "[![Django CI](https://github.com/riparias/early-alert-webapp/actions/workflows/django_tests.yml/badge.svg)](https://github.com/riparias/early-warning-webapp/actions/workflows/django_tests.yml)",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "gbif-alert"
version = "1.7.5"
version = "1.7.6"
description = "A GBIF-based early alert system"
authors = ["Nicolas Noé <[email protected]>"]
package-mode = false
Expand Down

0 comments on commit edc8656

Please sign in to comment.