Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/tox-checkbox.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ jobs:
tox_test_checkbox_component:
needs: get_path_matrix
strategy:
fail-fast: false
matrix:
path_flag: ${{ fromJson(needs.get_path_matrix.outputs.path_flag) }}
python: ["3.5", "3.6", "3.8", "3.10", "3.12"]
Expand Down
14 changes: 11 additions & 3 deletions checkbox-core-snap/series20/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,15 @@ parts:
stage-packages:
# actual requirements
- python3-bluez
- python3-dbus
- python3-distro
- python3-gi
- python3-pyparsing
- python3-requests
- python3-requests-unixsocket
- python3-yaml
- python3-opencv
- python3-numpy
- libsystemd0
- v4l-utils
# added to stage python:
Expand Down Expand Up @@ -179,9 +186,13 @@ parts:
- python3-markupsafe
- python3-jinja2
- python3-packaging
- python3-requests
- python3-requests-oauthlib
- python3-tqdm
- python3-urwid
- python3-xlsxwriter
- python3-psutil
- python3-yaml
# added to stage python:
- libpython3-stdlib
- libpython3.8-stdlib
Expand All @@ -194,9 +205,7 @@ parts:
- python3-distutils
- python3-pkg-resources
- python3.8-minimal
- python3-yaml
python-packages:
- tqdm
- picamera # p-p-c dep that wouldnt install in another part
after: [checkbox-support, version-calculator]
stage:
Expand Down Expand Up @@ -305,7 +314,6 @@ parts:
- python3-gi
- python3-natsort
- python3-pil
- python3-psutil
- python3-pyqrcode
- python3-serial
- python3-yaml
Expand Down
4 changes: 2 additions & 2 deletions checkbox-core-snap/series22/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ parts:
- python3-requests-oauthlib
- python3-urwid
- python3-xlsxwriter
- python3-psutil
- python3-yaml
# added to stage python:
- libpython3-stdlib
- libpython3.10-stdlib
Expand All @@ -198,7 +200,6 @@ parts:
- python3-distutils
- python3-pkg-resources
- python3.10-minimal
- python3-yaml
python-packages:
- tqdm
- picamera # p-p-c dep that wouldnt install in another part
Expand Down Expand Up @@ -308,7 +309,6 @@ parts:
- python3-gi
- python3-natsort
- python3-pil
- python3-psutil
- python3-pyqrcode
- python3-serial
- python3-yaml
Expand Down
60 changes: 54 additions & 6 deletions checkbox-ng/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,61 @@
# hack till snapcraft is updated
dependencies = [
'packaging',
'psutil',
'requests >= 1.0',
'urwid >= 1.1.1',
'Jinja2 >= 2.7',
'xlsxwriter',
'tqdm',
'importlib_metadata; python_version < "3.8"',
# Pinned to xenial universe
'requests <= 2.9.1; python_version == "3.5"',
'urwid <= 1.3.1; python_version == "3.5"',
'Jinja2 <= 2.8; python_version == "3.5"',
'MarkupSafe <= 0.23; python_version == "3.5"',
'XlsxWriter <= 0.7.3; python_version == "3.5"',
'tqdm <= 4.19.5; python_version == "3.5"',
'psutil <= 5.5.1; python_version == "3.5"',
'PyYAML <= 3.11; python_version == "3.5"',
# Pinned to bionic universe
'requests <= 2.18.4; python_version <= "3.6" and python_version > "3.5"',
'urwid <= 2.0.1; python_version <= "3.6" and python_version > "3.5"',
'Jinja2 <= 2.10; python_version <= "3.6" and python_version > "3.5"',
'MarkupSafe <= 1.1.0; python_version <= "3.6" and python_version > "3.5"',
'XlsxWriter <= 0.9.6; python_version <= "3.6" and python_version > "3.5"',
'tqdm <= 4.19.5; python_version <= "3.6" and python_version > "3.5"',
'psutil <= 5.5.1; python_version <= "3.6" and python_version > "3.5"',
'PyYAML <= 3.12; python_version <= "3.6" and python_version > "3.5"',
# Pinned to focal universe
'requests <= 2.22.0; python_version <= "3.8" and python_version > "3.6"',
'urwid <= 2.0.1; python_version <= "3.8" and python_version > "3.6"',
'Jinja2 <= 2.10.1; python_version <= "3.8" and python_version > "3.6"',
'MarkupSafe <= 1.1.0; python_version <= "3.8" and python_version > "3.6"',
'XlsxWriter <= 1.1.2; python_version <= "3.8" and python_version > "3.6"',
'tqdm <= 4.30.0; python_version <= "3.8" and python_version > "3.6"',
'psutil <= 5.5.1; python_version <= "3.8" and python_version > "3.6"',
'PyYAML <= 5.3.1; python_version <= "3.8" and python_version > "3.6"',
# Pinned to jammy universe
'requests <= 2.25.1; python_version <= "3.10" and python_version > "3.8"',
'urwid <= 2.1.2; python_version <= "3.10" and python_version > "3.8"',
'Jinja2 <= 3.0.3; python_version <= "3.10" and python_version > "3.8"',
'MarkupSafe <= 2.0.1; python_version <= "3.10" and python_version > "3.8"',
'XlsxWriter <= 3.0.2; python_version <= "3.10" and python_version > "3.8"',
'tqdm <= 4.57.0; python_version <= "3.10" and python_version > "3.8"',
'psutil <= 5.9.0; python_version <= "3.10" and python_version > "3.8"',
'PyYAML <= 6.0.1; python_version <= "3.10" and python_version > "3.8"',
# Pinned to noble universe
'requests <= 2.31.0; python_version <= "3.12" and python_version > "3.10"',
'urwid <= 2.6.10; python_version <= "3.12" and python_version > "3.10"',
'Jinja2 <= 3.1.2; python_version <= "3.12" and python_version > "3.10"',
'MarkupSafe <= 2.1.5; python_version <= "3.12" and python_version > "3.10"',
'XlsxWriter <= 3.1.9; python_version <= "3.12" and python_version > "3.10"',
'tqdm <= 4.66.2; python_version <= "3.12" and python_version > "3.10"',
'psutil <= 5.9.8; python_version <= "3.12" and python_version > "3.10"',
'PyYAML <= 6.0.1; python_version <= "3.12" and python_version > "3.10"',
# Unbound for newer versions of python
'requests; python_version > "3.12"',
'urwid; python_version > "3.12"',
'Jinja2; python_version > "3.12"',
'MarkupSafe; python_version > "3.12"',
'XlsxWriter; python_version > "3.12"',
'tqdm; python_version > "3.12"',
'psutil; python_version > "3.12"',
'PyYAML; python_version > "3.12"',
'filetype; python_version > "3.12"'
]
#test_suite='checkbox_ng.tests.test_suite'
Expand Down
60 changes: 54 additions & 6 deletions checkbox-ng/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,62 @@ sign=true
packages=find_namespace:
include_package_data=true
install_requires=
psutil
packaging
requests >= 1.0
urwid >= 1.1.1
Jinja2 >= 2.7
xlsxwriter
tqdm
importlib_metadata; python_version < "3.8"
# Pinned to xenial universe
requests <= 2.9.1; python_version == "3.5"
urwid <= 1.3.1; python_version == "3.5"
Jinja2 <= 2.8; python_version == "3.5"
MarkupSafe <= 0.23; python_version == "3.5"
XlsxWriter <= 0.7.3; python_version == "3.5"
tqdm <= 4.19.5; python_version == "3.5"
psutil <= 5.5.1; python_version == "3.5"
PyYAML <= 3.11; python_version == "3.5"
# Pinned to bionic universe
requests <= 2.18.4; python_version <= "3.6" and python_version > "3.5"
urwid <= 2.0.1; python_version <= "3.6" and python_version > "3.5"
Jinja2 <= 2.10; python_version <= "3.6" and python_version > "3.5"
MarkupSafe <= 1.1.0; python_version <= "3.6" and python_version > "3.5"
XlsxWriter <= 0.9.6; python_version <= "3.6" and python_version > "3.5"
tqdm <= 4.19.5; python_version <= "3.6" and python_version > "3.5"
psutil <= 5.5.1; python_version <= "3.6" and python_version > "3.5"
PyYAML <= 3.12; python_version <= "3.6" and python_version > "3.5"
# Pinned to focal universe
requests <= 2.22.0; python_version <= "3.8" and python_version > "3.6"
urwid <= 2.0.1; python_version <= "3.8" and python_version > "3.6"
Jinja2 <= 2.10.1; python_version <= "3.8" and python_version > "3.6"
MarkupSafe <= 1.1.0; python_version <= "3.8" and python_version > "3.6"
XlsxWriter <= 1.1.2; python_version <= "3.8" and python_version > "3.6"
tqdm <= 4.30.0; python_version <= "3.8" and python_version > "3.6"
psutil <= 5.5.1; python_version <= "3.8" and python_version > "3.6"
PyYAML <= 5.3.1; python_version <= "3.8" and python_version > "3.6"
# Pinned to jammy universe
requests <= 2.25.1; python_version <= "3.10" and python_version > "3.8"
urwid <= 2.1.2; python_version <= "3.10" and python_version > "3.8"
Jinja2 <= 3.0.3; python_version <= "3.10" and python_version > "3.8"
MarkupSafe <= 2.0.1; python_version <= "3.10" and python_version > "3.8"
XlsxWriter <= 3.0.2; python_version <= "3.10" and python_version > "3.8"
tqdm <= 4.57.0; python_version <= "3.10" and python_version > "3.8"
psutil <= 5.9.0; python_version <= "3.10" and python_version > "3.8"
PyYAML <= 6.0.1; python_version <= "3.10" and python_version > "3.8"
# Pinned to noble universe
requests <= 2.31.0; python_version <= "3.12" and python_version > "3.10"
urwid <= 2.6.10; python_version <= "3.12" and python_version > "3.10"
Jinja2 <= 3.1.2; python_version <= "3.12" and python_version > "3.10"
MarkupSafe <= 2.1.5; python_version <= "3.12" and python_version > "3.10"
XlsxWriter <= 3.1.9; python_version <= "3.12" and python_version > "3.10"
tqdm <= 4.66.2; python_version <= "3.12" and python_version > "3.10"
psutil <= 5.9.8; python_version <= "3.12" and python_version > "3.10"
PyYAML <= 6.0.1; python_version <= "3.12" and python_version > "3.10"
# Unbound for newer versions of python
requests; python_version > "3.12"
urwid; python_version > "3.12"
Jinja2; python_version > "3.12"
MarkupSafe; python_version > "3.12"
XlsxWriter; python_version > "3.12"
tqdm; python_version > "3.12"
psutil; python_version > "3.12"
PyYAML; python_version > "3.12"
filetype; python_version > "3.12"
[upload_docs]
upload_dir=build/sphinx/html
Expand Down
40 changes: 0 additions & 40 deletions checkbox-ng/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ deps =
pytest
coverage == 5.5
pytest-cov == 2.12.1
requests == 2.9.1
urwid == 1.3.1
Jinja2 == 2.8
MarkupSafe == 0.23
XlsxWriter == 0.7.3
tqdm == 4.19.5
psutil == 5.9.5
PyYAML == 3.11
setenv=
# we do not care about the package version in tox
# but it breaks some old python3.5 builds
Expand All @@ -36,53 +28,21 @@ deps =
pytest
coverage == 5.5
pytest-cov == 3.0.0
requests == 2.18.4
urwid == 2.0.1
Jinja2 == 2.10
MarkupSafe == 1.1.0
XlsxWriter == 0.9.6
tqdm == 4.19.5
psutil == 5.9.5
PyYAML == 3.12

[testenv:py38]
deps =
pytest
coverage == 7.3.0
pytest-cov == 4.1.0
requests == 2.22.0
urwid == 2.0.1
Jinja2 == 2.10.1
MarkupSafe == 1.1.0
XlsxWriter == 1.1.2
tqdm == 4.30.0
psutil == 5.9.5
PyYAML == 5.3.1

[testenv:py310]
deps =
pytest
coverage == 7.3.0
pytest-cov == 4.1.0
requests == 2.25.1
urwid == 2.1.2
Jinja2 == 3.0.3
MarkupSafe == 2.0.1
XlsxWriter == 3.0.2
tqdm == 4.57.0
psutil == 5.9.5
PyYAML == 6.0.1

[testenv:py312]
deps =
pytest
coverage == 7.4.4
pytest-cov == 4.1.0
requests == 2.31.0
urwid == 2.6.10
Jinja2 == 3.1.2
MarkupSafe == 2.1.5
XlsxWriter == 3.1.9
tqdm == 4.66.2
psutil == 5.9.8
PyYAML == 6.0.1
68 changes: 61 additions & 7 deletions checkbox-support/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,68 @@
description='CheckBox support library'
dynamic = ["version"]
dependencies=[
'pyparsing>=2.2.0',
'requests>=1.0',
'distro>=1.0',
'configparser; python_version=="2.7"',
'requests_unixsocket>=0.1.2; python_version>="3.5" and python_version<="3.11"',
'requests_unixsocket2; python_version>="3.12"',
'importlib_metadata; python_version<"3.8"',
'pyyaml',
'importlib-resources; python_version<"3.8"',
# Pinned to xenial universe
'requests <= 2.9.1; python_version == "3.5"',
'opencv_python <= 4.4.0.40; python_version == "3.5"',
'pyparsing <= 2.0.3; python_version == "3.5"',
'distro <= 1.0.1; python_version == "3.5"',
'PyYAML <= 3.11; python_version == "3.5"',
'requests-unixsocket <= 0.3.0; python_version == "3.5"',
'numpy <= 1.17.4; python_version == "3.5"',
'natsort <= 7.1.1; python_version == "3.5"',
'libsvm <= 3.23.0.4; python_version == "3.5"',
# Pinned to bionic universe
'requests <= 2.18.4; python_version > "3.5" and python_version <= "3.6"',
'opencv_python <= 4.4.0.46; python_version > "3.5" and python_version <= "3.6"',
'pyparsing <= 2.2.0; python_version > "3.5" and python_version <= "3.6"',
'distro <= 1.0.1; python_version > "3.5" and python_version <= "3.6"',
'PyYAML <= 3.12; python_version > "3.5" and python_version <= "3.6"',
'requests-unixsocket <= 0.1.5; python_version > "3.5" and python_version <= "3.6"',
'numpy <= 1.17.4; python_version > "3.5" and python_version <= "3.6"',
'natsort <= 8.0.2; python_version > "3.5" and python_version <= "3.6"',
'libsvm <= 3.23.0.4; python_version > "3.5" and python_version <= "3.6"',
# Pinned to focal universe
'requests <= 2.22.0; python_version > "3.6" and python_version <= "3.8"',
'opencv_python <= 4.4.0.46; python_version > "3.6" and python_version <= "3.8"',
'pyparsing <= 2.4.6; python_version > "3.6" and python_version <= "3.8"',
'distro <= 1.4.0; python_version > "3.6" and python_version <= "3.8"',
'PyYAML <= 5.3.1; python_version > "3.6" and python_version <= "3.8"',
'requests-unixsocket <= 0.2.0; python_version > "3.6" and python_version <= "3.8"',
'numpy <= 1.17.4; python_version > "3.6" and python_version <= "3.8"',
'natsort <= 8.0.2; python_version > "3.6" and python_version <= "3.8"',
'libsvm <= 3.23.0.4; python_version > "3.6" and python_version <= "3.8"',
# Pinned to jammy universe
'requests <= 2.25.1; python_version > "3.8" and python_version <= "3.10"',
'opencv_python <= 4.5.4.60; python_version > "3.8" and python_version <= "3.10"',
'pyparsing <= 2.4.7; python_version > "3.8" and python_version <= "3.10"',
'distro <= 1.7.0; python_version > "3.8" and python_version <= "3.10"',
'PyYAML <= 6.0.1; python_version > "3.8" and python_version <= "3.10"',
'requests-unixsocket <= 0.2.0; python_version > "3.8" and python_version <= "3.10"',
'numpy <= 1.21.5; python_version > "3.8" and python_version <= "3.10"',
'natsort <= 8.0.2; python_version > "3.8" and python_version <= "3.10"',
'libsvm <= 3.23.0.4; python_version > "3.8" and python_version <= "3.10"',
# Pinned to noble universe
'requests <= 2.31.0; python_version > "3.10" and python_version <= "3.12"',
'opencv_python <= 4.6.0.66; python_version > "3.10" and python_version <= "3.12"',
'pyparsing <= 3.1.1; python_version > "3.10" and python_version <= "3.12"',
'distro <= 1.9.0; python_version > "3.10" and python_version <= "3.12"',
'PyYAML <= 6.0.1; python_version > "3.10" and python_version <= "3.12"',
'requests-unixsocket <= 0.4.0; python_version > "3.10" and python_version <= "3.12"',
'numpy <= 1.26.4; python_version > "3.10" and python_version <= "3.12"',
'natsort <= 8.0.2; python_version > "3.10" and python_version <= "3.12"',
'libsvm <= 3.23.0.4; python_version > "3.10" and python_version <= "3.12"',
# any other version is unbounded
'requests; python_version > "3.12"',
'opencv_python; python_version > "3.12"',
'pyparsing; python_version > "3.12"',
'distro; python_version > "3.12"',
'PyYAML; python_version > "3.12"',
'requests-unixsocket; python_version > "3.12"',
'numpy; python_version > "3.12"',
'natsort; python_version > "3.12"',
'libsvm; python_version > "3.12"'
]
[metadata]
long_description={'file' = 'README.md'}
Expand Down
Loading
Loading