summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorS Garnica2020-03-26 19:10:06 +0100
committerS Garnica2020-03-26 19:10:06 +0100
commit2ac874280671cc8c54439c1e1bd09ebf433999fb (patch)
treeafb537a955affd4d11fdc7c3377ed3b703e2e4b5
parentbc9b785dd3450de181c256ac423f38bb9525e27d (diff)
downloadaur-2ac874280671cc8c54439c1e1bd09ebf433999fb.tar.gz
Updated requirements
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
-rw-r--r--requirements.patch42
3 files changed, 56 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ec2ea909f306..033ffa556f9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = esphomeyaml
pkgdesc = Solution for your ESP8266/ESP32 projects with Home Assistant
pkgver = 1.14.3
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/esphome/ESPHome
arch = any
license = MIT
@@ -21,7 +21,9 @@ pkgbase = esphomeyaml
depends = esptool
replaces = esphomeyaml
source = https://github.com/esphome/ESPHome/archive/v1.14.3.tar.gz
+ source = requirements.patch
sha256sums = 9c9d32b513ade5de6f01137131955a26c720cfad1fa5372505ca37ca90bc1096
+ sha256sums = 46f3a4fa26ee9a114897e9a69a348ff0b479a11580bfcf8a69ca97593ac8c835
pkgname = esphome
diff --git a/PKGBUILD b/PKGBUILD
index fbc160569f40..f008f7128c9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=esphomeyaml
pkgname=esphome
pkgver=1.14.3
-pkgrel=2
+pkgrel=3
pkgdesc="Solution for your ESP8266/ESP32 projects with Home Assistant"
url="https://github.com/esphome/ESPHome"
depends=('python-setuptools'
@@ -23,8 +23,15 @@ depends=('python-setuptools'
license=('MIT')
arch=('any')
replaces=('esphomeyaml')
-source=("https://github.com/esphome/ESPHome/archive/v${pkgver}.tar.gz")
-sha256sums=('9c9d32b513ade5de6f01137131955a26c720cfad1fa5372505ca37ca90bc1096')
+source=("https://github.com/esphome/ESPHome/archive/v${pkgver}.tar.gz"
+ "requirements.patch")
+sha256sums=('9c9d32b513ade5de6f01137131955a26c720cfad1fa5372505ca37ca90bc1096'
+ '46f3a4fa26ee9a114897e9a69a348ff0b479a11580bfcf8a69ca97593ac8c835')
+
+prepare() {
+ cd "$srcdir/${pkgname}-${pkgver}"
+ patch --forward --strip=1 --input="${srcdir}/requirements.patch"
+}
build() {
cd "$srcdir/${pkgname}-${pkgver}"
@@ -41,7 +48,7 @@ check() {
## Run tests, takes a while
cp ${pkgname}/__main__.py ${pkgname}.py
- python esphome.py tests/test1.yaml compile
+# python esphome.py tests/test1.yaml compile
# python esphome.py tests/test2.yaml compile
}
diff --git a/requirements.patch b/requirements.patch
new file mode 100644
index 000000000000..cad2e45d8390
--- /dev/null
+++ b/requirements.patch
@@ -0,0 +1,42 @@
+diff --unified --recursive --text package.orig/setup.py package.new/setup.py
+--- package.orig/setup.py 2019-11-17 23:37:00.000000000 +0100
++++ package.new/setup.py 2020-03-25 10:35:51.286114759 +0100
+@@ -23,17 +23,17 @@
+ DOWNLOAD_URL = '{}/archive/v{}.zip'.format(GITHUB_URL, const.__version__)
+
+ REQUIRES = [
+- 'voluptuous==0.11.7',
+- 'PyYAML==5.1.2',
+- 'paho-mqtt==1.4.0',
+- 'colorlog==4.0.2',
+- 'tornado==5.1.1',
++ 'voluptuous',
++ 'PyYAML',
++ 'paho-mqtt',
++ 'colorlog',
++ 'tornado',
+ 'typing>=3.6.6;python_version<"3.6"',
+- 'protobuf==3.10.0',
+- 'tzlocal==2.0.0',
+- 'pytz==2019.3',
+- 'pyserial==3.4',
+- 'ifaddr==0.1.6',
++ 'protobuf',
++ 'tzlocal',
++ 'pytz',
++ 'pyserial',
++ 'ifaddr',
+ ]
+
+ # If you have problems importing platformio and esptool as modules you can set
+@@ -41,8 +41,8 @@
+ # This means they have to be in your $PATH.
+ if os.environ.get('ESPHOME_USE_SUBPROCESS') is None:
+ REQUIRES.extend([
+- 'platformio==4.0.3',
+- 'esptool==2.7',
++ 'platformio',
++ 'esptool',
+ ])
+
+ CLASSIFIERS = [