Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 4.0.3 #4063

Draft
wants to merge 11 commits into
base: develop
Choose a base branch
from
Draft

Release 4.0.3 #4063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f45f9a3
bugfix: Run batch indexing on index workers only
stchris Dec 13, 2024
28d8cbc
Use servicelayer 1.23.3-rc1
stchris Dec 13, 2024
2ff613d
Bump version: 4.0.2 → 4.0.3-rc1
stchris Dec 13, 2024
72c53fe
servicelayer 1.23.3-rc2
stchris Dec 17, 2024
bce62c0
Bump version: 4.0.3-rc1 → 4.0.3-rc2
stchris Dec 17, 2024
234e17a
servicelayer 1.23.3-rc3
stchris Dec 18, 2024
1111d0d
Bump version: 4.0.3-rc2 → 4.0.3-rc3
stchris Dec 18, 2024
78f57ad
Bump servicelayer to 1.23.3-rc4
catileptic Dec 18, 2024
c2de577
Bump version: 4.0.3-rc3 → 4.0.3-rc4
catileptic Dec 18, 2024
61ecb4f
Bump servicelayer to 1.23.3-rc5
catileptic Dec 19, 2024
a59ad5d
Bump version: 4.0.3-rc4 → 4.0.3-rc5
stchris Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.0.2
current_version = 4.0.3-rc5
tag_name = {new_version}
commit = True
tag = True
Expand Down
3 changes: 2 additions & 1 deletion aleph/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ def periodic(self):
delete_expired_exports()
delete_old_notifications()

self.run_indexing_batches()
if SETTINGS.STAGE_INDEX in SETTINGS.ALEPH_STAGES:
self.run_indexing_batches()
except Exception:
log.exception("Error while executing periodic tasks")

Expand Down
8 changes: 4 additions & 4 deletions contrib/aleph-traefik-minio-keycloak/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ services:
- "traefik.enable=false"

worker:
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2}
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5}
command: aleph worker
restart: on-failure
links:
Expand All @@ -79,7 +79,7 @@ services:
- "traefik.enable=false"

shell:
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2}
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5}
command: /bin/bash
depends_on:
- postgres
Expand All @@ -99,7 +99,7 @@ services:
- "traefik.enable=false"

api:
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2}
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5}
command: gunicorn -w 6 -b 0.0.0.0:8000 --log-level debug --log-file - aleph.wsgi:app
expose:
- 8000
Expand All @@ -121,7 +121,7 @@ services:
- "traefik.enable=false"

ui:
image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.2}
image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5}
depends_on:
- api
- traefik
Expand Down
8 changes: 4 additions & 4 deletions contrib/keycloak/docker-compose.dev-keycloak.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
elasticsearch:
build:
context: services/elasticsearch
image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.2}
image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5}
hostname: elasticsearch
environment:
- discovery.type=single-node
Expand Down Expand Up @@ -55,7 +55,7 @@ services:
app:
build:
context: .
image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2}
image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5}
hostname: aleph
command: /bin/bash
links:
Expand Down Expand Up @@ -83,7 +83,7 @@ services:
api:
build:
context: .
image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2}
image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5}
command: aleph run -h 0.0.0.0 -p 5000 --with-threads --reload --debugger
ports:
- "127.0.0.1:5000:5000"
Expand Down Expand Up @@ -117,7 +117,7 @@ services:
ui:
build:
context: ui
image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.2}
image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5}
links:
- api
command: npm run start
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ services:
- aleph.env

worker:
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2}
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5}
command: aleph worker
restart: on-failure
depends_on:
Expand All @@ -62,7 +62,7 @@ services:
- aleph.env

shell:
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2}
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5}
command: /bin/bash
depends_on:
- postgres
Expand All @@ -80,7 +80,7 @@ services:
- aleph.env

api:
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2}
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5}
expose:
- 8000
depends_on:
Expand All @@ -97,7 +97,7 @@ services:
- aleph.env

ui:
image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.2}
image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5}
depends_on:
- api
ports:
Expand Down
4 changes: 2 additions & 2 deletions helm/charts/aleph/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: aleph
description: Helm chart for Aleph
type: application
version: 4.0.2
appVersion: 4.0.2
version: 4.0.3-rc5
appVersion: 4.0.3-rc5
2 changes: 1 addition & 1 deletion helm/charts/aleph/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | `"global.image.tag | string | `"4.0.2"` | Aleph docker image tag |
| global.image.tag | string | `"global.image.tag | string | `"4.0.3-rc5"` | Aleph docker image tag |
| global.image.tag | string | `"Always"` | |
| global.namingPrefix | string | `"aleph"` | Prefix for the names of k8s resources |

Expand Down
2 changes: 1 addition & 1 deletion helm/charts/aleph/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ global:

image:
repository: ghcr.io/alephdata/aleph
tag: "4.0.2"
tag: "4.0.3-rc5"
pullPolicy: Always

commonEnv:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ followthemoney==3.5.9
followthemoney-store[postgresql]==3.1.0
followthemoney-compare==0.4.4
fingerprints==1.2.3
servicelayer[google,amazon]==1.23.2
servicelayer[google,amazon]==1.23.3-rc5
normality==2.5.0
pantomime==0.6.1

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name="aleph",
version="4.0.2",
version="4.0.3-rc5",
description="Document sifting web frontend",
classifiers=[
"Intended Audience :: Developers",
Expand Down
2 changes: 1 addition & 1 deletion ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aleph-ui",
"version": "4.0.2",
"version": "4.0.3-rc5",
"private": true,
"dependencies": {
"@alephdata/followthemoney": "^3.5.5",
Expand Down
Loading