Browse Source

Version bump, and fix issue with setuptools

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

+ 2 - 1
snap/plugins/python_wot_plugin.py

@@ -17,7 +17,8 @@ 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, 'python3 -m pip install --upgrade pip');
+        #  cmds.insert(1, 'python3 -m pip install --upgrade pip');
+        #  cmds.insert(2, 'python3 -m pip install -U "setuptools<58"')
         #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

+ 6 - 4
snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: home-assistant-snap
 title: Home assistant
-version: '2021.9.4'
+version: '2021.9.6'
 icon: snap/gui/home-assistant-snap.svg
 summary: Open source home automation that puts local control and privacy first
 description: |
@@ -150,15 +150,16 @@ parts:
     source: https://github.com/home-assistant/core.git
     source-tag: ${SNAPCRAFT_PROJECT_VERSION}
     python-packages:
-      - setuptools
+      - setuptools<58
       - wheel
       - Cython
       - pip
     build-packages:
       - python3
       - python3-dev
-      - python3-setuptools
-      - python3-wheel
+      - python3-pip
+      # - python3-setuptools
+      # - python3-wheel
       - pkg-config
       - autoconf
       - build-essential
@@ -201,6 +202,7 @@ parts:
     constraints:
       - homeassistant/package_constraints.txt
     override-build: |
+      python3 -m pip install -U setuptools
       snapcraftctl build
       sed -i 's/include-system-site-packages = false/include-system-site-packages = true/g' $SNAPCRAFT_PART_INSTALL/pyvenv.cfg
     # override-stage: |