Browse Source

Upgrade pip, add libswresample

Joachim M. Giæver 2 years ago
parent
commit
b8a6e5f17d
2 changed files with 7 additions and 4 deletions
  1. 3 1
      snap/plugins/python_wot_plugin.py
  2. 4 3
      snap/snapcraft.yaml

+ 3 - 1
snap/plugins/python_wot_plugin.py

@@ -17,11 +17,13 @@ for python >= 3.7, see:
 class PluginImpl(plugins.python.PythonPlugin):
     def get_build_commands(self) -> List[str]:
         cmds = super().get_build_commands()
-        # cmds.insert(1, 'pip install --trusted-host pypi.python.org --trusted-host files.pythonhosted.org --trusted-host pypi.org --upgrade pip')
+        cmds.insert(1, 'python3 -m pip install --upgrade pip');
+        #cmds.insert(1, 'pip install --trusted-host pypi.python.org --trusted-host files.pythonhosted.org --trusted-host pypi.org --upgrade pip')
         for idx, cmd in enumerate(cmds):
             # Find position where to inject pip uninstall
             if cmd.strip().startswith('[ -f setup.py ]'):
                 xcmds = cmd.split("&&", 1)
                 # Inject and force removal
+                # cmds[idx] = f"{xcmds[0]} && pip uninstall -y typing uuid && {xcmds[1]}"
                 cmds[idx] = f"{xcmds[0]} && pip uninstall -y typing uuid && {xcmds[1]}"
         return cmds

+ 4 - 3
snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: home-assistant-snap
-version: '2021.7.0'
+version: '2021.7.1'
 summary: Open source home automation that puts local control and privacy first
 description: |
   Home Assistant is a home automation platform running on Python 3. 
@@ -84,7 +84,7 @@ apps:
 
 parts:
   homeassistant:
-    plugin: python #-wot-plugin
+    plugin: python-wot-plugin
     source: https://github.com/home-assistant/core.git
     source-tag: ${SNAPCRAFT_PROJECT_VERSION}
     python-packages:
@@ -117,6 +117,7 @@ parts:
       - libgpiod-dev
       - libjpeg-dev
       - libopenzwave1.5-dev
+      - libswresample-dev
       - libssl-dev
       - libswscale-dev
       - libudev-dev
@@ -130,7 +131,7 @@ parts:
       - freeglut3
       - ffmpeg
       - libglu1-mesa
-      - libpulse0
+        #- libpulse0
       - zlib1g
     requirements:
       - requirements_all.txt