Merge branch 'main' into release/3.14.1

aawaheed · May 23, 2023 · 0af5b44 · 0af5b44
2 parents f94dbb6 + c2d4720
commit 0af5b44
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 34 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.14.1-rc17
+current_version = 3.14.1
 tag_name = {new_version}
 commit = True
 tag = True

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 3.14.1 (11-05-2023)
+- Support for error tracking via Sentry
+- Fix a flaky UI test (#3011)
+- Reference ghcr.io docker repository everywhere
+- Configure bump2version to keep versions in contrib/ up-to-date
+- Bump ingest-file to 3.18.4
+
 ## 3.14.0 (30-03-2023)
 
 - Numerous library upgrades

diff --git a/Makefile b/Makefile
@@ -88,6 +88,8 @@ ingest-restart:
 	$(COMPOSE) up -d --no-deps --remove-orphans --force-recreate ingest-file convert-document
 
 dev:
+	python3 -m pip install --upgrade pip
+	python3 -m pip install -q -r requirements.txt
 	python3 -m pip install -q -r requirements-dev.txt
 
 fixtures:

diff --git a/aleph/translations/messages.pot b/aleph/translations/messages.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2022 ORGANIZATION
+# Copyright (C) 2023 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-12-12 11:06+0100\n"
+"POT-Creation-Date: 2023-05-11 10:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/contrib/aleph-traefik-minio-keycloak/docker-compose.yml b/contrib/aleph-traefik-minio-keycloak/docker-compose.yml
@@ -45,7 +45,7 @@ services:
       - "traefik.enable=false"
 
   ingest-file:
-    image: ghcr.io/alephdata/ingest-file:3.17.1
+    image: ghcr.io/alephdata/ingest-file:3.18.4
     tmpfs:
       - /tmp:mode=777
     volumes:
@@ -65,7 +65,7 @@ services:
       - "traefik.enable=false"
 
   worker:
-    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1-rc17}
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1}
     command: aleph worker
     restart: on-failure
     links:
@@ -90,7 +90,7 @@ services:
       - "traefik.enable=false"
 
   shell:
-    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1-rc17}
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1}
     command: /bin/bash
     depends_on:
       - postgres
@@ -110,7 +110,7 @@ services:
       - "traefik.enable=false"
 
   api:
-    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1-rc17}
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1}
     command: gunicorn -w 6 -b 0.0.0.0:8000 --log-level debug --log-file - aleph.wsgi:app
     expose:
       - 8000
@@ -132,7 +132,7 @@ services:
       - "traefik.enable=false"
 
   ui:
-    image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.14.1-rc17}
+    image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.14.1}
     depends_on:
       - api
       - traefik

diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml
@@ -16,7 +16,7 @@ services:
   elasticsearch:
     build:
       context: services/elasticsearch
-    image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-3.14.1-rc17}
+    image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-3.14.1}
     hostname: elasticsearch
     environment:
       - discovery.type=single-node
@@ -43,7 +43,7 @@ services:
   ingest-file:
     build:
       context: services/ingest-file
-    image: ghcr.io/alephdata/ingest-file:3.17.1
+    image: ghcr.io/alephdata/ingest-file:3.18.4
     hostname: ingest
     tmpfs: /tmp
     volumes:
@@ -64,7 +64,7 @@ services:
   app:
     build:
       context: .
-    image: alephdata/aleph:${ALEPH_TAG:-3.14.1-rc17}
+    image: alephdata/aleph:${ALEPH_TAG:-3.14.1}
     hostname: aleph
     command: /bin/bash
     links:
@@ -92,7 +92,7 @@ services:
   api:
     build:
       context: .
-    image: alephdata/aleph:${ALEPH_TAG:-3.14.1-rc17}
+    image: alephdata/aleph:${ALEPH_TAG:-3.14.1}
     command: aleph run -h 0.0.0.0 -p 5000 --with-threads --reload --debugger
     ports:
       - "127.0.0.1:5000:5000"
@@ -126,7 +126,7 @@ services:
   ui:
     build:
       context: ui
-    image: alephdata/aleph-ui:${ALEPH_TAG:-3.14.1-rc17}
+    image: alephdata/aleph-ui:${ALEPH_TAG:-3.14.1}
     links:
       - api
     command: npm run start

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -51,7 +51,7 @@ services:
     tmpfs: /tmp
 
   ingest-file:
-    image: ghcr.io/alephdata/ingest-file:3.17.1
+    image: ghcr.io/alephdata/ingest-file:3.18.4
     hostname: ingest
     tmpfs: /tmp
     volumes:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
     tmpfs: /tmp
 
   ingest-file:
-    image: ghcr.io/alephdata/ingest-file:3.17.1
+    image: ghcr.io/alephdata/ingest-file:3.18.4
     tmpfs:
       - /tmp:mode=777
     volumes:
@@ -46,7 +46,7 @@ services:
       - aleph.env
 
   worker:
-    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1-rc17}
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1}
     command: aleph worker
     restart: on-failure
     depends_on:
@@ -62,7 +62,7 @@ services:
       - aleph.env
 
   shell:
-    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1-rc17}
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1}
     command: /bin/bash
     depends_on:
       - postgres
@@ -80,7 +80,7 @@ services:
       - aleph.env
 
   api:
-    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1-rc17}
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1}
     command: gunicorn -w 6 -b 0.0.0.0:8000 --timeout 3600 --log-level debug --log-file - aleph.wsgi:app
     expose:
       - 8000
@@ -98,7 +98,7 @@ services:
       - aleph.env
 
   ui:
-    image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.14.1-rc17}
+    image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.14.1}
     depends_on:
       - api
     ports:

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: aleph
 description: Helm chart for Aleph
 type: application
-version: 3.14.1-rc17
-appVersion: 3.14.1-rc17
+version: 3.14.1
+appVersion: 3.14.1
diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md
@@ -11,7 +11,7 @@ Helm chart for Aleph
 | global.amazon | bool | `true` | Are we using AWS services like s3? |
 | global.google | bool | `false` | Are we using GCE services like storage, vision api? |
 | global.image.repository | string | `"alephdata/aleph"` | Aleph docker image repo |
-| global.image.tag | string | `"3.14.1-rc17"` | Aleph docker image tag |
+| global.image.tag | string | `"3.14.1"` | Aleph docker image tag |
 | global.image.tag | string | `"Always"` |  |
 | global.namingPrefix | string | `"aleph"` | Prefix for the names of k8s resources |
 

diff --git a/helm/charts/aleph/values.yaml b/helm/charts/aleph/values.yaml
@@ -6,7 +6,7 @@ global:
 
   image:
     repository: ghcr.io/alephdata/aleph
-    tag: "3.14.1-rc17"
+    tag: "3.14.1"
     pullPolicy: Always
 
   commonEnv:

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="aleph",
-    version="3.14.1-rc17",
+    version="3.14.1",
     description="Document sifting web frontend",
     classifiers=[
         "Intended Audience :: Developers",

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aleph-ui",
-  "version": "3.14.1-rc17",
+  "version": "3.14.1",
   "private": true,
   "dependencies": {
     "@alephdata/followthemoney": "^3.3.0",