nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

debian, setup.py: Add dependency on python3-tomli

Browse Source 
Closes: #2169.

python3-coverage >= 6.0 requires python3-tomli to be installed when using
pyproject.toml. There is no hard dependency on tomli for the coverage package
perhaps due to its optional nature.

However, python3-toml is not available in Bullseye. So, require a version of
python3-coverage that does not require python3-tomli.

Tests:

- Run git-pbuilder for stable and unstable. Builds were successful.

- Run autopkgtest for stable and unstable. Dependencies were satisfied but there
was an unrelated error during test collection.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2022-01-11 08:46:05 -08:00 committed by James Valleroy
parent 03a805888d
commit 6199718a19
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -44,6 +44,8 @@ Build-Depends:
python3-ruamel.yaml, python3-ruamel.yaml,
python3-setuptools, python3-setuptools,
python3-setuptools-git, python3-setuptools-git,
# python3-tomli is not available in Bullseye
python3-tomli | python3-coverage (<< 6.0),
python3-yaml, python3-yaml,
sshpass, sshpass,
xmlto, xmlto,

2
debian/tests/control vendored
View File

@ -14,4 +14,4 @@ Restrictions: needs-root
# Run unit and integration tests on installed files. # Run unit and integration tests on installed files.
# #
Test-Command: PYTHONPATH='/usr/lib/python3/dist-packages/plinth/' py.test-3 -p no:cacheprovider --cov=plinth --cov-report=html:debci/htmlcov --cov-report=term Test-Command: PYTHONPATH='/usr/lib/python3/dist-packages/plinth/' py.test-3 -p no:cacheprovider --cov=plinth --cov-report=html:debci/htmlcov --cov-report=term
Depends: git, python3-openssl, python3-pytest, python3-pytest-cov, python3-pytest-django, @ Depends: git, python3-openssl, python3-pytest, python3-pytest-cov, python3-pytest-django, python3-tomli | python3-coverage (<< 6.0), @

1
setup.py
View File

@ -309,6 +309,7 @@ setuptools.setup(
'pytest-django', 'pytest-django',
'flake8', 'flake8',
'requests', 'requests',
'tomli',
], ],
package_data={ package_data={
'': ['templates/*', 'static/*', 'locale/*/LC_MESSAGES/*.mo'] '': ['templates/*', 'static/*', 'locale/*/LC_MESSAGES/*.mo']