[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][snapshot-team/snapshot][master] 4 commits: ci: add bookworm test, use pg 16 on unstable

Title: GitLab

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:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -14,6 +14,7 @@ before_script:
    14 14 
         python3-pytest-flask
    15 15 
         python3-flask
    16 16 
         python3-flask-mail
    17 
    +    python3-markupsafe
    17 18 
         python3-testing.postgresql
    18 19 
         python3-psycopg2
    19 20 
         python3-yaml
    ... ... @@ -47,6 +48,14 @@ before_script:
    47 48 
     unstable:
    48 49 
       <<: *test
    49 50 
       image: debian:unstable
    51 
    +  variables:
    52 
    +    ADDITIONAL_PACKAGES:
    53 
    +      postgresql-16-debversion
    54 
    +      postgresql-plperl-16
    55 
    +
    56 
    +bookworm:
    57 
    +  <<: *test
    58 
    +  image: debian:bookworm
    50 59 
       variables:
    51 60 
         ADDITIONAL_PACKAGES:
    52 61 
           postgresql-15-debversion

  • README
    ... ... @@ -155,7 +155,7 @@ Depends: ruby ruby-pg python3-yaml python3-psycopg2 fuse-utils python3-fuse uuid
    155 155 
     DB-Depends: postgresql-plperl-13 postgresql-13-debversion
    156 156 
     fsck-Depends: python3-dev gcc
    157 157 
     FUSE-Depends: python3-fuse
    158 
    -Web-Depends: python3-flask python3-flask-mail python3-psycopg2
    158 
    +Web-Depends: python3-flask python3-flask-mail python3-markupsafe python3-psycopg2
    159 159 
     Web-Recommends: libapache2-mod-wsgi-py3 apache2
    160 160 
     Apache config: required modules: expires headers
    161 161

  • web/app/snapshot/lib/helpers.py
    ... ... @@ -22,7 +22,7 @@
    22 22
    23 23 
     from re import sub
    24 24
    25 
    -from flask import Markup
    25 
    +from markupsafe import Markup
    26 26
    27 27
    28 28 
     def debian_bugs_markup(text):

  • web/app/snapshot/settings/test.py
    ... ... @@ -27,6 +27,7 @@ from snapshot.settings.common import * # noqa
    27 27 
     TESTING = True
    28 28
    29 29 
     MASTER_DOMAIN = 'localhost'
    30 
    +SERVER_NAME = 'localhost'
    30 31
    31 32 
     MAIL_ADMINS = [
    32 33 
         'testing@localhost',

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: