[arch-commits] Commit in tmuxp/trunk (PKGBUILD tmuxp-click-8.0.patch)

[David Runge]

    Date: Tuesday, June 15, 2021 @ 17:14:37
  Author: dvzrv
Revision: 963915

upgpkg: tmuxp 1.8.1-1: Upgrade to 1.8.1.

Switch to github source tarball, as the pypi sdist tarball misses files:
https://github.com/tmux-python/tmuxp/issues/474
Remove requirements file modifications as dependencies are not hard pinned anymore.

Modified:
  tmuxp/trunk/PKGBUILD
Deleted:
  tmuxp/trunk/tmuxp-click-8.0.patch

-----------------------+
 PKGBUILD              |   23 +++++++----------------
 tmuxp-click-8.0.patch |   38 --------------------------------------
 2 files changed, 7 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-15 17:14:28 UTC (rev 963914)
+++ PKGBUILD	2021-06-15 17:14:37 UTC (rev 963915)
@@ -1,8 +1,8 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
 
 pkgname=tmuxp
-pkgver=1.7.2
-pkgrel=2
+pkgver=1.8.1
+pkgrel=1
 pkgdesc="Tmux session manager built on libtmux"
 arch=('any')
 url="https://tmuxp.git-pull.com/en/latest/"
@@ -9,21 +9,12 @@
 license=('MIT')
 depends=('python-click' 'python-colorama' 'python-kaptan' 'python-setuptools' 'python-libtmux')
 checkdepends=('python-pytest' 'python-pytest-rerunfailures')
-source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        tmuxp-click-8.0.patch)
-sha512sums=('35f71fa9da9b6149f0bef72bbe1ff108422d813236e7a8e599c9fea46fadd437f8947e2206a05041a7bbf41338b4adb0558c1f6a0b5b38a08af76fb48aae5549'
-            '5017ee56ad37e3e1400a9cc1d535bd64053b198cc91a3edd87fd3cd37a3a2c3f155d4a7d5d68d4c5e16ea1308c0e4521badfafce1d23aa34370cea60bf625751')
-b2sums=('1c3d4628dfbbbe2c985438c58384bc051b457fd8d7e913ad0727874ee9f24aabdc9034f2f79c65f3f98e3ad7ed615fa5995561d6cb455178345f48361f5955a3'
-        'ed3d357564c84a52e20e6cf1081de2b7d2624bda157dda1de9e976d65f6a731fba1ca35682b4431d8b637667dd9fe6f8eb2b1e5d3a11cb94160b0ac6ca1753d4')
+# upstream has incomplete sdist tarball: https://github.com/tmux-python/tmuxp/issues/474
+# source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/tmux-python/${pkgname}/archive/refs/tags/v${pkgver}.tar.gz")
+sha512sums=('a414721fd9f976a9059cbb6e289aee67154df09f9437f78f97ae82b07af7fbbe67d72ed10272401fa5373643ff2a8946abcafd1c6d2098d7f1fde8364281dff3')
+b2sums=('2bf5a1964cf2d29e41c387e69019a5fae533eed70a578a3a6259a46a541ce22462d4b43326f3df7ded9afc0b5a685bd02a83e3633ed795687ba7bf0903bff866')
 
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  patch -Np1 < ../tmuxp-click-8.0.patch
-  # remove all hard version pinning:
-  # https://github.com/tmux-python/tmuxp/issues/432
-  sed -e 's/==/>=/g' -i requirements/*.txt
-}
-
 build() {
   cd "${pkgname}-${pkgver}"
   python setup.py build

Deleted: tmuxp-click-8.0.patch
===================================================================
--- tmuxp-click-8.0.patch	2021-06-15 17:14:28 UTC (rev 963914)
+++ tmuxp-click-8.0.patch	2021-06-15 17:14:37 UTC (rev 963915)
@@ -1,38 +0,0 @@
-From 760832ff3b23a0edf5969b2cb307b55a863c424d Mon Sep 17 00:00:00 2001
-From: Sam Lunt <samuel.j.lunt at gmail.com>
-Date: Thu, 13 May 2021 16:48:22 -0500
-Subject: [PATCH] set colors to be an int, not a string
-
----
- tmuxp/cli.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tmuxp/cli.py b/tmuxp/cli.py
-index 74f5142c..9f7b91a9 100644
---- a/tmuxp/cli.py
-+++ b/tmuxp/cli.py
-@@ -564,7 +564,7 @@ def load_workspace(
-         ``tmux -S <socket-path>``
-     new_session_name: str, options
-         ``tmux new -s <new_session_name>``
--    colors : str, optional
-+    colors : int, optional
-         '-2'
-             Force tmux to support 256 colors
-     detached : bool
-@@ -1013,6 +1013,7 @@ def command_freeze(session_name, socket_name, socket_path, force):
- @click.option(
-     'colors',
-     '-2',
-+    type=int,
-     flag_value=256,
-     default=True,
-     help='Force tmux to assume the terminal supports 256 colours.',
-@@ -1020,6 +1021,7 @@ def command_freeze(session_name, socket_name, socket_path, force):
- @click.option(
-     'colors',
-     '-8',
-+    type=int,
-     flag_value=88,
-     help='Like -2, but indicates that the terminal supports 88 colours.',
- )