Merge remote-tracking branch 'upstream/beta' into add-flatpak

oskarsh · Apr 15, 2024 · c37cdcb · c37cdcb
2 parents 2a41bb9 + fd1285e
commit c37cdcb
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 107 deletions.
diff --git a/.github/workflows/flatpak-ci.yml b/.github/workflows/flatpak-ci.yml
@@ -12,10 +12,17 @@ jobs:
     container:
       image: bilelmoussaoui/flatpak-github-actions:kde-5.15-23.08
       options: --privileged
+    strategy:
+      matrix:
+        arch: [x86_64]
     steps:
     - uses: actions/checkout@v4
+    - name: Install packaging deps
+      run: |
+        dnf -y install gcc systemd-devel python3-devel libnotify poetry
     - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
       with:
         bundle: yin-yang.flatpak
         manifest-path: sh.oskar.yin-yang.json
-        cache-key: flatpak-builder-${{ github.sha }}
+        cache-key: flatpak-builder-${{ github.sha }}
+        arch: ${{ matrix.arch }}
diff --git a/README.md b/README.md
@@ -81,10 +81,10 @@ cd Yin-Yang
 For development, skip the install and instead build python using Poetry. A virtual environment will be created for you:
 
 ```bash
-# Install dependencies
-poetry install --sync
 # Load into virtual environment
 poetry env use python
+# Install dependencies
+poetry install --sync
 # Load Yin-Yang
 poetry run python -m yin_yang
 ```

diff --git a/generated-poetry-sources.json b/generated-poetry-sources.json
@@ -2,7 +2,7 @@
     "name": "poetry-deps",
     "buildsystem": "simple",
     "build-commands": [
-        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} certifi charset-normalizer colorama cython flake8 idna iniconfig mccabe packaging pluggy psutil pycodestyle pyflakes pyside6-addons pyside6-essentials pytest python-dateutil pyyaml requests setuptools shiboken6 six suntime systemd-python toml urllib3 wheel"
+        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} certifi charset-normalizer colorama flake8 idna iniconfig mccabe packaging pluggy psutil pycodestyle pyflakes pyside6-addons pyside6-essentials pytest python-dateutil pyyaml requests shiboken6 six suntime systemd-python toml urllib3"
     ],
     "sources": [
         {
@@ -20,11 +20,6 @@
             "url": "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl",
             "sha256": "4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"
         },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/7e/26/9d8de10005fedb1eceabe713348d43bae1dbab1786042ca0751a2e2b0f8c/Cython-0.29.37-py2.py3-none-any.whl",
-            "sha256": "95f1d6a83ef2729e67b3fa7318c829ce5b07ac64c084cd6af11c228e0364662c"
-        },
         {
             "type": "file",
             "url": "https://files.pythonhosted.org/packages/e3/01/cc8cdec7b61db0315c2ab62d80677a138ef06832ec17f04d87e6ef858f7f/flake8-7.0.0-py2.py3-none-any.whl",
@@ -100,11 +95,6 @@
             "url": "https://files.pythonhosted.org/packages/70/8e/0e2d847013cb52cd35b38c009bb167a1a26b2ce6cd6965bf26b47bc0bf44/requests-2.31.0-py3-none-any.whl",
             "sha256": "58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"
         },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/f7/29/13965af254e3373bceae8fb9a0e6ea0d0e571171b80d6646932131d6439b/setuptools-69.5.1-py3-none-any.whl",
-            "sha256": "c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32"
-        },
         {
             "type": "file",
             "url": "https://files.pythonhosted.org/packages/77/f1/feb2a8be699f91fb27fbe8758b405fb38a22e3ae5bd5e05258dbef18d462/shiboken6-6.6.3.1-cp38-abi3-manylinux_2_28_x86_64.whl",
@@ -134,11 +124,6 @@
             "type": "file",
             "url": "https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl",
             "sha256": "450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/7d/cd/d7460c9a869b16c3dd4e1e403cce337df165368c71d6af229a74699622ce/wheel-0.43.0-py3-none-any.whl",
-            "sha256": "55c570405f142630c6b9f72fe09d9b67cf1477fcf543ae5b8dcb1f5b7377da81"
         }
     ]
 }
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,9 +27,6 @@ flake8 = "^7.0.0"
 pytest = "^8.1.1"
 pyyaml = "^6.0.1"
 toml = "^0.10.2"
-setuptools = "^69.5.1"
-wheel = "^0.43.0"
-cython = "<3.0"
 
 [build-system]
 requires = ["poetry-core"]

diff --git a/sh.oskar.yin-yang.json b/sh.oskar.yin-yang.json
@@ -21,6 +21,8 @@
       "name": "yin-yang",
       "buildsystem": "simple",
       "build-commands": [
+        "poetry install --sync",
+        "poetry build",
         "find dist -name 'yin_yang-*-py3-none-any.whl' -exec pip install --no-deps --no-build-isolation --prefix=/app {} \\;",
         "install -D runner.sh /app/bin/runner.sh"
       ],

diff --git a/yin_yang/plugins/vscode.py b/yin_yang/plugins/vscode.py
@@ -87,8 +87,6 @@ def update_config(self, config: dict, theme: str):
     @property
     def available_themes(self) -> dict:
         themes_dict = {}
-        if not self.available:
-            return themes_dict
 
         for path in filter(isdir, extension_paths):
             with os.scandir(path) as entries:
@@ -101,9 +99,12 @@ def available_themes(self) -> dict:
                     for theme_name in get_theme_name(f'{d.path}/package.json'):
                         themes_dict[theme_name] = theme_name
 
-        assert themes_dict != {}, 'No themes found'
         return themes_dict
 
+    @property
+    def available(self) -> bool:
+        return self.available_themes != {}
+
     def __str__(self):
         # for backwards compatibility
         return 'code'