diff --git a/testing/visidata/APKBUILD b/testing/visidata/APKBUILD index c15019384b0..34c2767eae2 100644 --- a/testing/visidata/APKBUILD +++ b/testing/visidata/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dmitry Zakharchenko # Maintainer: pkgname=visidata -pkgver=3.1.1 +pkgver=3.2 pkgrel=0 pkgdesc="Terminal spreadsheet multitool" url="https://visidata.org" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-zsh-completion $pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/saulpw/visidata/archive/v$pkgver.tar.gz devendor-appdirs.patch sh-default.patch - use-importlib.patch " build() { @@ -37,8 +36,7 @@ package() { } sha512sums=" -2dee4f87c9afb6de5b2d54d8b2a8837ed5684ec1e7c163a34b6f4e7d6e896e63e3e07555b90e1f280e74adc0b9491df8c4abc6aa2228576a809651dcaa0b59f5 visidata-3.1.1.tar.gz -bacbf01b93f8f9478241084908d7811174babab34b33711e3db61219bc08037518e11c6f5b255bd6a35317defca8d8ff39187570ffaf8af18fdf9fb4bde66274 devendor-appdirs.patch -1b0c8436dbe70b30abdbfdd3ab3e608b5d09e34f03de42474623677f221f00c3bdead44be90eea07024eda4153f1b7d6c9ceaa51252225c42eff2b4dd8d20405 sh-default.patch -33b2b8fb1b2b5a61e3980ce143162460100fe5b015e41cc0ecef6280f26b02dcb3c6bde0c6211f42a0961195ff7f5de00b99ef737dd424cbcd2c1f4a697f5afa use-importlib.patch +b9c68a4ba8be92c8ba68ea3adf4c4fd81f2754c7aafeb9ce7d695b64ef2d618110d9b83e8188c59b7d91710849a6398f2d140c7db4c71a3acf41075b9266b8d3 visidata-3.2.tar.gz +de78c6b8d2dc4598b997b31a16219891f02912e57622453efab9fa8b8dbfd651125391eeb6f518bcbe7a16f57c7874ab68c7fcd6eec65bfed8cd8694f7b6018b devendor-appdirs.patch +b63f845bf385cb9a610507c7fbb7787330fcba4934ea4a1a04a8aa5acae87fe454419f0d0d13c47a4ddf328cb0f6406f7d2ec8cadc37e33d7c6dd735b05bf7e7 sh-default.patch " diff --git a/testing/visidata/devendor-appdirs.patch b/testing/visidata/devendor-appdirs.patch index b5322269a6e..407aecec8b5 100644 --- a/testing/visidata/devendor-appdirs.patch +++ b/testing/visidata/devendor-appdirs.patch @@ -1,8 +1,8 @@ diff --git a/setup.py b/setup.py -index c8e7e169..d335adf1 100755 +index fe07f60a..114404b0 100755 --- a/setup.py +++ b/setup.py -@@ -31,8 +31,6 @@ setup( +@@ -56,8 +56,6 @@ setup( packages=[ "visidata", "visidata.loaders", @@ -12,7 +12,7 @@ index c8e7e169..d335adf1 100755 "visidata.ddw", "visidata.man", diff --git a/visidata/settings.py b/visidata/settings.py -index b9136408..6464da86 100644 +index 4fac124e..5fae9c0b 100644 --- a/visidata/settings.py +++ b/visidata/settings.py @@ -8,7 +8,7 @@ import os diff --git a/testing/visidata/sh-default.patch b/testing/visidata/sh-default.patch index 7701b27f05b..43b80a348e1 100644 --- a/testing/visidata/sh-default.patch +++ b/testing/visidata/sh-default.patch @@ -1,5 +1,5 @@ diff --git a/visidata/shell.py b/visidata/shell.py -index ed6d7678..3fee234f 100644 +index 7cad95ec..f1ebf9c1 100644 --- a/visidata/shell.py +++ b/visidata/shell.py @@ -79,7 +79,7 @@ class ColumnShell(Column): diff --git a/testing/visidata/use-importlib.patch b/testing/visidata/use-importlib.patch deleted file mode 100644 index 0ab2be3f366..00000000000 --- a/testing/visidata/use-importlib.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/setup.py b/setup.py -index c8e7e169..2959ccdc 100755 ---- a/setup.py -+++ b/setup.py -@@ -25,7 +25,6 @@ setup( - install_requires=[ - "python-dateutil", - 'windows-curses != 2.3.1; platform_system == "Windows"', # 1841 -- "importlib-metadata >= 3.6", - 'importlib_resources; python_version<"3.9"', - ], - packages=[ -diff --git a/visidata/settings.py b/visidata/settings.py -index b9136408..544a54b7 100644 ---- a/visidata/settings.py -+++ b/visidata/settings.py -@@ -446,7 +446,7 @@ def loadConfigAndPlugins(vd, args=AttrDict()): - # autoload installed plugins first - args_plugins_autoload = args.plugins_autoload if 'plugins_autoload' in args else True - if not args.nothing and args_plugins_autoload and vd.options.plugins_autoload: -- from importlib_metadata import entry_points # a backport which supports < 3.8 https://github.com/pypa/twine/pull/732 -+ from importlib.metadata import entry_points - try: - eps = entry_points() - eps_visidata = eps.select(group='visidata.plugins') if 'visidata.plugins' in eps.groups else []