Julien Cristau pushed to branch master at snapshot / snapshot
Commits: 36ad381d by Julien Cristau at 2024-04-06T11:58:43+02:00 ci: add bookworm test, use pg 16 on unstable - - - - - 0b6ab07a by Julien Cristau at 2024-04-06T12:24:35+02:00 web: import Markup from markupsafe instead of flask flask.Markup was deprecated in 2.3.0 and removed in 3.0.0 - - - - - b66bbdfa by Julien Cristau at 2024-04-09T11:11:55+02:00 tests: set SERVER_NAME in test config This works around a bug in pytest-flask, introduced by https://github.com/pytest-dev/pytest-flask/pull/150 that switches to a bogus domain name. - - - - - 37cd1629 by Julien Cristau at 2024-04-10T08:31:14+00:00 Merge branch 'ci-pg16' into 'master' ci: add bookworm test, use pg 16 on unstable See merge request snapshot-team/snapshot!15 - - - - - 4 changed files: - .gitlab-ci.yml - README - web/app/snapshot/lib/helpers.py - web/app/snapshot/settings/test.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -14,6 +14,7 @@ before_script: python3-pytest-flask python3-flask python3-flask-mail + python3-markupsafe python3-testing.postgresql python3-psycopg2 python3-yaml @@ -47,6 +48,14 @@ before_script: unstable: <<: *test image: debian:unstable + variables: + ADDITIONAL_PACKAGES: + postgresql-16-debversion + postgresql-plperl-16 + +bookworm: + <<: *test + image: debian:bookworm variables: ADDITIONAL_PACKAGES: postgresql-15-debversion ===================================== README ===================================== @@ -155,7 +155,7 @@ Depends: ruby ruby-pg python3-yaml python3-psycopg2 fuse-utils python3-fuse uuid DB-Depends: postgresql-plperl-13 postgresql-13-debversion fsck-Depends: python3-dev gcc FUSE-Depends: python3-fuse -Web-Depends: python3-flask python3-flask-mail python3-psycopg2 +Web-Depends: python3-flask python3-flask-mail python3-markupsafe python3-psycopg2 Web-Recommends: libapache2-mod-wsgi-py3 apache2 Apache config: required modules: expires headers ===================================== web/app/snapshot/lib/helpers.py ===================================== @@ -22,7 +22,7 @@ from re import sub -from flask import Markup +from markupsafe import Markup def debian_bugs_markup(text): ===================================== web/app/snapshot/settings/test.py ===================================== @@ -27,6 +27,7 @@ from snapshot.settings.common import * # noqa TESTING = True MASTER_DOMAIN = 'localhost' +SERVER_NAME = 'localhost' MAIL_ADMINS = [ 'testing@localhost', View it on GitLab: https://salsa.debian.org/snapshot-team/snapshot/-/compare/2aa2c9f4380fb9c03cfc01ba3601815451b3c73a...37cd1629baeb1fceb71ec4d8741465365c64db5f -- View it on GitLab: https://salsa.debian.org/snapshot-team/snapshot/-/compare/2aa2c9f4380fb9c03cfc01ba3601815451b3c73a...37cd1629baeb1fceb71ec4d8741465365c64db5f You're receiving this email because of your account on salsa.debian.org.
