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:
Changes:
.gitlab-ci.yml
| ... |
... |
@@ -52,21 +52,21 @@ unstable: |
|
52
|
52
|
postgresql-17-debversion
|
|
53
|
53
|
postgresql-plperl-17
|
|
54
|
54
|
|
|
55
|
|
-bookworm:
|
|
|
55
|
+trixie:
|
|
56
|
56
|
<<: *test
|
|
57
|
|
- image: debian:bookworm
|
|
|
57
|
+ image: debian:trixie
|
|
58
|
58
|
variables:
|
|
59
|
59
|
ADDITIONAL_PACKAGES:
|
|
60
|
60
|
postgresql-15-debversion
|
|
61
|
61
|
postgresql-plperl-15
|
|
62
|
62
|
|
|
63
|
|
-bullseye:
|
|
|
63
|
+bookworm:
|
|
64
|
64
|
<<: *test
|
|
65
|
|
- image: debian:bullseye
|
|
|
65
|
+ image: debian:bookworm
|
|
66
|
66
|
variables:
|
|
67
|
67
|
ADDITIONAL_PACKAGES:
|
|
68
|
|
- postgresql-13-debversion
|
|
69
|
|
- postgresql-plperl-13
|
|
|
68
|
+ postgresql-15-debversion
|
|
|
69
|
+ postgresql-plperl-15
|
|
70
|
70
|
|
|
71
|
71
|
|
|
72
|
72
|
flake8:
|
README
| ... |
... |
@@ -149,10 +149,10 @@ Installation |
|
149
|
149
|
Dependencies
|
|
150
|
150
|
------------
|
|
151
|
151
|
|
|
152
|
|
-(Target: bullseye)
|
|
|
152
|
+(Target: bookworm)
|
|
153
|
153
|
|
|
154
|
|
-Depends: ruby ruby-pg python3-yaml python3-psycopg2 fuse-utils python3-fuse
|
|
155
|
|
-DB-Depends: postgresql-plperl-13 postgresql-13-debversion
|
|
|
154
|
+Depends: ruby ruby-pg python3-yaml python3-psycopg2 fuse python3-fuse
|
|
|
155
|
+DB-Depends: postgresql-plperl-15 postgresql-15-debversion
|
|
156
|
156
|
fsck-Depends: python3-dev gcc
|
|
157
|
157
|
FUSE-Depends: python3-fuse
|
|
158
|
158
|
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/ |
|
64
|
64
|
Install testing dependencies:
|
|
65
|
65
|
|
|
66
|
66
|
```bash
|
|
67
|
|
-sudo apt install tox aptly devscripts postgresql-13-debversion \
|
|
|
67
|
+sudo apt install tox aptly devscripts postgresql-15-debversion \
|
|
68
|
68
|
postgresql-plperl ruby ruby-pg
|
|
69
|
69
|
```
|
|
70
|
70
|
|
web/app/setup.py
| ... |
... |
@@ -35,7 +35,7 @@ setup( |
|
35
|
35
|
'Intended Audience :: Developers',
|
|
36
|
36
|
'Topic :: Software Development :: Build Tools',
|
|
37
|
37
|
'License :: OSI Approved :: MIT License',
|
|
38
|
|
- 'Programming Language :: Python :: 3.7',
|
|
|
38
|
+ 'Programming Language :: Python :: 3.11',
|
|
39
|
39
|
'Framework :: Flask :: 1.0',
|
|
40
|
40
|
],
|
|
41
|
41
|
keywords='debian snapshot archive packages',
|
| ... |
... |
@@ -45,21 +45,21 @@ setup( |
|
45
|
45
|
data_files=[('.', ['project.py'])],
|
|
46
|
46
|
|
|
47
|
47
|
# Python version requirements
|
|
48
|
|
- python_requires='>=3.7, <4',
|
|
|
48
|
+ python_requires='>=3.11, <4',
|
|
49
|
49
|
|
|
50
|
50
|
# Requirements
|
|
51
|
51
|
install_requires=[
|
|
52
|
|
- 'flask>=1.0.2',
|
|
|
52
|
+ 'flask>=2.2.2',
|
|
53
|
53
|
'flask-mail>=0.9.1',
|
|
54
|
|
- 'psycopg2>=2.7.7',
|
|
|
54
|
+ 'psycopg2>=2.9.5',
|
|
55
|
55
|
],
|
|
56
|
56
|
|
|
57
|
57
|
extras_require={
|
|
58
|
58
|
'testing': [
|
|
59
|
|
- 'pytest>=3.10.1',
|
|
60
|
|
- 'pytest-flask>=0.14.0',
|
|
|
59
|
+ 'pytest>=7.2.1',
|
|
|
60
|
+ 'pytest-flask>=0.15.1',
|
|
61
|
61
|
'testing.postgresql>=1.3.0',
|
|
62
|
|
- 'pyyaml>=3.13',
|
|
|
62
|
+ 'pyyaml>=6.0',
|
|
63
|
63
|
],
|
|
64
|
64
|
},
|
|
65
|
65
|
|
web/app/tests/controllers/package.py
| ... |
... |
@@ -155,6 +155,8 @@ class PackageSource(): |
|
155
|
155
|
args = ['--build=full',
|
|
156
|
156
|
'--no-check-builddeps',
|
|
157
|
157
|
'--sign-key=434F639E8880A43556CACA359ACF4AF8EF70E16E',
|
|
|
158
|
+ '--sign-command=gpg',
|
|
|
159
|
+ '--sign-backend=gpg',
|
|
158
|
160
|
'--force-sign']
|
|
159
|
161
|
command = 'dpkg-buildpackage'
|
|
160
|
162
|
|
|