Baptiste Beauplat pushed to branch master at snapshot / snapshot
Commits:
992d3d33 by Baptiste Beauplat at 2025-02-16T13:42:14+01:00
Force gpg backend for dpkg-buildpackage
dpkg-buildpackage now supports gpg-sq as default backend, however, it
does not properly handle GNUPGHOME, breaking the CI. Switching back to
gpg backend for the test suite.
- - - - -
ee743e3c by Baptiste Beauplat at 2025-02-16T13:43:28+01:00
Bump minimal distribution to bookworm
Snapshot main servers for imports and web app are now in bookworm and
trixie release is slowly approaching.
- Web app dependencies updated
- Salsa CI updated
- Documentation updated
- - - - -
5 changed files:
- .gitlab-ci.yml
- README
- web/app/docs/deploy.md
- web/app/setup.py
- web/app/tests/controllers/package.py
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -52,21 +52,21 @@ unstable:
postgresql-17-debversion
postgresql-plperl-17
-bookworm:
+trixie:
<<: *test
- image: debian:bookworm
+ image: debian:trixie
variables:
ADDITIONAL_PACKAGES:
postgresql-15-debversion
postgresql-plperl-15
-bullseye:
+bookworm:
<<: *test
- image: debian:bullseye
+ image: debian:bookworm
variables:
ADDITIONAL_PACKAGES:
- postgresql-13-debversion
- postgresql-plperl-13
+ postgresql-15-debversion
+ postgresql-plperl-15
flake8:
=====================================
README
=====================================
@@ -149,10 +149,10 @@ Installation
Dependencies
------------
-(Target: bullseye)
+(Target: bookworm)
-Depends: ruby ruby-pg python3-yaml python3-psycopg2 fuse-utils python3-fuse
-DB-Depends: postgresql-plperl-13 postgresql-13-debversion
+Depends: ruby ruby-pg python3-yaml python3-psycopg2 fuse python3-fuse
+DB-Depends: postgresql-plperl-15 postgresql-15-debversion
fsck-Depends: python3-dev gcc
FUSE-Depends: python3-fuse
Web-Depends: python3-flask python3-flask-mail python3-markupsafe
python3-psycopg2
=====================================
web/app/docs/deploy.md
=====================================
@@ -64,7 +64,7 @@ The interface is available at http://localhost:5000/
Install testing dependencies:
```bash
-sudo apt install tox aptly devscripts postgresql-13-debversion \
+sudo apt install tox aptly devscripts postgresql-15-debversion \
postgresql-plperl ruby ruby-pg
```
=====================================
web/app/setup.py
=====================================
@@ -35,7 +35,7 @@ setup(
'Intended Audience :: Developers',
'Topic :: Software Development :: Build Tools',
'License :: OSI Approved :: MIT License',
- 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.11',
'Framework :: Flask :: 1.0',
],
keywords='debian snapshot archive packages',
@@ -45,21 +45,21 @@ setup(
data_files=[('.', ['project.py'])],
# Python version requirements
- python_requires='>=3.7, <4',
+ python_requires='>=3.11, <4',
# Requirements
install_requires=[
- 'flask>=1.0.2',
+ 'flask>=2.2.2',
'flask-mail>=0.9.1',
- 'psycopg2>=2.7.7',
+ 'psycopg2>=2.9.5',
],
extras_require={
'testing': [
- 'pytest>=3.10.1',
- 'pytest-flask>=0.14.0',
+ 'pytest>=7.2.1',
+ 'pytest-flask>=0.15.1',
'testing.postgresql>=1.3.0',
- 'pyyaml>=3.13',
+ 'pyyaml>=6.0',
],
},
=====================================
web/app/tests/controllers/package.py
=====================================
@@ -155,6 +155,8 @@ class PackageSource():
args = ['--build=full',
'--no-check-builddeps',
'--sign-key=434F639E8880A43556CACA359ACF4AF8EF70E16E',
+ '--sign-command=gpg',
+ '--sign-backend=gpg',
'--force-sign']
command = 'dpkg-buildpackage'
View it on GitLab:
https://salsa.debian.org/snapshot-team/snapshot/-/compare/2620e7f1e3da67d22973fd77bae1a379b4044ce0...ee743e3cf2cd64575b3ee05f44994d13f10761bb
--
View it on GitLab:
https://salsa.debian.org/snapshot-team/snapshot/-/compare/2620e7f1e3da67d22973fd77bae1a379b4044ce0...ee743e3cf2cd64575b3ee05f44994d13f10761bb
You're receiving this email because of your account on salsa.debian.org.
