Merge pull request #674 from data61/release-1.15.0

Release 1.15.0
data61 · Aug 23, 2021 · e02c39f · e02c39f
2 parents 752ccef + 5d6f28a
commit e02c39f
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 14 deletions.
diff --git a/backend/entityservice/VERSION b/backend/entityservice/VERSION
@@ -1 +1 @@
-v1.14.0
+v1.15.0
diff --git a/base/requirements.txt b/base/requirements.txt
@@ -1,4 +1,4 @@
-alembic==1.5.6
+alembic==1.6.5
 anonlink==0.14.2
 anonlink-client==0.1.5
 bitarray-hardbyte==1.6.2
@@ -12,7 +12,7 @@ Flask==2.0.1
 gunicorn==20.0.4
 ijson==3.1.1
 iso8601==0.1.16
-jaeger-client==4.4.0
+jaeger-client==4.6.0
 marshmallow==3.6.1
 minio==7.1.0
 opentracing==2.4.0
@@ -22,7 +22,7 @@ pytest==6.2.2
 pytest-xdist==2.2.1
 PyYAML==5.4.1
 redis==3.5.3
-requests==2.25.1
+requests==2.26.0
 setproctitle==1.2.2 # used by celery to change process name
 structlog==20.1.0
 SQLAlchemy==1.4.23

diff --git a/deployment/entity-service/Chart.yaml b/deployment/entity-service/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: entity-service
-appVersion: 1.14.0
-version: 1.14.1
+appVersion: 1.15.0
+version: 1.15.0
 description: Privacy preserving record linkage service
 type: application
 sources:

diff --git a/docs/Dockerfile b/docs/Dockerfile
@@ -1,6 +1,6 @@
 # This Dockerfile does not anything. It only pulls the required dependencies to be able to build the documentation when creating the frontend image.
 # If updated, it needs to be pushed manually to dockerhub.
-FROM python:3.7
+FROM python:3.8
 
 MAINTAINER "Brian Thorne <brian.thorne@data61.csiro.au>"
 USER root

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -7,6 +7,38 @@ Changelog
 Next Version
 ------------
 
+Version 1.15.0
+---------------
+
+Highlights
+~~~~~~~~~~
+
+**Similarity scores are deduplicated**
+
+Previously candidate pairs that appear in more than one block would produce more than one similarity score.
+The iterator that processing similarity scores now de-duplicates before storing them.
+
+Implemented in: #660
+
+**Provided Block Identifiers are now hashed**
+
+We now hash the user provided block identifier before storing in DB.
+
+Implemented in: #633
+
+**Failed runs return message indicating the failure reason**
+
+The run status for a failed run now includes a `message` attribute with information on what went wrong.
+
+Implemented in: #624
+
+Other changes
+~~~~~~~~~~~~~
+
+The run status endpoint now includes `total_number_of_comparisons` for completed runs.
+Implemented in: #651
+
+As usual lots of version upgrades - now using the latest stable redis and postgresql.
 
 Version 1.14.0
 ---------------

diff --git a/docs/conf.py b/docs/conf.py
@@ -66,9 +66,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.14'
+version = '1.15'
 # The full version, including alpha/beta/rc tags.
-release = '1.14.0'
+release = '1.15.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/e2etests/tests/test_results_correctness.py b/e2etests/tests/test_results_correctness.py
@@ -23,7 +23,7 @@ def the_truth(scope='module'):
         # compute similarity scores with anonlink
         candidate_pairs = anonlink.candidate_generation.find_candidate_pairs(
             (filters_a, filters_b),
-            anonlink.similarities.dice_coefficient_accelerated,
+            anonlink.similarities.dice_coefficient,
             threshold,
             k=len(filters_a))
         sims, _, (rec_is_a, rec_is_b) = candidate_pairs

diff --git a/e2etests/tests/test_results_correctness_multiparty.py b/e2etests/tests/test_results_correctness_multiparty.py
@@ -21,7 +21,7 @@ def test_groups_correctness(requests):
 
     candidate_pairs = anonlink.candidate_generation.find_candidate_pairs(
         filters,
-        anonlink.similarities.dice_coefficient_accelerated,
+        anonlink.similarities.dice_coefficient,
         THRESHOLD)
     true_groups = anonlink.solving.greedy_solve(candidate_pairs)
 

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -1,14 +1,14 @@
 # To run this Dockerfile, it is required to be in the source `anonlink-entity-service` folder and run `docker build -f frontend/Dockerfile .`
 # Otherwise, it cannot access the `docs` folder to build the documentation before serving it.
 
-FROM data61/anonlink-docs-builder:20201221 AS docsbuilder
+FROM data61/anonlink-docs-builder:20210823 AS docsbuilder
 COPY ./docs /src/docs
 COPY ./backend/entityservice/api_def/openapi.yaml /src/docs/_static/openapi.yaml
 WORKDIR /src
 RUN python -m sphinx /src/docs /build
 
 
-FROM nginx:1.15.12-alpine
+FROM nginx:1.21.1-alpine
 
 RUN apk add --no-cache curl
 

diff --git a/frontend/VERSION b/frontend/VERSION
@@ -1 +1 @@
-v1.4.7
+v1.4.8