summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Garnica2020-09-19 10:22:58 +0200
committerSergio Garnica2020-09-19 10:22:58 +0200
commita75e5754302ea5d4b7d81c93d4f76d2496f3ce85 (patch)
tree2b16991f620fa43078c1e0fa12d1651bb99fd3e0
parent33be4ab416c3b55d3119a2c36b2c778d157d7b06 (diff)
downloadaur-a75e5754302ea5d4b7d81c93d4f76d2496f3ce85.tar.gz
Remove patch file
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
-rw-r--r--requirements.patch42
3 files changed, 4 insertions, 50 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c908dc822748..33f52ac8ed81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = esphomeyaml
pkgdesc = Solution for your ESP8266/ESP32 projects with Home Assistant
pkgver = 1.15.1
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/esphome/ESPHome
arch = any
license = MIT
@@ -21,9 +21,7 @@ pkgbase = esphomeyaml
depends = esptool
replaces = esphomeyaml
source = https://github.com/esphome/ESPHome/archive/v1.15.1.tar.gz
- source = requirements.patch
sha256sums = e6b24f811a1da9b0572b4dd062cc1848d435269eb842b29a0046a33699aeaa7f
- sha256sums = eee066bd4496d40164961d39362183c8df8362b2de263672380cabf095a23d0a
pkgname = esphome
diff --git a/PKGBUILD b/PKGBUILD
index 332d07870f94..2ed8963e1c2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=esphomeyaml
pkgname=esphome
pkgver=1.15.1
-pkgrel=1
+pkgrel=2
pkgdesc="Solution for your ESP8266/ESP32 projects with Home Assistant"
url="https://github.com/esphome/ESPHome"
depends=('python-setuptools'
@@ -23,10 +23,8 @@ depends=('python-setuptools'
license=('MIT')
arch=('any')
replaces=('esphomeyaml')
-source=("https://github.com/esphome/ESPHome/archive/v${pkgver}.tar.gz"
- "requirements.patch")
-sha256sums=('e6b24f811a1da9b0572b4dd062cc1848d435269eb842b29a0046a33699aeaa7f'
- 'eee066bd4496d40164961d39362183c8df8362b2de263672380cabf095a23d0a')
+source=("https://github.com/esphome/ESPHome/archive/v${pkgver}.tar.gz")
+sha256sums=('e6b24f811a1da9b0572b4dd062cc1848d435269eb842b29a0046a33699aeaa7f')
prepare() {
cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/requirements.patch b/requirements.patch
deleted file mode 100644
index 8e25bbd22881..000000000000
--- a/requirements.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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.3.1',
-- 'paho-mqtt==1.5.0',
-- 'colorlog==4.1.0',
-- 'tornado==5.1.1',
-+ 'voluptuous',
-+ 'PyYAML',
-+ 'paho-mqtt',
-+ 'colorlog',
-+ 'tornado',
- 'typing>=3.6.6;python_version<"3.6"',
-- 'protobuf==3.11.3',
-- 'tzlocal==2.0.0',
-- 'pytz==2020.1',
-- '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.3.4',
-- 'esptool==2.8',
-+ 'platformio',
-+ 'esptool',
- ])
-
- CLASSIFIERS = [