diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 75ec21427..8b57575a4 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.15.1 +current_version = 3.15.3 tag_name = {new_version} commit = True tag = True diff --git a/aleph/core.py b/aleph/core.py index ed99acbe1..e94fb9e91 100644 --- a/aleph/core.py +++ b/aleph/core.py @@ -25,7 +25,6 @@ from aleph.settings import SETTINGS from aleph.cache import Cache from aleph.oauth import configure_oauth -from aleph.settings import SETTINGS from aleph.util import LoggingTransport import sentry_sdk diff --git a/aleph/logic/util.py b/aleph/logic/util.py index 288e2f5d8..2d1b3a2f5 100644 --- a/aleph/logic/util.py +++ b/aleph/logic/util.py @@ -1,7 +1,6 @@ import jwt from normality import ascii_text -from urllib.parse import urlencode -from werkzeug.urls import url_join +from urllib.parse import urlencode, urljoin from datetime import datetime, timedelta from aleph.core import url_for @@ -24,7 +23,7 @@ def ui_url(resource, id=None, _relative=False, **query): if id is not None: resource = "%s/%s" % (resource, id) url = "/" if _relative else SETTINGS.APP_UI_URL - url = url_join(url, resource) + url = urljoin(url, resource) query = [(q, v) for q, v in query.items() if v is not None] query_string = urlencode(query, doseq=True) if len(query_string): diff --git a/aleph/views/util.py b/aleph/views/util.py index 0364573c5..0ca69a60f 100644 --- a/aleph/views/util.py +++ b/aleph/views/util.py @@ -6,7 +6,7 @@ from normality import stringify from flask import Response, request, render_template from flask_babel import gettext -from werkzeug.urls import url_parse +from urllib.parse import urlparse from werkzeug.exceptions import Forbidden from werkzeug.exceptions import BadRequest, NotFound from servicelayer.jobs import Job @@ -136,7 +136,7 @@ def get_index_collection(collection_id, action=Authz.READ): def get_url_path(url): try: - return url_parse(url).replace(netloc="", scheme="").to_url() or "/" + return urlparse(url)._replace(netloc="", scheme="").geturl() or "/" except Exception: return "/" diff --git a/contrib/aleph-traefik-minio-keycloak/docker-compose.yml b/contrib/aleph-traefik-minio-keycloak/docker-compose.yml index a8f38de7a..da60a0670 100644 --- a/contrib/aleph-traefik-minio-keycloak/docker-compose.yml +++ b/contrib/aleph-traefik-minio-keycloak/docker-compose.yml @@ -54,7 +54,7 @@ services: - "traefik.enable=false" worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.3} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.3} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.3} command: gunicorn -w 6 -b 0.0.0.0:8000 --log-level debug --log-file - aleph.wsgi:app expose: - 8000 @@ -121,7 +121,7 @@ services: - "traefik.enable=false" ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.15.1} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.15.3} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index 58e945e52..44f5e11f1 100644 --- 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.15.1} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-3.15.3} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-3.15.1} + image: alephdata/aleph:${ALEPH_TAG:-3.15.3} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-3.15.1} + image: alephdata/aleph:${ALEPH_TAG:-3.15.3} command: aleph run -h 0.0.0.0 -p 5000 --with-threads --reload --debugger ports: - "127.0.0.1:5000:5000" @@ -117,7 +117,7 @@ services: ui: build: context: ui - image: alephdata/aleph-ui:${ALEPH_TAG:-3.15.1} + image: alephdata/aleph-ui:${ALEPH_TAG:-3.15.3} links: - api command: npm run start diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 6836ce2dd..10ce3aeff 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -139,7 +139,7 @@ services: - aleph.env worker: - image: alephdata/aleph:${ALEPH_TAG:-3.13.2-rc3} + image: alephdata/aleph:${ALEPH_TAG:-latest} command: aleph worker restart: on-failure depends_on: diff --git a/docker-compose.yml b/docker-compose.yml index 654aec889..a979638b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,7 +38,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.3} command: aleph worker restart: on-failure depends_on: @@ -54,7 +54,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.3} command: /bin/bash depends_on: - postgres @@ -72,7 +72,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.3} command: gunicorn -w 6 -b 0.0.0.0:8000 --timeout 3600 --log-level debug --log-file - aleph.wsgi:app expose: - 8000 @@ -90,7 +90,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.15.1} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.15.3} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index bb3184eaf..d782cd7b1 100644 --- 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.15.1 -appVersion: 3.15.1 \ No newline at end of file +version: 3.15.3 +appVersion: 3.15.3 \ No newline at end of file diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index a2bea0c73..44c7c34cc 100644 --- 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.15.1"` | Aleph docker image tag | +| global.image.tag | string | `"3.15.3"` | 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 index f9fb462dd..c0629c1c2 100644 --- 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.15.1" + tag: "3.15.3" pullPolicy: Always commonEnv: diff --git a/requirements.txt b/requirements.txt index f64a337e3..6ea6f23df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ Flask-Babel==3.1.0 flask-talisman==1.1.0 SQLAlchemy==2.0.20 alembic==1.12.0 -authlib==1.2.1 +authlib==0.15.5 elasticsearch==7.17.0 marshmallow==2.19.2 diff --git a/setup.py b/setup.py index b423e7a64..6eb46c250 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="3.15.1", + version="3.15.3", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index 959108bdb..5ca4ffd87 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "3.15.1", + "version": "3.15.3", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.4.3",