Compare commits

..

1 commit

Author SHA1 Message Date
Elliott Sales de Andrade
a0e21b19a8 Update to latest version (#2161159) 2023-02-19 19:26:30 -05:00
6 changed files with 23 additions and 93 deletions

6
.gitignore vendored
View file

@ -12,9 +12,3 @@
/visidata-2.8.tar.gz
/visidata-2.10.2.tar.gz
/visidata-2.11.tar.gz
/visidata-2.11.1.tar.gz
/visidata-3.0.2.tar.gz
/visidata-3.1.1.tar.gz
/visidata-3.2.tar.gz
/requirements.txt
/visidata-3.3.tar.gz

View file

@ -1,18 +0,0 @@
# See the documentation for more information:
# https://packit.dev/docs/configuration/
---
jobs:
- job: pull_from_upstream
trigger: release
dist_git_branches:
rawhide:
fast_forward_merge_into:
- fedora-branched
- job: koji_build
trigger: commit
dist_git_branches:
- fedora-all
- job: bodhi_update
trigger: commit
dist_git_branches:
- fedora-all

View file

@ -1,7 +1,7 @@
From 73ab95f8a4eb40140e1904859b135fb2caf6c751 Mon Sep 17 00:00:00 2001
From 9eb4bfeb9c6fd908f6ed8af519cd43bb3037d507 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 27 Mar 2019 19:13:42 -0400
Subject: [PATCH 1/2] Remove extra copy of man page
Subject: [PATCH] Remove extra copy of man page.
It's already installed in /usr/share/man/man1.
@ -12,31 +12,31 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
index fe07f60a..6e18d0cb 100755
index 68a71014..374da9c2 100755
--- a/setup.py
+++ b/setup.py
@@ -101,7 +101,7 @@ setup(
"all": all_requirements(),
},
package_data={
- "visidata.man": ["vd.1", "vd.txt"],
+ "visidata.man": ["vd.txt"],
"visidata.ddw": ["input.ddw", "regex.ddw"],
"visidata": ["guides/*.md"],
"visidata.tests": ["sample.tsv", "benchmark.csv"],
@@ -28,7 +28,7 @@ setup(name='visidata',
],
packages=['visidata', 'visidata.loaders', 'visidata.vendor', 'visidata.tests', 'visidata.ddw', 'visidata.man'],
data_files=[('share/man/man1', ['visidata/man/vd.1', 'visidata/man/visidata.1'])],
- package_data={'visidata.man': ['vd.1', 'vd.txt'], 'visidata.ddw': ['input.ddw'], 'visidata.tests': ['sample.tsv']},
+ package_data={'visidata.man': ['vd.txt'], 'visidata.ddw': ['input.ddw'], 'visidata.tests': ['sample.tsv']},
license='GPLv3',
classifiers=[
'Development Status :: 5 - Production/Stable',
diff --git a/visidata/help.py b/visidata/help.py
index b7d315b4..f27cc5fa 100644
index e43437ff..67dba043 100644
--- a/visidata/help.py
+++ b/visidata/help.py
@@ -159,7 +159,7 @@ def openManPage(vd):
@@ -135,7 +135,7 @@ def getHelpPane(vd, name, module='vdplus'):
def openManPage(vd):
import os
with SuspendCurses():
module_path = vd.pkg_resources_files(__name__.split('.')[0])
- if os.system(' '.join(['man', str(module_path/'man/vd.1')])) != 0:
- if os.system(' '.join(['man', resource_filename(__name__, 'man/vd.1')])) != 0:
+ if os.system(' '.join(['man', 'vd.1'])) != 0:
vd.push(TextSheet('man_vd', source=module_path/'man/vd.txt'))
vd.push(TextSheet('man_vd', source=Path(resource_filename(__name__, 'man/vd.txt'))))
--
2.50.0
2.39.2

View file

@ -1,36 +0,0 @@
From 39d2224d455f0b4639aa4e48db27c122372d8274 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Tue, 12 Aug 2025 21:25:58 -0400
Subject: [PATCH 2/2] Fix test on Python 3.14
Note, this is just a hack, and may be fixed differently by upstream:
https://github.com/saulpw/visidata/issues/2773
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
visidata/tests/test_path.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/visidata/tests/test_path.py b/visidata/tests/test_path.py
index 4bc39f83..6319e746 100644
--- a/visidata/tests/test_path.py
+++ b/visidata/tests/test_path.py
@@ -1,5 +1,5 @@
import io
-import pytest
+import sys
from visidata import Path
@@ -22,7 +22,7 @@ class TestVisidataPath:
assert Path('foo').ext == ''
assert Path('foo').base_stem == 'foo'
assert Path('foo.').ext == ''
- assert Path('foo.').base_stem == 'foo.'
+ assert Path('foo.').base_stem == ('foo.' if sys.version_info < (3, 14) else 'foo')
assert Path('.foo').ext == ''
assert Path('.foo').base_stem == '.foo'
--
2.50.0

View file

@ -1 +1 @@
SHA512 (visidata-3.3.tar.gz) = 262f12c17d18f0e58e6617bde37ba660199c7b3a078d70e774b65318b5f3daac9c85b2f6b4eaa9e232df85d37bad700b42fb764f9234d3eef3eab2e4e829d176
SHA512 (visidata-2.11.tar.gz) = f42fb38b7776215492174be9a79dd0c40d524fcf9095ca5f32a4a31e54abedb798e9d597c1ad8f2cab5c504a0c6e24969d029966b5770b6001ce07dc46ae40de

View file

@ -1,24 +1,18 @@
%global srcname visidata
Name: %{srcname}
Version: 3.3
Version: 2.11
Release: %autorelease
Summary: Terminal interface for exploring and arranging tabular data
License: GPL-3.0-only
URL: https://visidata.org
Source0: %pypi_source %{srcname}
# Fedora specific:
Patch: 0001-Remove-extra-copy-of-man-page.patch
# https://github.com/saulpw/visidata/issues/2773
Patch: 0002-Fix-test-on-Python-3.14.patch
# https://github.com/saulpw/visidata/pull/269
Patch0001: 0001-Remove-extra-copy-of-man-page.patch
BuildArch: noarch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
BuildRequires: desktop-file-utils
BuildRequires: python3-devel
BuildRequires: python3dist(setuptools)
BuildRequires: python3dist(pytest)
@ -46,7 +40,7 @@ Recommends: python3dist(mapbox-vector-tile)
Recommends: python3dist(namestand)
Recommends: python3dist(numpy)
Recommends: python3dist(openpyxl)
Recommends: python3dist(pandas) >= 1.5.3
Recommends: python3dist(pandas) >= 0.19.2
Recommends: python3dist(pdfminer-six)
Recommends: python3dist(psycopg2)
Recommends: python3dist(pypng)
@ -79,8 +73,6 @@ a lightweight utility which can handle millions of rows with ease.
%pyproject_install
%pyproject_save_files %{srcname}
desktop-file-validate %{buildroot}%{_datadir}/applications/%{srcname}.desktop
%check
mkdir HOME
touch HOME/.visidatarc # Needed for TestCommands.test_baseCommands
@ -89,11 +81,9 @@ export HOME=$PWD/HOME
%files
%{_bindir}/visidata
%{_bindir}/vd2to3.vdx
%{_bindir}/vd
%{_mandir}/man1/vd.1*
%{_mandir}/man1/visidata.1*
%{_datadir}/applications/%{srcname}.desktop
%files -n python3-%{srcname} -f %{pyproject_files}
%doc README.md