Resource expression v2 implementation (new) (#1593)

* Initial implementation of resource expression v2 This is checked out from resource_expression_v2 * Support legacy Constant ast nodes Old python makes me sad * Backward compatibility wrapper * Test also unsupported grammars are correctly reported * Test more unsupported grammars * Small refactoring of namespace getter * All feedback from review * Rename new_resource.py to resource_v2.py * Typo in name refactoring * Better error messages for unsupported grammar * Constants are now in a file and loaded at runtime * Fixed typo * Updated packaging to include pyyaml as a dependency for checkbox-ng * Removed trailing , * Python 3.5/6 support
canonical · Nov 29, 2024 · e17d292 · e17d292
1 parent 4057154
commit e17d292
Show file tree

Hide file tree

Showing 10 changed files with 1,283 additions and 1 deletion.
diff --git a/checkbox-core-snap/series16/snap/snapcraft.yaml b/checkbox-core-snap/series16/snap/snapcraft.yaml
@@ -189,6 +189,7 @@ parts:
       - python3-xlsxwriter
       - python3-setuptools
       - python3-dev
+      - python3-yaml
     python-packages:
       - tqdm
     after: [checkbox-support]

diff --git a/checkbox-core-snap/series18/snap/snapcraft.yaml b/checkbox-core-snap/series18/snap/snapcraft.yaml
@@ -173,6 +173,7 @@ parts:
       - python3-requests-oauthlib
       - python3-urwid
       - python3-xlsxwriter
+      - python3-yaml
     python-packages:
       - tqdm
     build-environment:

diff --git a/checkbox-core-snap/series20/snap/snapcraft.yaml b/checkbox-core-snap/series20/snap/snapcraft.yaml
@@ -195,6 +195,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

diff --git a/checkbox-core-snap/series22/snap/snapcraft.yaml b/checkbox-core-snap/series22/snap/snapcraft.yaml
@@ -199,6 +199,7 @@ 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

diff --git a/checkbox-core-snap/series24/snap/snapcraft.yaml b/checkbox-core-snap/series24/snap/snapcraft.yaml
@@ -163,6 +163,7 @@ parts:
       - python3-minimal
       - python3-pkg-resources
       - python3.12-minimal
+      - python3-yaml
     python-packages:
       - tqdm
       - picamera # p-p-c dep that wouldnt install in another part

diff --git a/checkbox-ng/debian/control b/checkbox-ng/debian/control
@@ -23,7 +23,8 @@ Build-Depends: debhelper (>= 9),
                python3-tk,
                python3-tqdm,
                python3-urwid,
-               python3-xlsxwriter
+               python3-xlsxwriter,
+               python3-yaml
 Standards-Version: 3.9.6
 X-Python3-Version: >= 3.2
 
@@ -55,6 +56,7 @@ Depends: python3-importlib-metadata | python3 (>> 3.8),
          python3-tqdm,
          python3-urwid,
          python3-xlsxwriter,
+         python3-yaml,
          ${misc:Depends},
          ${python3:Depends}
 Breaks: python3-plainbox (<<1)

diff --git a/checkbox-ng/plainbox/impl/resource_constants.yaml b/checkbox-ng/plainbox/impl/resource_constants.yaml
@@ -0,0 +1,10 @@
+# DMI product alias for desktop
+DESKTOP_PC_PRODUCT:
+  - Desktop
+  - Low Profile Desktop
+  - Tower
+  - Mini Tower
+  - Space-saving
+  - All In One
+  - All-In-One
+  - AIO