summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake2020-03-19 23:19:28 +0100
committerJake2020-03-19 23:19:28 +0100
commit94d4b0a4c502143860611670ccd1f6721684b5bb (patch)
treedd76dba28d8d01e0d3bea24d246e0f70c2196286
parentb4a83ab3c5b468da09599713ea4e0ee9056ba9eb (diff)
downloadaur-94d4b0a4c502143860611670ccd1f6721684b5bb.tar.gz
Update to 4.3.0
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--click_version.patch22
3 files changed, 39 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 38c04dc7aa5b..5014b8d37eaa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = platformio
pkgdesc = A cross-platform code builder and library manager
- pkgver = 4.2.1
+ pkgver = 4.3.0
pkgrel = 1
url = https://github.com/platformio/platformio-core/
arch = any
@@ -16,8 +16,10 @@ pkgbase = platformio
depends = python-pyelftools
depends = python-marshmallow
conflicts = platformio-git
- source = https://github.com/platformio/platformio-core/archive/v4.2.1.tar.gz
- sha256sums = 9b405e4ab29232673f28a4302edabaeef15fb963b00aae6b37f6e6b4068bd26c
+ source = https://github.com/platformio/platformio-core/archive/v4.3.0.tar.gz
+ source = click_version.patch
+ sha256sums = e2ed3523b20520ea7ba2a278c7181ce61c065c02e7d3af692f4c1c7c8aaba3c8
+ sha256sums = c1769958f372568a9d5ca7bd553de75af435c190db6ae9b91b9e8c2816fafcba
pkgname = platformio
diff --git a/PKGBUILD b/PKGBUILD
index 093a5f9a4409..02797b9d6dd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
#
pkgname=platformio
-pkgver=4.2.1
+pkgver=4.3.0
pkgrel=1
pkgdesc="A cross-platform code builder and library manager"
arch=('any')
@@ -25,9 +25,18 @@ depends=('python-setuptools'
'python-pyelftools'
'python-marshmallow')
conflicts=('platformio-git')
-source=("https://github.com/platformio/platformio-core/archive/v${pkgver}.tar.gz")
-sha256sums=('9b405e4ab29232673f28a4302edabaeef15fb963b00aae6b37f6e6b4068bd26c')
+source=("https://github.com/platformio/platformio-core/archive/v${pkgver}.tar.gz"
+ "click_version.patch")
+sha256sums=('e2ed3523b20520ea7ba2a278c7181ce61c065c02e7d3af692f4c1c7c8aaba3c8'
+ 'c1769958f372568a9d5ca7bd553de75af435c190db6ae9b91b9e8c2816fafcba')
+prepare() {
+ cd "$srcdir/platformio-core-$pkgver"
+ # Revert python-click version limit, because it is just for windows
+ # https://github.com/pallets/click/issues/1501
+ patch -Rp1 < ../click_version.patch
+}
+
package() {
cd "$srcdir/platformio-core-$pkgver"
python setup.py install --root="$pkgdir/" --optimize=1
diff --git a/click_version.patch b/click_version.patch
new file mode 100644
index 000000000000..53bcb6727e2a
--- /dev/null
+++ b/click_version.patch
@@ -0,0 +1,22 @@
+From 58a4ff8246df240a85b52c44e3a424fbbed36b28 Mon Sep 17 00:00:00 2001
+From: Ivan Kravets <me@ikravets.com>
+Date: Sat, 14 Mar 2020 12:18:00 +0200
+Subject: [PATCH] Skip broken Click 7.1 & 7.1.1, see Click's issue #1501
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 06a915a6..2d3cd72f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -28,7 +28,7 @@
+
+ install_requires = [
+ "bottle<0.13",
+- "click>=5,<8",
++ "click>=5,<8,!=7.1,!=7.1.1",
+ "colorama",
+ "pyserial>=3,<4,!=3.3",
+ "requests>=2.4.0,<3",