From 30ef3a8698f7056f16a46ee7deec4b3f55dad968 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 13 Oct 2020 00:44:31 -0400 Subject: [PATCH 01/46] Update to latest version. --- .gitignore | 1 + ...ge-pull-request-268-from-QuLogic-nox.patch | 40 -- 0001-Remove-extra-copy-of-man-page.patch | 357 ++++++++++++++++++ 0002-Remove-extra-copy-of-man-page.patch | 69 ---- sources | 2 +- visidata.spec | 23 +- 6 files changed, 373 insertions(+), 119 deletions(-) delete mode 100644 0001-Merge-pull-request-268-from-QuLogic-nox.patch create mode 100644 0001-Remove-extra-copy-of-man-page.patch delete mode 100644 0002-Remove-extra-copy-of-man-page.patch diff --git a/.gitignore b/.gitignore index 80caacd..ce87fe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /visidata-1.5.2.tar.gz +/visidata-2.0.1.tar.gz diff --git a/0001-Merge-pull-request-268-from-QuLogic-nox.patch b/0001-Merge-pull-request-268-from-QuLogic-nox.patch deleted file mode 100644 index 935448b..0000000 --- a/0001-Merge-pull-request-268-from-QuLogic-nox.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 63e8bfe143447db0e665136d9feb085303544b39 Mon Sep 17 00:00:00 2001 -From: Anja Kefala -Date: Wed, 27 Mar 2019 19:13:30 -0400 -Subject: [PATCH 1/2] Merge pull request #268 from QuLogic/nox - -Remove unnecessary executable bits and shebang. - -Signed-off-by: Elliott Sales de Andrade ---- - visidata/colors.py | 2 -- - visidata/man/vd.1 | 0 - visidata/man/vd.inc | 0 - visidata/vdtui.py | 2 -- - 4 files changed, 4 deletions(-) - mode change 100755 => 100644 visidata/man/vd.1 - mode change 100755 => 100644 visidata/man/vd.inc - -diff --git a/visidata/colors.py b/visidata/colors.py -index a2c4bfc..e3e640d 100644 ---- a/visidata/colors.py -+++ b/visidata/colors.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python3 -- - import curses - from visidata import globalCommand, colors, Sheet, Column, RowColorizer, wrapply - -diff --git a/visidata/vdtui.py b/visidata/vdtui.py -index c2b7278..a64f157 100755 ---- a/visidata/vdtui.py -+++ b/visidata/vdtui.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python3 --# - # Copyright 2017-2018 Saul Pwanson http://saul.pw/vdtui - # - # Permission is hereby granted, free of charge, to any person obtaining a copy --- -2.20.1 - diff --git a/0001-Remove-extra-copy-of-man-page.patch b/0001-Remove-extra-copy-of-man-page.patch new file mode 100644 index 0000000..456e3a2 --- /dev/null +++ b/0001-Remove-extra-copy-of-man-page.patch @@ -0,0 +1,357 @@ +From 2f76d63824d86ff16bc6fa8255234c12573a1aa3 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Wed, 27 Mar 2019 19:13:42 -0400 +Subject: [PATCH] Remove extra copy of man page. + +It's already installed in /usr/share/man/man1. + +Signed-off-by: Elliott Sales de Andrade +--- + setup.py | 1 - + visidata/data.py | 322 +++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 322 insertions(+), 1 deletion(-) + create mode 100644 visidata/data.py + +diff --git a/setup.py b/setup.py +index 9833bf4d..61d064da 100755 +--- a/setup.py ++++ b/setup.py +@@ -25,7 +25,6 @@ setup(name='visidata', + packages=['visidata', 'visidata.loaders', 'visidata.tests'], + include_package_data=True, + data_files = [('share/man/man1', ['visidata/man/vd.1'])], +- package_data={'visidata': ['man/vd.1']}, + license='GPLv3', + classifiers=[ + 'Development Status :: 5 - Production/Stable', +diff --git a/visidata/data.py b/visidata/data.py +new file mode 100644 +index 00000000..b7d1f527 +--- /dev/null ++++ b/visidata/data.py +@@ -0,0 +1,322 @@ ++import itertools ++import os ++import random ++ ++from visidata import * ++ ++option('confirm_overwrite', True, 'whether to prompt for overwrite confirmation on save') ++replayableOption('safe_error', '#ERR', 'error string to use while saving') ++replayableOption('header', 1, 'parse first N rows of certain formats as column names') ++replayableOption('delimiter', '\t', 'delimiter to use for tsv filetype') ++replayableOption('filetype', '', 'specify file type') ++replayableOption('save_filetype', 'tsv', 'specify default file type to save as') ++replayableOption('tsv_safe_newline', '\u001e', 'replacement for tab character when saving to tsv') ++replayableOption('tsv_safe_tab', '\u001f', 'replacement for newline character when saving to tsv') ++ ++option('color_change_pending', 'reverse yellow', 'color for file attributes pending modification') ++option('color_delete_pending', 'red', 'color for files pending delete') ++ ++ ++Sheet.addCommand('R', 'random-rows', 'nrows=int(input("random number to select: ", value=nRows)); vs=copy(sheet); vs.name=name+"_sample"; vd.push(vs).rows=random.sample(rows, nrows or nRows)') ++ ++Sheet.addCommand('a', 'add-row', 'rows.insert(cursorRowIndex+1, newRow()); cursorDown(1)') ++Sheet.addCommand('ga', 'add-rows', 'addRows(sheet, int(input("add rows: ")), cursorRowIndex+1)') ++Sheet.addCommand('za', 'addcol-new', 'c=addColumn(SettableColumn("", width=options.default_width), cursorColIndex+1); draw(vd.scr); cursorVisibleColIndex=visibleCols.index(c); c.name=editCell(cursorVisibleColIndex, -1); c.width=None') ++Sheet.addCommand('gza', 'addcol-bulk', 'for c in range(int(input("add columns: "))): addColumn(SettableColumn(""), cursorColIndex+1)') ++ ++Sheet.addCommand('f', 'fill-nulls', 'fillNullValues(cursorCol, selectedRows or rows)') ++ ++bindkey('KEY_SLEFT', 'slide-left') ++bindkey('KEY_SR', 'slide-left') ++bindkey('kDN', 'slide-down') ++bindkey('kUP', 'slide-up') ++bindkey('KEY_SRIGHT', 'slide-right') ++bindkey('KEY_SF', 'slide-right') ++ ++bindkey('gKEY_SLEFT', 'slide-leftmost') ++bindkey('gkDN', 'slide-bottom') ++bindkey('gkUP', 'slide-top') ++bindkey('gKEY_SRIGHT', 'slide-rightmost') ++ ++ ++class SettableColumn(Column): ++ def __init__(self, *args, **kwargs): ++ super().__init__(*args, **kwargs) ++ self.cache = {} ++ ++ def setValue(self, row, value): ++ self.cache[id(row)] = value ++ ++ def calcValue(self, row): ++ return self.cache.get(id(row), None) ++ ++Sheet._coltype = SettableColumn ++ ++@asyncthread ++def addRows(sheet, n, idx): ++ for i in Progress(range(n), 'adding'): ++ sheet.addRow(sheet.newRow(), idx+1) ++ ++@asyncthread ++def fillNullValues(col, rows): ++ 'Fill null cells in col with the previous non-null value' ++ lastval = None ++ nullfunc = isNullFunc() ++ n = 0 ++ rowsToFill = list(rows) ++ for r in Progress(col.sheet.rows, 'filling'): # loop over all rows ++ try: ++ val = col.getValue(r) ++ except Exception as e: ++ val = e ++ ++ if nullfunc(val) and r in rowsToFill: ++ if lastval: ++ col.setValue(r, lastval) ++ n += 1 ++ else: ++ lastval = val ++ ++ col.recalc() ++ status("filled %d values" % n) ++ ++ ++def updateColNames(sheet, rows, cols, overwrite=False): ++ for c in cols: ++ if not c._name or overwrite: ++ c.name = "_".join(c.getDisplayValue(r) for r in rows) ++ ++ ++Sheet.addCommand('^', 'rename-col', 'cursorCol.name = editCell(cursorVisibleColIndex, -1)'), ++Sheet.addCommand('z^', 'rename-col-selected', 'updateColNames(sheet, selectedRows or [cursorRow], [sheet.cursorCol], overwrite=True)') ++Sheet.addCommand('g^', 'rename-cols-row', 'updateColNames(sheet, selectedRows or [cursorRow], sheet.visibleCols)') ++Sheet.addCommand('gz^', 'rename-cols-selected', 'updateColNames(sheet, selectedRows or [cursorRow], sheet.visibleCols, overwrite=True)') ++BaseSheet.addCommand(None, 'rename-sheet', 'sheet.name = input("rename sheet to: ", value=sheet.name)') ++# gz^ with no selectedRows is same as z^ ++ ++globalCommand('o', 'open-file', 'vd.push(openSource(inputFilename("open: ")))') ++Sheet.addCommand('^S', 'save-sheet', 'saveSheets(inputFilename("save to: ", value=getDefaultSaveName(sheet)), sheet, confirm_overwrite=options.confirm_overwrite)') ++globalCommand('g^S', 'save-all', 'saveSheets(inputFilename("save all sheets to: "), *vd.sheets, confirm_overwrite=options.confirm_overwrite)') ++Sheet.addCommand('z^S', 'save-col', 'vs = copy(sheet); vs.columns = [cursorCol]; vs.rows = selectedRows or rows; saveSheets(inputFilename("save to: ", value=getDefaultSaveName(vs)), vs, confirm_overwrite=options.confirm_overwrite)') ++ ++Sheet.addCommand('z=', 'show-expr', 'status(evalexpr(inputExpr("show expr="), cursorRow))') ++ ++Sheet.addCommand('gz=', 'setcol-range', 'cursorCol.setValues(selectedRows or rows, *list(itertools.islice(eval(input("set column= ", "expr", completer=CompleteExpr())), len(selectedRows or rows))))') ++ ++globalCommand('A', 'add-sheet', 'vd.push(newSheet(int(input("num columns for new sheet: "))))') ++ ++# in VisiData, ^H refers to the man page ++globalCommand('^H', 'sysopen-help', 'openManPage()') ++bindkey('KEY_F(1)', 'sysopen-help') ++bindkey('KEY_BACKSPACE', 'sysopen-help') ++bindkey('zKEY_F(1)', 'help-commands') ++bindkey('zKEY_BACKSPACE', 'help-commands') ++ ++def openManPage(): ++ import site ++ import sys ++ import sysconfig ++ if '__file__' not in globals(): ++ # Just hope this works. ++ manpage = 'vd.1' ++ elif __file__.startswith(sysconfig.get_path('purelib')): ++ # Global install ++ manpage = os.path.join(sys.prefix, 'share/man/man1/vd.1') ++ if not os.path.exists(manpage): ++ # Definitely a package install and compressed, so don't use a path. ++ manpage = 'vd.1' ++ elif __file__.startswith(site.USER_BASE): ++ # User install ++ manpage = os.path.join(site.USER_BASE, 'share/man/man1/vd.1') ++ else: ++ # Using PYTHONPATH or an editable install; look for file nearby ++ manpage = os.path.join(os.path.dirname(__file__), 'man/vd.1') ++ with SuspendCurses(): ++ os.system(' '.join(['man', manpage])) ++ ++def newSheet(ncols): ++ return Sheet('unnamed', columns=[ColumnItem('', i, width=8) for i in range(ncols)]) ++ ++def inputFilename(prompt, *args, **kwargs): ++ return input(prompt, "filename", *args, completer=completeFilename, **kwargs) ++ ++def completeFilename(val, state): ++ i = val.rfind('/') ++ if i < 0: # no / ++ base = '' ++ partial = val ++ elif i == 0: # root / ++ base = '/' ++ partial = val[1:] ++ else: ++ base = val[:i] ++ partial = val[i+1:] ++ ++ files = [] ++ for f in os.listdir(Path(base or '.').resolve()): ++ if f.startswith(partial): ++ files.append(os.path.join(base, f)) ++ ++ files.sort() ++ return files[state%len(files)] ++ ++def getDefaultSaveName(sheet): ++ src = getattr(sheet, 'source', None) ++ if isinstance(src, Path): ++ return str(src) ++ else: ++ return sheet.name+'.'+getattr(sheet, 'filetype', options.save_filetype) ++ ++def saveSheets(fn, *vsheets, confirm_overwrite=False): ++ 'Save sheet `vs` with given filename `fn`.' ++ givenpath = Path(fn) ++ ++ # determine filetype to save as ++ filetype = '' ++ basename, ext = os.path.splitext(fn) ++ if ext: ++ filetype = ext[1:] ++ ++ filetype = filetype or options.save_filetype ++ ++ if len(vsheets) > 1: ++ if not fn.endswith('/'): # forcibly specify save individual files into directory by ending path with / ++ savefunc = getGlobals().get('multisave_' + filetype, None) ++ if savefunc: ++ # use specific multisave function ++ return savefunc(givenpath, *vsheets) ++ ++ # more than one sheet; either no specific multisave for save filetype, or path ends with / ++ ++ # save as individual files in the givenpath directory ++ if not givenpath.exists(): ++ try: ++ os.makedirs(givenpath.resolve(), exist_ok=True) ++ except FileExistsError: ++ pass ++ ++ assert givenpath.is_dir(), filetype + ' cannot save multiple sheets to non-dir' ++ ++ # get save function to call ++ savefunc = getGlobals().get('save_' + filetype) or fail('no function save_'+filetype) ++ ++ if givenpath.exists(): ++ if confirm_overwrite: ++ confirm('%s already exists. overwrite? ' % fn) ++ ++ status('saving %s sheets to %s' % (len(vsheets), givenpath.fqpn)) ++ for vs in vsheets: ++ p = Path(os.path.join(givenpath.fqpn, vs.name+'.'+filetype)) ++ savefunc(p, vs) ++ else: ++ # get save function to call ++ savefunc = getGlobals().get('save_' + filetype) or fail('no function save_'+filetype) ++ ++ if givenpath.exists(): ++ if confirm_overwrite: ++ confirm('%s already exists. overwrite? ' % fn) ++ ++ status('saving to %s as %s' % (givenpath.fqpn, filetype)) ++ savefunc(givenpath, vsheets[0]) ++ ++ ++class DeferredSetColumn(Column): ++ def __init__(self, *args, **kwargs): ++ super().__init__(*args, **kwargs) ++ self.realsetter = self.setter ++ self.setter = self.deferredSet ++ self._modifiedValues = {} ++ ++ @staticmethod ++ def deferredSet(col, row, val): ++ if col.getValue(row) != val: ++ col._modifiedValues[id(row)] = val ++ ++ def changed(self, row): ++ curval = self.calcValue(row) ++ newval = self._modifiedValues.get(id(row), curval) ++ return self.type(newval) != self.type(curval) ++ ++ def getValue(self, row): ++ if id(row) in self._modifiedValues: ++ return self._modifiedValues.get(id(row)) # overrides cache ++ return Column.getValue(self, row) ++ ++ def __copy__(self): ++ ret = Column.__copy__(self) ++ ret._modifiedValues = collections.OrderedDict() # force a new, unrelated modified set ++ return ret ++ ++ ++def openSource(p, filetype=None): ++ 'calls open_ext(Path) or openurl_scheme(UrlPath, filetype)' ++ if not filetype: ++ filetype = options.filetype ++ if isinstance(p, str): ++ if '://' in p: ++ return openSource(UrlPath(p), filetype) # convert to Path and recurse ++ elif p == '-': ++ return openSource(PathFd('-', vd().stdin), filetype) ++ else: ++ return openSource(Path(p), filetype) # convert to Path and recurse ++ elif isinstance(p, UrlPath): ++ openfunc = 'openurl_' + p.scheme ++ return getGlobals()[openfunc](p, filetype=filetype) ++ elif isinstance(p, Path): ++ if not filetype: ++ filetype = p.suffix or 'txt' ++ ++ if os.path.isdir(p.resolve()): ++ filetype = 'dir' ++ ++ openfunc = 'open_' + filetype.lower() ++ if openfunc not in getGlobals(): ++ warning('no %s function' % openfunc) ++ filetype = 'txt' ++ openfunc = 'open_txt' ++ vs = getGlobals()[openfunc](p) ++ else: # some other object ++ status('unknown object type %s' % type(p)) ++ vs = None ++ ++ if vs: ++ status('opening %s as %s' % (p.name, filetype)) ++ ++ return vs ++ ++#### enable external addons ++def open_vd(p): ++ 'Opens a .vd file as a .tsv file' ++ vs = open_tsv(p) ++ vs.reload() ++ return vs ++ ++def open_txt(p): ++ 'Create sheet from `.txt` file at Path `p`, checking whether it is TSV.' ++ with p.open_text() as fp: ++ if options.delimiter in next(fp): # peek at the first line ++ return open_tsv(p) # TSV often have .txt extension ++ return TextSheet(p.name, p) ++ ++@asyncthread ++def save_txt(p, *vsheets): ++ with p.open_text(mode='w') as fp: ++ for vs in vsheets: ++ col = [vs.visibleCols[0]] ++ for dispvals in genAllValues(vs.rows, [vs.visibleCols[0]]): ++ fp.write(dispvals[0] or '') ++ fp.write('\n') ++ status('%s save finished' % p) ++ ++multisave_txt = save_txt ++ ++ ++def loadInternalSheet(klass, p, **kwargs): ++ 'Load internal sheet of given klass. Internal sheets are always tsv.' ++ vs = klass(p.name, source=p, **kwargs) ++ options._set('encoding', 'utf8', vs) ++ if p.exists(): ++ vd.sheets.insert(0, vs) ++ vs.reload.__wrapped__(vs) ++ vd.sheets.pop(0) ++ return vs +-- +2.26.2 + diff --git a/0002-Remove-extra-copy-of-man-page.patch b/0002-Remove-extra-copy-of-man-page.patch deleted file mode 100644 index 7a19ca3..0000000 --- a/0002-Remove-extra-copy-of-man-page.patch +++ /dev/null @@ -1,69 +0,0 @@ -From f82e3ca97bb5adf2a8404e7cd7719a71c66edae7 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Wed, 27 Mar 2019 19:13:42 -0400 -Subject: [PATCH 2/2] Remove extra copy of man page. - -It's already installed in /usr/share/man/man1. - -Signed-off-by: Elliott Sales de Andrade ---- - setup.py | 3 +-- - visidata/data.py | 22 ++++++++++++++++++++-- - 2 files changed, 21 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index 09f59d0..5e00fd1 100755 ---- a/setup.py -+++ b/setup.py -@@ -20,8 +20,7 @@ setup(name='visidata', - packages=['visidata', 'visidata.loaders'], - include_package_data=True, - data_files = [('share/man/man1', ['visidata/man/vd.1'])], -- package_data={'visidata': ['man/vd.1'], -- 'visidata': ['commands.tsv']}, -+ package_data={'visidata': ['commands.tsv']}, - license='GPLv3', - classifiers=[ - 'Development Status :: 5 - Production/Stable', -diff --git a/visidata/data.py b/visidata/data.py -index e61897f..b7d1f52 100644 ---- a/visidata/data.py -+++ b/visidata/data.py -@@ -1,4 +1,5 @@ - import itertools -+import os - import random - - from visidata import * -@@ -112,9 +113,26 @@ bindkey('zKEY_F(1)', 'help-commands') - bindkey('zKEY_BACKSPACE', 'help-commands') - - def openManPage(): -- from pkg_resources import resource_filename -+ import site -+ import sys -+ import sysconfig -+ if '__file__' not in globals(): -+ # Just hope this works. -+ manpage = 'vd.1' -+ elif __file__.startswith(sysconfig.get_path('purelib')): -+ # Global install -+ manpage = os.path.join(sys.prefix, 'share/man/man1/vd.1') -+ if not os.path.exists(manpage): -+ # Definitely a package install and compressed, so don't use a path. -+ manpage = 'vd.1' -+ elif __file__.startswith(site.USER_BASE): -+ # User install -+ manpage = os.path.join(site.USER_BASE, 'share/man/man1/vd.1') -+ else: -+ # Using PYTHONPATH or an editable install; look for file nearby -+ manpage = os.path.join(os.path.dirname(__file__), 'man/vd.1') - with SuspendCurses(): -- os.system(' '.join(['man', resource_filename(__name__, 'man/vd.1')])) -+ os.system(' '.join(['man', manpage])) - - def newSheet(ncols): - return Sheet('unnamed', columns=[ColumnItem('', i, width=8) for i in range(ncols)]) --- -2.20.1 - diff --git a/sources b/sources index 8dce953..d974771 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-1.5.2.tar.gz) = df236bb74909b3d0bbff012d20b01546ca9058038877a12e94fd2274d7b6465e68c0b652e37776e0b693916070c7185a773d54ead291c996bbb32625897bd4df +SHA512 (visidata-2.0.1.tar.gz) = d5a3c1ed49e16d6b8c49cdb16142c6fd049273db228c432b37e3c65410b065258b8f33cde99badbe7cb5555621146d264fa8b24be18c199581c71ab71bf35984 diff --git a/visidata.spec b/visidata.spec index 6e4de5b..9662f97 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,17 +1,15 @@ %global srcname visidata Name: %{srcname} -Version: 1.5.2 -Release: 8%{?dist} -Summary: Curses interface for exploring and arranging tabular data +Version: 2.0.1 +Release: 1%{?dist} +Summary: Terminal interface for exploring and arranging tabular data License: GPLv3 URL: https://visidata.org Source0: %pypi_source -# https://github.com/saulpw/visidata/pull/268 -Patch0001: 0001-Merge-pull-request-268-from-QuLogic-nox.patch # https://github.com/saulpw/visidata/pull/269 -Patch0002: 0002-Remove-extra-copy-of-man-page.patch +Patch0001: 0001-Remove-extra-copy-of-man-page.patch BuildArch: noarch @@ -32,6 +30,7 @@ Summary: %{summary} # Optional dependencies Recommends: python3dist(PyYAML) +Recommends: python3dist(datapackage) Recommends: python3dist(dnslib) Recommends: python3dist(dpkt) Recommends: python3dist(fonttools) @@ -39,14 +38,19 @@ Recommends: python3dist(h5py) Recommends: python3dist(lxml) Recommends: python3dist(mapbox-vector-tile) Recommends: python3dist(namestand) +Recommends: python3dist(numpy) Recommends: python3dist(openpyxl) Recommends: python3dist(pandas) >= 0.19.2 +Recommends: python3dist(pdfminer.six) Recommends: python3dist(psycopg2) Recommends: python3dist(pypng) Recommends: python3dist(pyshp) Recommends: python3dist(requests) Recommends: python3dist(sas7bdat) Recommends: python3dist(savReaderWriter) +Recommends: python3dist(tabulate) +Recommends: python3dist(vobject) +Recommends: python3dist(wcwidth) Recommends: python3dist(xlrd) Recommends: python3dist(xport) @@ -62,9 +66,6 @@ a lightweight utility which can handle millions of rows with ease. # Remove bundled egg-info rm -rf %{srcname}.egg-info -# Fix executable bits -chmod -x visidata/vdtui.py visidata/man/vd.1 - %build %py3_build @@ -75,6 +76,7 @@ chmod -x visidata/vdtui.py visidata/man/vd.1 %files +%{_bindir}/visidata %{_bindir}/vd %{_mandir}/man1/vd.1* @@ -86,6 +88,9 @@ chmod -x visidata/vdtui.py visidata/man/vd.1 %changelog +* Mon Oct 12 2020 Elliott Sales de Andrade - 2.0.1-1 +- Update to latest version (#1887632) + * Wed Jul 29 2020 Fedora Release Engineering - 1.5.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e8b173df3069d619aeb839f4da1fc2c6fa8d0e58 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 12 Dec 2020 20:51:01 -0500 Subject: [PATCH 02/46] Update to latest version. --- .gitignore | 1 + 0001-Remove-extra-copy-of-man-page.patch | 357 ++--------------------- sources | 2 +- visidata.spec | 5 +- 4 files changed, 27 insertions(+), 338 deletions(-) diff --git a/.gitignore b/.gitignore index ce87fe5..dfa63d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /visidata-1.5.2.tar.gz /visidata-2.0.1.tar.gz +/visidata-2.1.tar.gz diff --git a/0001-Remove-extra-copy-of-man-page.patch b/0001-Remove-extra-copy-of-man-page.patch index 456e3a2..311fc37 100644 --- a/0001-Remove-extra-copy-of-man-page.patch +++ b/0001-Remove-extra-copy-of-man-page.patch @@ -1,4 +1,4 @@ -From 2f76d63824d86ff16bc6fa8255234c12573a1aa3 Mon Sep 17 00:00:00 2001 +From 5b1094075bccbe0928730a47e65441198d5d3f0b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Mar 2019 19:13:42 -0400 Subject: [PATCH] Remove extra copy of man page. @@ -7,351 +7,36 @@ It's already installed in /usr/share/man/man1. Signed-off-by: Elliott Sales de Andrade --- - setup.py | 1 - - visidata/data.py | 322 +++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 322 insertions(+), 1 deletion(-) - create mode 100644 visidata/data.py + setup.py | 2 +- + visidata/help.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index 9833bf4d..61d064da 100755 +index dfdbe23c..f257799e 100755 --- a/setup.py +++ b/setup.py -@@ -25,7 +25,6 @@ setup(name='visidata', +@@ -25,7 +25,7 @@ setup(name='visidata', packages=['visidata', 'visidata.loaders', 'visidata.tests'], include_package_data=True, data_files = [('share/man/man1', ['visidata/man/vd.1'])], -- package_data={'visidata': ['man/vd.1']}, +- package_data={'visidata': ['man/vd.1', 'man/vd.txt']}, ++ package_data={'visidata': ['man/vd.txt']}, license='GPLv3', classifiers=[ 'Development Status :: 5 - Production/Stable', -diff --git a/visidata/data.py b/visidata/data.py -new file mode 100644 -index 00000000..b7d1f527 ---- /dev/null -+++ b/visidata/data.py -@@ -0,0 +1,322 @@ -+import itertools -+import os -+import random -+ -+from visidata import * -+ -+option('confirm_overwrite', True, 'whether to prompt for overwrite confirmation on save') -+replayableOption('safe_error', '#ERR', 'error string to use while saving') -+replayableOption('header', 1, 'parse first N rows of certain formats as column names') -+replayableOption('delimiter', '\t', 'delimiter to use for tsv filetype') -+replayableOption('filetype', '', 'specify file type') -+replayableOption('save_filetype', 'tsv', 'specify default file type to save as') -+replayableOption('tsv_safe_newline', '\u001e', 'replacement for tab character when saving to tsv') -+replayableOption('tsv_safe_tab', '\u001f', 'replacement for newline character when saving to tsv') -+ -+option('color_change_pending', 'reverse yellow', 'color for file attributes pending modification') -+option('color_delete_pending', 'red', 'color for files pending delete') -+ -+ -+Sheet.addCommand('R', 'random-rows', 'nrows=int(input("random number to select: ", value=nRows)); vs=copy(sheet); vs.name=name+"_sample"; vd.push(vs).rows=random.sample(rows, nrows or nRows)') -+ -+Sheet.addCommand('a', 'add-row', 'rows.insert(cursorRowIndex+1, newRow()); cursorDown(1)') -+Sheet.addCommand('ga', 'add-rows', 'addRows(sheet, int(input("add rows: ")), cursorRowIndex+1)') -+Sheet.addCommand('za', 'addcol-new', 'c=addColumn(SettableColumn("", width=options.default_width), cursorColIndex+1); draw(vd.scr); cursorVisibleColIndex=visibleCols.index(c); c.name=editCell(cursorVisibleColIndex, -1); c.width=None') -+Sheet.addCommand('gza', 'addcol-bulk', 'for c in range(int(input("add columns: "))): addColumn(SettableColumn(""), cursorColIndex+1)') -+ -+Sheet.addCommand('f', 'fill-nulls', 'fillNullValues(cursorCol, selectedRows or rows)') -+ -+bindkey('KEY_SLEFT', 'slide-left') -+bindkey('KEY_SR', 'slide-left') -+bindkey('kDN', 'slide-down') -+bindkey('kUP', 'slide-up') -+bindkey('KEY_SRIGHT', 'slide-right') -+bindkey('KEY_SF', 'slide-right') -+ -+bindkey('gKEY_SLEFT', 'slide-leftmost') -+bindkey('gkDN', 'slide-bottom') -+bindkey('gkUP', 'slide-top') -+bindkey('gKEY_SRIGHT', 'slide-rightmost') -+ -+ -+class SettableColumn(Column): -+ def __init__(self, *args, **kwargs): -+ super().__init__(*args, **kwargs) -+ self.cache = {} -+ -+ def setValue(self, row, value): -+ self.cache[id(row)] = value -+ -+ def calcValue(self, row): -+ return self.cache.get(id(row), None) -+ -+Sheet._coltype = SettableColumn -+ -+@asyncthread -+def addRows(sheet, n, idx): -+ for i in Progress(range(n), 'adding'): -+ sheet.addRow(sheet.newRow(), idx+1) -+ -+@asyncthread -+def fillNullValues(col, rows): -+ 'Fill null cells in col with the previous non-null value' -+ lastval = None -+ nullfunc = isNullFunc() -+ n = 0 -+ rowsToFill = list(rows) -+ for r in Progress(col.sheet.rows, 'filling'): # loop over all rows -+ try: -+ val = col.getValue(r) -+ except Exception as e: -+ val = e -+ -+ if nullfunc(val) and r in rowsToFill: -+ if lastval: -+ col.setValue(r, lastval) -+ n += 1 -+ else: -+ lastval = val -+ -+ col.recalc() -+ status("filled %d values" % n) -+ -+ -+def updateColNames(sheet, rows, cols, overwrite=False): -+ for c in cols: -+ if not c._name or overwrite: -+ c.name = "_".join(c.getDisplayValue(r) for r in rows) -+ -+ -+Sheet.addCommand('^', 'rename-col', 'cursorCol.name = editCell(cursorVisibleColIndex, -1)'), -+Sheet.addCommand('z^', 'rename-col-selected', 'updateColNames(sheet, selectedRows or [cursorRow], [sheet.cursorCol], overwrite=True)') -+Sheet.addCommand('g^', 'rename-cols-row', 'updateColNames(sheet, selectedRows or [cursorRow], sheet.visibleCols)') -+Sheet.addCommand('gz^', 'rename-cols-selected', 'updateColNames(sheet, selectedRows or [cursorRow], sheet.visibleCols, overwrite=True)') -+BaseSheet.addCommand(None, 'rename-sheet', 'sheet.name = input("rename sheet to: ", value=sheet.name)') -+# gz^ with no selectedRows is same as z^ -+ -+globalCommand('o', 'open-file', 'vd.push(openSource(inputFilename("open: ")))') -+Sheet.addCommand('^S', 'save-sheet', 'saveSheets(inputFilename("save to: ", value=getDefaultSaveName(sheet)), sheet, confirm_overwrite=options.confirm_overwrite)') -+globalCommand('g^S', 'save-all', 'saveSheets(inputFilename("save all sheets to: "), *vd.sheets, confirm_overwrite=options.confirm_overwrite)') -+Sheet.addCommand('z^S', 'save-col', 'vs = copy(sheet); vs.columns = [cursorCol]; vs.rows = selectedRows or rows; saveSheets(inputFilename("save to: ", value=getDefaultSaveName(vs)), vs, confirm_overwrite=options.confirm_overwrite)') -+ -+Sheet.addCommand('z=', 'show-expr', 'status(evalexpr(inputExpr("show expr="), cursorRow))') -+ -+Sheet.addCommand('gz=', 'setcol-range', 'cursorCol.setValues(selectedRows or rows, *list(itertools.islice(eval(input("set column= ", "expr", completer=CompleteExpr())), len(selectedRows or rows))))') -+ -+globalCommand('A', 'add-sheet', 'vd.push(newSheet(int(input("num columns for new sheet: "))))') -+ -+# in VisiData, ^H refers to the man page -+globalCommand('^H', 'sysopen-help', 'openManPage()') -+bindkey('KEY_F(1)', 'sysopen-help') -+bindkey('KEY_BACKSPACE', 'sysopen-help') -+bindkey('zKEY_F(1)', 'help-commands') -+bindkey('zKEY_BACKSPACE', 'help-commands') -+ -+def openManPage(): -+ import site -+ import sys -+ import sysconfig -+ if '__file__' not in globals(): -+ # Just hope this works. -+ manpage = 'vd.1' -+ elif __file__.startswith(sysconfig.get_path('purelib')): -+ # Global install -+ manpage = os.path.join(sys.prefix, 'share/man/man1/vd.1') -+ if not os.path.exists(manpage): -+ # Definitely a package install and compressed, so don't use a path. -+ manpage = 'vd.1' -+ elif __file__.startswith(site.USER_BASE): -+ # User install -+ manpage = os.path.join(site.USER_BASE, 'share/man/man1/vd.1') -+ else: -+ # Using PYTHONPATH or an editable install; look for file nearby -+ manpage = os.path.join(os.path.dirname(__file__), 'man/vd.1') -+ with SuspendCurses(): -+ os.system(' '.join(['man', manpage])) -+ -+def newSheet(ncols): -+ return Sheet('unnamed', columns=[ColumnItem('', i, width=8) for i in range(ncols)]) -+ -+def inputFilename(prompt, *args, **kwargs): -+ return input(prompt, "filename", *args, completer=completeFilename, **kwargs) -+ -+def completeFilename(val, state): -+ i = val.rfind('/') -+ if i < 0: # no / -+ base = '' -+ partial = val -+ elif i == 0: # root / -+ base = '/' -+ partial = val[1:] -+ else: -+ base = val[:i] -+ partial = val[i+1:] -+ -+ files = [] -+ for f in os.listdir(Path(base or '.').resolve()): -+ if f.startswith(partial): -+ files.append(os.path.join(base, f)) -+ -+ files.sort() -+ return files[state%len(files)] -+ -+def getDefaultSaveName(sheet): -+ src = getattr(sheet, 'source', None) -+ if isinstance(src, Path): -+ return str(src) -+ else: -+ return sheet.name+'.'+getattr(sheet, 'filetype', options.save_filetype) -+ -+def saveSheets(fn, *vsheets, confirm_overwrite=False): -+ 'Save sheet `vs` with given filename `fn`.' -+ givenpath = Path(fn) -+ -+ # determine filetype to save as -+ filetype = '' -+ basename, ext = os.path.splitext(fn) -+ if ext: -+ filetype = ext[1:] -+ -+ filetype = filetype or options.save_filetype -+ -+ if len(vsheets) > 1: -+ if not fn.endswith('/'): # forcibly specify save individual files into directory by ending path with / -+ savefunc = getGlobals().get('multisave_' + filetype, None) -+ if savefunc: -+ # use specific multisave function -+ return savefunc(givenpath, *vsheets) -+ -+ # more than one sheet; either no specific multisave for save filetype, or path ends with / -+ -+ # save as individual files in the givenpath directory -+ if not givenpath.exists(): -+ try: -+ os.makedirs(givenpath.resolve(), exist_ok=True) -+ except FileExistsError: -+ pass -+ -+ assert givenpath.is_dir(), filetype + ' cannot save multiple sheets to non-dir' -+ -+ # get save function to call -+ savefunc = getGlobals().get('save_' + filetype) or fail('no function save_'+filetype) -+ -+ if givenpath.exists(): -+ if confirm_overwrite: -+ confirm('%s already exists. overwrite? ' % fn) -+ -+ status('saving %s sheets to %s' % (len(vsheets), givenpath.fqpn)) -+ for vs in vsheets: -+ p = Path(os.path.join(givenpath.fqpn, vs.name+'.'+filetype)) -+ savefunc(p, vs) -+ else: -+ # get save function to call -+ savefunc = getGlobals().get('save_' + filetype) or fail('no function save_'+filetype) -+ -+ if givenpath.exists(): -+ if confirm_overwrite: -+ confirm('%s already exists. overwrite? ' % fn) -+ -+ status('saving to %s as %s' % (givenpath.fqpn, filetype)) -+ savefunc(givenpath, vsheets[0]) -+ -+ -+class DeferredSetColumn(Column): -+ def __init__(self, *args, **kwargs): -+ super().__init__(*args, **kwargs) -+ self.realsetter = self.setter -+ self.setter = self.deferredSet -+ self._modifiedValues = {} -+ -+ @staticmethod -+ def deferredSet(col, row, val): -+ if col.getValue(row) != val: -+ col._modifiedValues[id(row)] = val -+ -+ def changed(self, row): -+ curval = self.calcValue(row) -+ newval = self._modifiedValues.get(id(row), curval) -+ return self.type(newval) != self.type(curval) -+ -+ def getValue(self, row): -+ if id(row) in self._modifiedValues: -+ return self._modifiedValues.get(id(row)) # overrides cache -+ return Column.getValue(self, row) -+ -+ def __copy__(self): -+ ret = Column.__copy__(self) -+ ret._modifiedValues = collections.OrderedDict() # force a new, unrelated modified set -+ return ret -+ -+ -+def openSource(p, filetype=None): -+ 'calls open_ext(Path) or openurl_scheme(UrlPath, filetype)' -+ if not filetype: -+ filetype = options.filetype -+ if isinstance(p, str): -+ if '://' in p: -+ return openSource(UrlPath(p), filetype) # convert to Path and recurse -+ elif p == '-': -+ return openSource(PathFd('-', vd().stdin), filetype) -+ else: -+ return openSource(Path(p), filetype) # convert to Path and recurse -+ elif isinstance(p, UrlPath): -+ openfunc = 'openurl_' + p.scheme -+ return getGlobals()[openfunc](p, filetype=filetype) -+ elif isinstance(p, Path): -+ if not filetype: -+ filetype = p.suffix or 'txt' -+ -+ if os.path.isdir(p.resolve()): -+ filetype = 'dir' -+ -+ openfunc = 'open_' + filetype.lower() -+ if openfunc not in getGlobals(): -+ warning('no %s function' % openfunc) -+ filetype = 'txt' -+ openfunc = 'open_txt' -+ vs = getGlobals()[openfunc](p) -+ else: # some other object -+ status('unknown object type %s' % type(p)) -+ vs = None -+ -+ if vs: -+ status('opening %s as %s' % (p.name, filetype)) -+ -+ return vs -+ -+#### enable external addons -+def open_vd(p): -+ 'Opens a .vd file as a .tsv file' -+ vs = open_tsv(p) -+ vs.reload() -+ return vs -+ -+def open_txt(p): -+ 'Create sheet from `.txt` file at Path `p`, checking whether it is TSV.' -+ with p.open_text() as fp: -+ if options.delimiter in next(fp): # peek at the first line -+ return open_tsv(p) # TSV often have .txt extension -+ return TextSheet(p.name, p) -+ -+@asyncthread -+def save_txt(p, *vsheets): -+ with p.open_text(mode='w') as fp: -+ for vs in vsheets: -+ col = [vs.visibleCols[0]] -+ for dispvals in genAllValues(vs.rows, [vs.visibleCols[0]]): -+ fp.write(dispvals[0] or '') -+ fp.write('\n') -+ status('%s save finished' % p) -+ -+multisave_txt = save_txt -+ -+ -+def loadInternalSheet(klass, p, **kwargs): -+ 'Load internal sheet of given klass. Internal sheets are always tsv.' -+ vs = klass(p.name, source=p, **kwargs) -+ options._set('encoding', 'utf8', vs) -+ if p.exists(): -+ vd.sheets.insert(0, vs) -+ vs.reload.__wrapped__(vs) -+ vd.sheets.pop(0) -+ return vs +diff --git a/visidata/help.py b/visidata/help.py +index fded3ac5..a7cf2dbb 100644 +--- a/visidata/help.py ++++ b/visidata/help.py +@@ -63,7 +63,7 @@ def openManPage(vd): + from pkg_resources import resource_filename + import os + with SuspendCurses(): +- 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=Path(resource_filename(__name__, 'man/vd.txt')))) + + -- 2.26.2 diff --git a/sources b/sources index d974771..6a853be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.0.1.tar.gz) = d5a3c1ed49e16d6b8c49cdb16142c6fd049273db228c432b37e3c65410b065258b8f33cde99badbe7cb5555621146d264fa8b24be18c199581c71ab71bf35984 +SHA512 (visidata-2.1.tar.gz) = 08b00251a022ca65300ce33c26d416ff03cd7a840dfef580531e1568ae8144232744a7ece21237d7ca5339e8bb26f964487b36e43deed501e7886ff0e3b63668 diff --git a/visidata.spec b/visidata.spec index 9662f97..384bf99 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,7 +1,7 @@ %global srcname visidata Name: %{srcname} -Version: 2.0.1 +Version: 2.1 Release: 1%{?dist} Summary: Terminal interface for exploring and arranging tabular data @@ -88,6 +88,9 @@ rm -rf %{srcname}.egg-info %changelog +* Sat Dec 12 2020 Elliott Sales de Andrade - 2.1-1 +- Update to latest version (#1904920) + * Mon Oct 12 2020 Elliott Sales de Andrade - 2.0.1-1 - Update to latest version (#1887632) From 202de0c347925e403f9a3fafdb448b850dab1a68 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 11 Jan 2021 00:21:53 -0500 Subject: [PATCH 03/46] Update to latest version. --- .gitignore | 1 + sources | 2 +- visidata.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dfa63d2..8bbdfad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /visidata-1.5.2.tar.gz /visidata-2.0.1.tar.gz /visidata-2.1.tar.gz +/visidata-2.1.1.tar.gz diff --git a/sources b/sources index 6a853be..c73e041 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.1.tar.gz) = 08b00251a022ca65300ce33c26d416ff03cd7a840dfef580531e1568ae8144232744a7ece21237d7ca5339e8bb26f964487b36e43deed501e7886ff0e3b63668 +SHA512 (visidata-2.1.1.tar.gz) = bc7b6dbb2edeb73fbba63d1ba400c3897ab5089baeed81a6a31facec43d104d5b6a78fe2355a1abca5ecda2e65cfeee5fc49b35cd666c6fc58bb5b7d094ab0c3 diff --git a/visidata.spec b/visidata.spec index 384bf99..9c0a9fc 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,7 +1,7 @@ %global srcname visidata Name: %{srcname} -Version: 2.1 +Version: 2.1.1 Release: 1%{?dist} Summary: Terminal interface for exploring and arranging tabular data @@ -83,11 +83,14 @@ rm -rf %{srcname}.egg-info %files -n python3-%{srcname} %doc README.md %license LICENSE.gpl3 -%{python3_sitelib}/%{srcname} -%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info +%{python3_sitelib}/%{srcname}/ +%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/ %changelog +* Mon Jan 11 2021 Elliott Sales de Andrade - 2.1.1-1 +- Update to latest version (#1912222) + * Sat Dec 12 2020 Elliott Sales de Andrade - 2.1-1 - Update to latest version (#1904920) From d6acb6ffa758277f961c9ff86605f9aea8c9a451 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 11 Jan 2021 00:38:48 -0500 Subject: [PATCH 04/46] Add a check section. --- visidata.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/visidata.spec b/visidata.spec index 9c0a9fc..df611d0 100644 --- a/visidata.spec +++ b/visidata.spec @@ -15,6 +15,7 @@ BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3dist(setuptools) +BuildRequires: python3dist(pytest) Requires: python3-%{srcname} = %{version}-%{release} @@ -75,6 +76,10 @@ rm -rf %{srcname}.egg-info %py3_install +%check +%{pytest} + + %files %{_bindir}/visidata %{_bindir}/vd From 90eb0f984cf4d8a6907bbad07227871fc87b0b95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:10:12 +0000 Subject: [PATCH 05/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- visidata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visidata.spec b/visidata.spec index df611d0..df27176 100644 --- a/visidata.spec +++ b/visidata.spec @@ -2,7 +2,7 @@ Name: %{srcname} Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal interface for exploring and arranging tabular data License: GPLv3 @@ -93,6 +93,9 @@ rm -rf %{srcname}.egg-info %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 11 2021 Elliott Sales de Andrade - 2.1.1-1 - Update to latest version (#1912222) From d3e69aeaddb65cb0b4e99269788a5465329abf04 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 6 Feb 2021 01:36:26 -0500 Subject: [PATCH 06/46] Update to latest version. --- .gitignore | 1 + sources | 2 +- visidata.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8bbdfad..20b662f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /visidata-2.0.1.tar.gz /visidata-2.1.tar.gz /visidata-2.1.1.tar.gz +/visidata-2.2.tar.gz diff --git a/sources b/sources index c73e041..62f3bff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.1.1.tar.gz) = bc7b6dbb2edeb73fbba63d1ba400c3897ab5089baeed81a6a31facec43d104d5b6a78fe2355a1abca5ecda2e65cfeee5fc49b35cd666c6fc58bb5b7d094ab0c3 +SHA512 (visidata-2.2.tar.gz) = 485c0a029aed6f8bf6e04a0fe77278e054833faa997e5c1bf6652240658667722a77901d2246b4fb6c90cf5648b891c115522ecab7ed8320e441b1fdec4efade diff --git a/visidata.spec b/visidata.spec index df27176..de79f42 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,8 +1,8 @@ %global srcname visidata Name: %{srcname} -Version: 2.1.1 -Release: 2%{?dist} +Version: 2.2 +Release: 1%{?dist} Summary: Terminal interface for exploring and arranging tabular data License: GPLv3 @@ -93,6 +93,10 @@ rm -rf %{srcname}.egg-info %changelog +* Sat Feb 06 2021 Elliott Sales de Andrade - 2.2-1 +- Update to latest version +- Fixes rhbz#1922737 + * Wed Jan 27 2021 Fedora Release Engineering - 2.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a60e14221b0a99539c0ede27532cc63171c65116 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 8 Feb 2021 01:32:34 -0500 Subject: [PATCH 07/46] Update to latest version. --- .gitignore | 1 + 0001-Remove-extra-copy-of-man-page.patch | 10 +++++----- sources | 2 +- visidata.spec | 7 ++++++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 20b662f..62d1221 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /visidata-2.1.tar.gz /visidata-2.1.1.tar.gz /visidata-2.2.tar.gz +/visidata-2.2.1.tar.gz diff --git a/0001-Remove-extra-copy-of-man-page.patch b/0001-Remove-extra-copy-of-man-page.patch index 311fc37..3dd82d2 100644 --- a/0001-Remove-extra-copy-of-man-page.patch +++ b/0001-Remove-extra-copy-of-man-page.patch @@ -1,4 +1,4 @@ -From 5b1094075bccbe0928730a47e65441198d5d3f0b Mon Sep 17 00:00:00 2001 +From b05acf9a46b7a4c0c5eabec16f37ffefa0892492 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Mar 2019 19:13:42 -0400 Subject: [PATCH] Remove extra copy of man page. @@ -12,20 +12,20 @@ Signed-off-by: Elliott Sales de Andrade 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index dfdbe23c..f257799e 100755 +index f5ccbb83..e6d4e389 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ setup(name='visidata', packages=['visidata', 'visidata.loaders', 'visidata.tests'], include_package_data=True, - data_files = [('share/man/man1', ['visidata/man/vd.1'])], + data_files = [('share/man/man1', ['visidata/man/vd.1', 'visidata/man/visidata.1'])], - package_data={'visidata': ['man/vd.1', 'man/vd.txt']}, + package_data={'visidata': ['man/vd.txt']}, license='GPLv3', classifiers=[ 'Development Status :: 5 - Production/Stable', diff --git a/visidata/help.py b/visidata/help.py -index fded3ac5..a7cf2dbb 100644 +index 92ada107..c0f6472a 100644 --- a/visidata/help.py +++ b/visidata/help.py @@ -63,7 +63,7 @@ def openManPage(vd): @@ -38,5 +38,5 @@ index fded3ac5..a7cf2dbb 100644 -- -2.26.2 +2.29.2 diff --git a/sources b/sources index 62f3bff..c737e48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.2.tar.gz) = 485c0a029aed6f8bf6e04a0fe77278e054833faa997e5c1bf6652240658667722a77901d2246b4fb6c90cf5648b891c115522ecab7ed8320e441b1fdec4efade +SHA512 (visidata-2.2.1.tar.gz) = d5b75a45ff40845e78e6b5737cb80b62693c7b602917e62a00517d57ad08ca911c81c349e979632a11d770b3eb5a67ba32b76e52cb742a8605c5a24b87354232 diff --git a/visidata.spec b/visidata.spec index de79f42..39a7967 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,7 +1,7 @@ %global srcname visidata Name: %{srcname} -Version: 2.2 +Version: 2.2.1 Release: 1%{?dist} Summary: Terminal interface for exploring and arranging tabular data @@ -84,6 +84,7 @@ rm -rf %{srcname}.egg-info %{_bindir}/visidata %{_bindir}/vd %{_mandir}/man1/vd.1* +%{_mandir}/man1/visidata.1* %files -n python3-%{srcname} %doc README.md @@ -93,6 +94,10 @@ rm -rf %{srcname}.egg-info %changelog +* Mon Feb 08 2021 Elliott Sales de Andrade - 2.2.1-1 +- Update to latest version +- Fixes rhbz#1926052 + * Sat Feb 06 2021 Elliott Sales de Andrade - 2.2-1 - Update to latest version - Fixes rhbz#1922737 From b47ac78f2adc27965d3357aff54735e6f6204cf9 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 5 Apr 2021 01:51:17 -0400 Subject: [PATCH 08/46] Update to latest version. --- .gitignore | 1 + 0001-Remove-extra-copy-of-man-page.patch | 10 +++++----- sources | 2 +- visidata.spec | 5 ++++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 62d1221..4adb4a3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /visidata-2.1.1.tar.gz /visidata-2.2.tar.gz /visidata-2.2.1.tar.gz +/visidata-2.3.tar.gz diff --git a/0001-Remove-extra-copy-of-man-page.patch b/0001-Remove-extra-copy-of-man-page.patch index 3dd82d2..c34e0ae 100644 --- a/0001-Remove-extra-copy-of-man-page.patch +++ b/0001-Remove-extra-copy-of-man-page.patch @@ -1,4 +1,4 @@ -From b05acf9a46b7a4c0c5eabec16f37ffefa0892492 Mon Sep 17 00:00:00 2001 +From 3a2169135343a63bcb4c4b80705613b98328eedb Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Mar 2019 19:13:42 -0400 Subject: [PATCH] Remove extra copy of man page. @@ -12,7 +12,7 @@ Signed-off-by: Elliott Sales de Andrade 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index f5ccbb83..e6d4e389 100755 +index 73e14956..e0755b26 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ setup(name='visidata', @@ -25,11 +25,11 @@ index f5ccbb83..e6d4e389 100755 classifiers=[ 'Development Status :: 5 - Production/Stable', diff --git a/visidata/help.py b/visidata/help.py -index 92ada107..c0f6472a 100644 +index 2ab08610..7a7d163b 100644 --- a/visidata/help.py +++ b/visidata/help.py -@@ -63,7 +63,7 @@ def openManPage(vd): - from pkg_resources import resource_filename +@@ -124,7 +124,7 @@ def getHelpPane(vd, name, module='vdplus'): + def openManPage(vd): import os with SuspendCurses(): - if os.system(' '.join(['man', resource_filename(__name__, 'man/vd.1')])) != 0: diff --git a/sources b/sources index c737e48..05bb110 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.2.1.tar.gz) = d5b75a45ff40845e78e6b5737cb80b62693c7b602917e62a00517d57ad08ca911c81c349e979632a11d770b3eb5a67ba32b76e52cb742a8605c5a24b87354232 +SHA512 (visidata-2.3.tar.gz) = e03b0cef6764cedc534614c0e20d634ede07dad2d810ed19c7d09f98fd0422592774bc5ef81265409e5bd72c058357b25229ee4d1e3d0227ec66f54cdd8f3c5e diff --git a/visidata.spec b/visidata.spec index 39a7967..4121ef4 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,7 +1,7 @@ %global srcname visidata Name: %{srcname} -Version: 2.2.1 +Version: 2.3 Release: 1%{?dist} Summary: Terminal interface for exploring and arranging tabular data @@ -94,6 +94,9 @@ rm -rf %{srcname}.egg-info %changelog +* Mon Apr 05 2021 Elliott Sales de Andrade - 2.3-1 +- Update to latest version (#1946138) + * Mon Feb 08 2021 Elliott Sales de Andrade - 2.2.1-1 - Update to latest version - Fixes rhbz#1926052 From a8d82b843c78219be8640a22e45aaf225b1fd114 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 12 Apr 2021 01:46:04 -0400 Subject: [PATCH 09/46] Update to latest version. --- .gitignore | 1 + sources | 2 +- visidata.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4adb4a3..601d43a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /visidata-2.2.tar.gz /visidata-2.2.1.tar.gz /visidata-2.3.tar.gz +/visidata-2.4.tar.gz diff --git a/sources b/sources index 05bb110..7638361 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.3.tar.gz) = e03b0cef6764cedc534614c0e20d634ede07dad2d810ed19c7d09f98fd0422592774bc5ef81265409e5bd72c058357b25229ee4d1e3d0227ec66f54cdd8f3c5e +SHA512 (visidata-2.4.tar.gz) = d7a712214beb33877804108a0fceb693e0851cc08080cd9d14ea34e175cfc4c3fd11eba7aa69d04a0c66a1e659dbb4d2bbfd25170787569c7658e2d35d76d5b2 diff --git a/visidata.spec b/visidata.spec index 4121ef4..bb88275 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,7 +1,7 @@ %global srcname visidata Name: %{srcname} -Version: 2.3 +Version: 2.4 Release: 1%{?dist} Summary: Terminal interface for exploring and arranging tabular data @@ -94,6 +94,9 @@ rm -rf %{srcname}.egg-info %changelog +* Mon Apr 12 2021 Elliott Sales de Andrade - 2.4-1 +- Update to latest version (#1948367) + * Mon Apr 05 2021 Elliott Sales de Andrade - 2.3-1 - Update to latest version (#1946138) From 0ec79dee3443d84a00ff6ab8124e229203f43bde Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:19:31 +0200 Subject: [PATCH 10/46] Rebuilt for Python 3.10 --- visidata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visidata.spec b/visidata.spec index bb88275..a0f4eab 100644 --- a/visidata.spec +++ b/visidata.spec @@ -2,7 +2,7 @@ Name: %{srcname} Version: 2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal interface for exploring and arranging tabular data License: GPLv3 @@ -94,6 +94,9 @@ rm -rf %{srcname}.egg-info %changelog +* Fri Jun 04 2021 Python Maint - 2.4-2 +- Rebuilt for Python 3.10 + * Mon Apr 12 2021 Elliott Sales de Andrade - 2.4-1 - Update to latest version (#1948367) From d4e03fa6ab45a3eac792a328ac9abd21bff724ad Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 11 Jul 2021 04:07:52 -0400 Subject: [PATCH 11/46] Update to latest version. --- .gitignore | 1 + sources | 2 +- visidata.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 601d43a..8dd4811 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /visidata-2.2.1.tar.gz /visidata-2.3.tar.gz /visidata-2.4.tar.gz +/visidata-2.5.tar.gz diff --git a/sources b/sources index 7638361..784c825 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.4.tar.gz) = d7a712214beb33877804108a0fceb693e0851cc08080cd9d14ea34e175cfc4c3fd11eba7aa69d04a0c66a1e659dbb4d2bbfd25170787569c7658e2d35d76d5b2 +SHA512 (visidata-2.5.tar.gz) = 3245fcdea79c59f18b72c28e34d46acda9956292628eab0751291335690ea8673fa0e4a143e1fcac89043c4c448c4355efd5a026d032728a94a1ea5aba01ff11 diff --git a/visidata.spec b/visidata.spec index a0f4eab..77e0384 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,8 +1,8 @@ %global srcname visidata Name: %{srcname} -Version: 2.4 -Release: 2%{?dist} +Version: 2.5 +Release: 1%{?dist} Summary: Terminal interface for exploring and arranging tabular data License: GPLv3 @@ -94,6 +94,9 @@ rm -rf %{srcname}.egg-info %changelog +* Sun Jul 11 2021 Elliott Sales de Andrade - 2.5-1 +- Update to latest version (#1980629) + * Fri Jun 04 2021 Python Maint - 2.4-2 - Rebuilt for Python 3.10 From feaf3b5eeb501f3cc0d3d18e57d38df208e1356f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:34:54 +0000 Subject: [PATCH 12/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- visidata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visidata.spec b/visidata.spec index 77e0384..5f4e89c 100644 --- a/visidata.spec +++ b/visidata.spec @@ -2,7 +2,7 @@ Name: %{srcname} Version: 2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal interface for exploring and arranging tabular data License: GPLv3 @@ -94,6 +94,9 @@ rm -rf %{srcname}.egg-info %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun Jul 11 2021 Elliott Sales de Andrade - 2.5-1 - Update to latest version (#1980629) From d9738585805c78c9655afb64a2d9868e6630941d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 22 Sep 2021 02:38:10 -0400 Subject: [PATCH 13/46] Convert to rpmautospec --- changelog | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ visidata.spec | 61 ++------------------------------------------------- 2 files changed, 60 insertions(+), 59 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..53663ec --- /dev/null +++ b/changelog @@ -0,0 +1,58 @@ +* Fri Jul 23 2021 Fedora Release Engineering - 2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun Jul 11 2021 Elliott Sales de Andrade - 2.5-1 +- Update to latest version (#1980629) + +* Fri Jun 04 2021 Python Maint - 2.4-2 +- Rebuilt for Python 3.10 + +* Mon Apr 12 2021 Elliott Sales de Andrade - 2.4-1 +- Update to latest version (#1948367) + +* Mon Apr 05 2021 Elliott Sales de Andrade - 2.3-1 +- Update to latest version (#1946138) + +* Mon Feb 08 2021 Elliott Sales de Andrade - 2.2.1-1 +- Update to latest version +- Fixes rhbz#1926052 + +* Sat Feb 06 2021 Elliott Sales de Andrade - 2.2-1 +- Update to latest version +- Fixes rhbz#1922737 + +* Wed Jan 27 2021 Fedora Release Engineering - 2.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jan 11 2021 Elliott Sales de Andrade - 2.1.1-1 +- Update to latest version (#1912222) + +* Sat Dec 12 2020 Elliott Sales de Andrade - 2.1-1 +- Update to latest version (#1904920) + +* Mon Oct 12 2020 Elliott Sales de Andrade - 2.0.1-1 +- Update to latest version (#1887632) + +* Wed Jul 29 2020 Fedora Release Engineering - 1.5.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 1.5.2-7 +- Rebuilt for Python 3.9 + +* Fri Jan 31 2020 Fedora Release Engineering - 1.5.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 1.5.2-5 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 1.5.2-4 +- Rebuilt for Python 3.8 + +* Sat Jul 27 2019 Fedora Release Engineering - 1.5.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Mar 27 2019 Elliott Sales de Andrade - 1.5.2-2 +- Fix issues from review + +* Tue Mar 26 2019 Elliott Sales de Andrade - 1.5.2-1 +- Initial package. diff --git a/visidata.spec b/visidata.spec index 5f4e89c..8a84d28 100644 --- a/visidata.spec +++ b/visidata.spec @@ -2,7 +2,7 @@ Name: %{srcname} Version: 2.5 -Release: 2%{?dist} +Release: %autorelease Summary: Terminal interface for exploring and arranging tabular data License: GPLv3 @@ -94,61 +94,4 @@ rm -rf %{srcname}.egg-info %changelog -* Fri Jul 23 2021 Fedora Release Engineering - 2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun Jul 11 2021 Elliott Sales de Andrade - 2.5-1 -- Update to latest version (#1980629) - -* Fri Jun 04 2021 Python Maint - 2.4-2 -- Rebuilt for Python 3.10 - -* Mon Apr 12 2021 Elliott Sales de Andrade - 2.4-1 -- Update to latest version (#1948367) - -* Mon Apr 05 2021 Elliott Sales de Andrade - 2.3-1 -- Update to latest version (#1946138) - -* Mon Feb 08 2021 Elliott Sales de Andrade - 2.2.1-1 -- Update to latest version -- Fixes rhbz#1926052 - -* Sat Feb 06 2021 Elliott Sales de Andrade - 2.2-1 -- Update to latest version -- Fixes rhbz#1922737 - -* Wed Jan 27 2021 Fedora Release Engineering - 2.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jan 11 2021 Elliott Sales de Andrade - 2.1.1-1 -- Update to latest version (#1912222) - -* Sat Dec 12 2020 Elliott Sales de Andrade - 2.1-1 -- Update to latest version (#1904920) - -* Mon Oct 12 2020 Elliott Sales de Andrade - 2.0.1-1 -- Update to latest version (#1887632) - -* Wed Jul 29 2020 Fedora Release Engineering - 1.5.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 1.5.2-7 -- Rebuilt for Python 3.9 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.5.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 1.5.2-5 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 1.5.2-4 -- Rebuilt for Python 3.8 - -* Sat Jul 27 2019 Fedora Release Engineering - 1.5.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Mar 27 2019 Elliott Sales de Andrade - 1.5.2-2 -- Fix issues from review - -* Tue Mar 26 2019 Elliott Sales de Andrade - 1.5.2-1 -- Initial package. +%autochangelog From b23f475a039d2c609a9f6db7934d500dd11a19fb Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 22 Sep 2021 02:40:46 -0400 Subject: [PATCH 14/46] Update to latest Python macros --- visidata.spec | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/visidata.spec b/visidata.spec index 8a84d28..f269229 100644 --- a/visidata.spec +++ b/visidata.spec @@ -27,7 +27,6 @@ a lightweight utility which can handle millions of rows with ease. %package -n python3-%{srcname} Summary: %{summary} -%{?python_provide:%python_provide python3-%{srcname}} # Optional dependencies Recommends: python3dist(PyYAML) @@ -64,34 +63,28 @@ a lightweight utility which can handle millions of rows with ease. %prep %autosetup -n %{srcname}-%{version} -p1 -# Remove bundled egg-info -rm -rf %{srcname}.egg-info - +%generate_buildrequires +%pyproject_buildrequires %build -%py3_build - +%pyproject_wheel %install -%py3_install - +%pyproject_install +%pyproject_save_files %{srcname} %check %{pytest} - %files %{_bindir}/visidata %{_bindir}/vd %{_mandir}/man1/vd.1* %{_mandir}/man1/visidata.1* -%files -n python3-%{srcname} +%files -n python3-%{srcname} -f %{pyproject_files} %doc README.md %license LICENSE.gpl3 -%{python3_sitelib}/%{srcname}/ -%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/ - %changelog %autochangelog From bbe95a93ba52c87b7d45cf641f0077c67db4dea0 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 22 Sep 2021 02:45:24 -0400 Subject: [PATCH 15/46] Update to latest version (#2005758) --- .gitignore | 1 + sources | 2 +- visidata.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8dd4811..d5ce443 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /visidata-2.3.tar.gz /visidata-2.4.tar.gz /visidata-2.5.tar.gz +/visidata-2.6.tar.gz diff --git a/sources b/sources index 784c825..39ac2ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.5.tar.gz) = 3245fcdea79c59f18b72c28e34d46acda9956292628eab0751291335690ea8673fa0e4a143e1fcac89043c4c448c4355efd5a026d032728a94a1ea5aba01ff11 +SHA512 (visidata-2.6.tar.gz) = f419c467d3a68b9ee27787b9cceaa3a668e84671f1a828078c78c968d8ae721bbead043adbe5d5cebd813168550de82d0b594016cc481712c6ab4f62ba166f78 diff --git a/visidata.spec b/visidata.spec index f269229..4495dcb 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,7 +1,7 @@ %global srcname visidata Name: %{srcname} -Version: 2.5 +Version: 2.6 Release: %autorelease Summary: Terminal interface for exploring and arranging tabular data From 88418999190f8ec2dd5e2eb1067138023e43263b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 9 Oct 2021 02:54:25 -0400 Subject: [PATCH 16/46] Update to latest version (#2008763) --- .gitignore | 1 + sources | 2 +- visidata.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d5ce443..a03c935 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /visidata-2.4.tar.gz /visidata-2.5.tar.gz /visidata-2.6.tar.gz +/visidata-2.6.1.tar.gz diff --git a/sources b/sources index 39ac2ff..7e90a88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.6.tar.gz) = f419c467d3a68b9ee27787b9cceaa3a668e84671f1a828078c78c968d8ae721bbead043adbe5d5cebd813168550de82d0b594016cc481712c6ab4f62ba166f78 +SHA512 (visidata-2.6.1.tar.gz) = 5e94745de407fbe357e1fad333822a191cab5ad7e74e43edbf48dbf48dd77f5a9edc8813e4deb7a6189148583c435fd7e6cf83991210d44a70d3510a798bcfdb diff --git a/visidata.spec b/visidata.spec index 4495dcb..dc0bd5f 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,7 +1,7 @@ %global srcname visidata Name: %{srcname} -Version: 2.6 +Version: 2.6.1 Release: %autorelease Summary: Terminal interface for exploring and arranging tabular data From d62fc632b4d28ba3a40fe6b974df54c1eeb71c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 20 Dec 2021 19:46:33 +0100 Subject: [PATCH 17/46] Use PEP 503 names for Recommends Since Fedora 33, we generate both python3dist(foo.bar) and python3dist(foo-bar) provides, but we'd like to follow PEP 503 and use only the names with dash. By using the dashes, this is not compatible with the provides generated in EPEL 8, compatibility can be achieved with the %py3_dist macro. --- visidata.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/visidata.spec b/visidata.spec index dc0bd5f..d6a6f5d 100644 --- a/visidata.spec +++ b/visidata.spec @@ -41,7 +41,7 @@ Recommends: python3dist(namestand) Recommends: python3dist(numpy) Recommends: python3dist(openpyxl) Recommends: python3dist(pandas) >= 0.19.2 -Recommends: python3dist(pdfminer.six) +Recommends: python3dist(pdfminer-six) Recommends: python3dist(psycopg2) Recommends: python3dist(pypng) Recommends: python3dist(pyshp) From 3b488aa76db2f9147877fb03402fdafb4717330a Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 20 Dec 2021 18:53:06 -0500 Subject: [PATCH 18/46] Update to latest version (#2023168) --- .gitignore | 1 + 0001-Remove-extra-copy-of-man-page.patch | 14 +++++++------- sources | 2 +- visidata.spec | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index a03c935..8312f6f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /visidata-2.5.tar.gz /visidata-2.6.tar.gz /visidata-2.6.1.tar.gz +/visidata-2.8.tar.gz diff --git a/0001-Remove-extra-copy-of-man-page.patch b/0001-Remove-extra-copy-of-man-page.patch index c34e0ae..5c9e637 100644 --- a/0001-Remove-extra-copy-of-man-page.patch +++ b/0001-Remove-extra-copy-of-man-page.patch @@ -1,4 +1,4 @@ -From 3a2169135343a63bcb4c4b80705613b98328eedb Mon Sep 17 00:00:00 2001 +From ac383c305e2b993d49abcec2fc5a90ec19ea5341 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Mar 2019 19:13:42 -0400 Subject: [PATCH] Remove extra copy of man page. @@ -12,23 +12,23 @@ Signed-off-by: Elliott Sales de Andrade 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index 73e14956..e0755b26 100755 +index f4d8b817..3822f4fd 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ setup(name='visidata', packages=['visidata', 'visidata.loaders', 'visidata.tests'], include_package_data=True, data_files = [('share/man/man1', ['visidata/man/vd.1', 'visidata/man/visidata.1'])], -- package_data={'visidata': ['man/vd.1', 'man/vd.txt']}, -+ package_data={'visidata': ['man/vd.txt']}, +- package_data={'visidata': ['man/vd.1', 'man/vd.txt', 'ddw/input.ddw']}, ++ package_data={'visidata': ['man/vd.txt', 'ddw/input.ddw']}, license='GPLv3', classifiers=[ 'Development Status :: 5 - Production/Stable', diff --git a/visidata/help.py b/visidata/help.py -index 2ab08610..7a7d163b 100644 +index a9ffc88a..a0d450cb 100644 --- a/visidata/help.py +++ b/visidata/help.py -@@ -124,7 +124,7 @@ def getHelpPane(vd, name, module='vdplus'): +@@ -133,7 +133,7 @@ def getHelpPane(vd, name, module='vdplus'): def openManPage(vd): import os with SuspendCurses(): @@ -38,5 +38,5 @@ index 2ab08610..7a7d163b 100644 -- -2.29.2 +2.31.1 diff --git a/sources b/sources index 7e90a88..759309f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.6.1.tar.gz) = 5e94745de407fbe357e1fad333822a191cab5ad7e74e43edbf48dbf48dd77f5a9edc8813e4deb7a6189148583c435fd7e6cf83991210d44a70d3510a798bcfdb +SHA512 (visidata-2.8.tar.gz) = f4ae7b96823f5c94f4869f04bbb793ed3eda13fd23a4ef01a588ba7ae67695298fbbdda161a1c7a34e39da4845d860fda1835a310b2dc90b927800f5c4422ae0 diff --git a/visidata.spec b/visidata.spec index d6a6f5d..cbed352 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,7 +1,7 @@ %global srcname visidata Name: %{srcname} -Version: 2.6.1 +Version: 2.8 Release: %autorelease Summary: Terminal interface for exploring and arranging tabular data From f3cdfa3daf2130efb1e10fda0bcd8fbd5cb2e897 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:05:41 +0000 Subject: [PATCH 19/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 52551f63d6c9c7a7e17961001e39bc698eac2a5e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 18:41:42 +0200 Subject: [PATCH 20/46] Rebuilt for Python 3.11 From ef8eb9ccb873f8ff6b2890bcd73a659c6430f3f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:01:14 +0000 Subject: [PATCH 21/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 1bad33a4ee7842c5415eeadf8dd2bac2c7da57a3 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 26 Nov 2022 19:28:14 -0500 Subject: [PATCH 22/46] Update to latest version (#2109366) --- .gitignore | 1 + 0001-Remove-extra-copy-of-man-page.patch | 14 +++++++------- sources | 2 +- visidata.spec | 5 ++++- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8312f6f..cb4f1b9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /visidata-2.6.tar.gz /visidata-2.6.1.tar.gz /visidata-2.8.tar.gz +/visidata-2.10.2.tar.gz diff --git a/0001-Remove-extra-copy-of-man-page.patch b/0001-Remove-extra-copy-of-man-page.patch index 5c9e637..c4fa677 100644 --- a/0001-Remove-extra-copy-of-man-page.patch +++ b/0001-Remove-extra-copy-of-man-page.patch @@ -1,4 +1,4 @@ -From ac383c305e2b993d49abcec2fc5a90ec19ea5341 Mon Sep 17 00:00:00 2001 +From 275755604f80d7aae9c23016ca9051fc75f39d3a Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Mar 2019 19:13:42 -0400 Subject: [PATCH] Remove extra copy of man page. @@ -12,15 +12,15 @@ Signed-off-by: Elliott Sales de Andrade 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index f4d8b817..3822f4fd 100755 +index ee73dfa8..bb553945 100755 --- a/setup.py +++ b/setup.py -@@ -25,7 +25,7 @@ setup(name='visidata', - packages=['visidata', 'visidata.loaders', 'visidata.tests'], +@@ -29,7 +29,7 @@ setup(name='visidata', + packages=['visidata', 'visidata.loaders', 'visidata.vendor', 'visidata.tests'], include_package_data=True, data_files = [('share/man/man1', ['visidata/man/vd.1', 'visidata/man/visidata.1'])], -- package_data={'visidata': ['man/vd.1', 'man/vd.txt', 'ddw/input.ddw']}, -+ package_data={'visidata': ['man/vd.txt', 'ddw/input.ddw']}, +- package_data={'visidata': ['man/vd.1', 'man/vd.txt', 'ddw/input.ddw', 'tests/sample.tsv']}, ++ package_data={'visidata': ['man/vd.txt', 'ddw/input.ddw', 'tests/sample.tsv']}, license='GPLv3', classifiers=[ 'Development Status :: 5 - Production/Stable', @@ -38,5 +38,5 @@ index a9ffc88a..a0d450cb 100644 -- -2.31.1 +2.36.1 diff --git a/sources b/sources index 759309f..752aa13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.8.tar.gz) = f4ae7b96823f5c94f4869f04bbb793ed3eda13fd23a4ef01a588ba7ae67695298fbbdda161a1c7a34e39da4845d860fda1835a310b2dc90b927800f5c4422ae0 +SHA512 (visidata-2.10.2.tar.gz) = 5810c97cbdbda51045213196e694898a68916be3d12a79b9461649b7f226477eacd59fc026988d774a930bf255818ffecb50925a2073be1d06356381902f12f3 diff --git a/visidata.spec b/visidata.spec index cbed352..13bf9d4 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,7 +1,7 @@ %global srcname visidata Name: %{srcname} -Version: 2.8 +Version: 2.10.2 Release: %autorelease Summary: Terminal interface for exploring and arranging tabular data @@ -74,6 +74,9 @@ a lightweight utility which can handle millions of rows with ease. %pyproject_save_files %{srcname} %check +mkdir HOME +touch HOME/.visidatarc # Needed for TestCommands.test_baseCommands +export HOME=$PWD/HOME %{pytest} %files From 12f65f0c7a93c73de1e3adb4df0fbcba12c858ba Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 19 Dec 2022 01:25:12 -0500 Subject: [PATCH 23/46] Drop support for i686 --- visidata.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/visidata.spec b/visidata.spec index 13bf9d4..f5cdd7f 100644 --- a/visidata.spec +++ b/visidata.spec @@ -13,6 +13,9 @@ Patch0001: 0001-Remove-extra-copy-of-man-page.patch BuildArch: noarch +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: python3-devel BuildRequires: python3dist(setuptools) BuildRequires: python3dist(pytest) From 2998a168a6a7e234b7feab04b80ed2881a3e159b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:25:02 +0000 Subject: [PATCH 24/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 98a21c8103695d0d3068bd1a50be5c8f7b96926c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 19 Feb 2023 19:26:02 -0500 Subject: [PATCH 25/46] Update to latest version (#2161159) --- .gitignore | 1 + 0001-Remove-extra-copy-of-man-page.patch | 22 +++++++++++----------- sources | 2 +- visidata.spec | 6 +++--- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index cb4f1b9..db18746 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /visidata-2.6.1.tar.gz /visidata-2.8.tar.gz /visidata-2.10.2.tar.gz +/visidata-2.11.tar.gz diff --git a/0001-Remove-extra-copy-of-man-page.patch b/0001-Remove-extra-copy-of-man-page.patch index c4fa677..8892b79 100644 --- a/0001-Remove-extra-copy-of-man-page.patch +++ b/0001-Remove-extra-copy-of-man-page.patch @@ -1,4 +1,4 @@ -From 275755604f80d7aae9c23016ca9051fc75f39d3a Mon Sep 17 00:00:00 2001 +From 9eb4bfeb9c6fd908f6ed8af519cd43bb3037d507 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Mar 2019 19:13:42 -0400 Subject: [PATCH] Remove extra copy of man page. @@ -12,23 +12,23 @@ Signed-off-by: Elliott Sales de Andrade 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index ee73dfa8..bb553945 100755 +index 68a71014..374da9c2 100755 --- a/setup.py +++ b/setup.py -@@ -29,7 +29,7 @@ setup(name='visidata', - packages=['visidata', 'visidata.loaders', 'visidata.vendor', 'visidata.tests'], - include_package_data=True, - data_files = [('share/man/man1', ['visidata/man/vd.1', 'visidata/man/visidata.1'])], -- package_data={'visidata': ['man/vd.1', 'man/vd.txt', 'ddw/input.ddw', 'tests/sample.tsv']}, -+ package_data={'visidata': ['man/vd.txt', 'ddw/input.ddw', 'tests/sample.tsv']}, +@@ -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 a9ffc88a..a0d450cb 100644 +index e43437ff..67dba043 100644 --- a/visidata/help.py +++ b/visidata/help.py -@@ -133,7 +133,7 @@ def getHelpPane(vd, name, module='vdplus'): +@@ -135,7 +135,7 @@ def getHelpPane(vd, name, module='vdplus'): def openManPage(vd): import os with SuspendCurses(): @@ -38,5 +38,5 @@ index a9ffc88a..a0d450cb 100644 -- -2.36.1 +2.39.2 diff --git a/sources b/sources index 752aa13..86b6d5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.10.2.tar.gz) = 5810c97cbdbda51045213196e694898a68916be3d12a79b9461649b7f226477eacd59fc026988d774a930bf255818ffecb50925a2073be1d06356381902f12f3 +SHA512 (visidata-2.11.tar.gz) = f42fb38b7776215492174be9a79dd0c40d524fcf9095ca5f32a4a31e54abedb798e9d597c1ad8f2cab5c504a0c6e24969d029966b5770b6001ce07dc46ae40de diff --git a/visidata.spec b/visidata.spec index f5cdd7f..dc1a7e9 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,13 +1,13 @@ %global srcname visidata Name: %{srcname} -Version: 2.10.2 +Version: 2.11 Release: %autorelease Summary: Terminal interface for exploring and arranging tabular data -License: GPLv3 +License: GPL-3.0-only URL: https://visidata.org -Source0: %pypi_source +Source0: %pypi_source %{srcname} # https://github.com/saulpw/visidata/pull/269 Patch0001: 0001-Remove-extra-copy-of-man-page.patch From 42a7bd34bea8f6d5c44afedbfd3c589cf0fac4a7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 08:44:58 +0200 Subject: [PATCH 26/46] Rebuilt for Python 3.12 From 8f0eaaf4ae1c4fa00ab139e28d40bbc9d7158d08 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 27 Jun 2023 01:20:04 -0400 Subject: [PATCH 27/46] Backport test fix for Python 3.12 --- ...569772d734278ba1fbecc9da2db6f88abf24.patch | 32 +++++++++++++++++++ visidata.spec | 1 + 2 files changed, 33 insertions(+) create mode 100644 2b3a569772d734278ba1fbecc9da2db6f88abf24.patch diff --git a/2b3a569772d734278ba1fbecc9da2db6f88abf24.patch b/2b3a569772d734278ba1fbecc9da2db6f88abf24.patch new file mode 100644 index 0000000..139ea10 --- /dev/null +++ b/2b3a569772d734278ba1fbecc9da2db6f88abf24.patch @@ -0,0 +1,32 @@ +From 2b3a569772d734278ba1fbecc9da2db6f88abf24 Mon Sep 17 00:00:00 2001 +From: anjakefala +Date: Mon, 26 Jun 2023 20:54:48 -0700 +Subject: [PATCH] [path] update Path for Python 3.12 + +`pathlib.Path._parts` has been removed in Python 3.12: +https://github.com/python/cpython/pull/102476 + +Switch to pathlib.Path.parts which is a tuple. + +Closes #1934 +--- + visidata/path.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/visidata/path.py b/visidata/path.py +index 2428a60ac..8aae988b0 100644 +--- a/visidata/path.py ++++ b/visidata/path.py +@@ -324,10 +324,10 @@ def with_name(self, name): + 'Return a sibling Path with *name* as a filename in the same directory.' + if self.is_url(): + urlparts = list(urlparse(self.given)) +- urlparts[2] = '/'.join(Path(urlparts[2])._parts[1:-1] + [name]) ++ urlparts[2] = '/'.join(list(Path(urlparts[2]).parts[1:-1]) + [name]) + return Path(urlunparse(urlparts)) + else: +- return Path(self._from_parsed_parts(self._drv, self._root, self._parts[:-1] + [name])) ++ return Path(self._from_parsed_parts(self._drv, self._root, list(self.parts[:-1]) + [name])) + + + class RepeatFile: diff --git a/visidata.spec b/visidata.spec index dc1a7e9..10c69c8 100644 --- a/visidata.spec +++ b/visidata.spec @@ -10,6 +10,7 @@ URL: https://visidata.org Source0: %pypi_source %{srcname} # https://github.com/saulpw/visidata/pull/269 Patch0001: 0001-Remove-extra-copy-of-man-page.patch +Patch0002: https://github.com/saulpw/visidata/commit/2b3a569772d734278ba1fbecc9da2db6f88abf24.patch BuildArch: noarch From b87e6236210f5e7654e41532b8fabca1fd5e3e6b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 18 Jul 2023 03:55:18 -0400 Subject: [PATCH 28/46] Update to latest version (#2223256) --- .gitignore | 1 + ...569772d734278ba1fbecc9da2db6f88abf24.patch | 32 ------------------- sources | 2 +- visidata.spec | 3 +- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 2b3a569772d734278ba1fbecc9da2db6f88abf24.patch diff --git a/.gitignore b/.gitignore index db18746..07bcaf4 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /visidata-2.8.tar.gz /visidata-2.10.2.tar.gz /visidata-2.11.tar.gz +/visidata-2.11.1.tar.gz diff --git a/2b3a569772d734278ba1fbecc9da2db6f88abf24.patch b/2b3a569772d734278ba1fbecc9da2db6f88abf24.patch deleted file mode 100644 index 139ea10..0000000 --- a/2b3a569772d734278ba1fbecc9da2db6f88abf24.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2b3a569772d734278ba1fbecc9da2db6f88abf24 Mon Sep 17 00:00:00 2001 -From: anjakefala -Date: Mon, 26 Jun 2023 20:54:48 -0700 -Subject: [PATCH] [path] update Path for Python 3.12 - -`pathlib.Path._parts` has been removed in Python 3.12: -https://github.com/python/cpython/pull/102476 - -Switch to pathlib.Path.parts which is a tuple. - -Closes #1934 ---- - visidata/path.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/visidata/path.py b/visidata/path.py -index 2428a60ac..8aae988b0 100644 ---- a/visidata/path.py -+++ b/visidata/path.py -@@ -324,10 +324,10 @@ def with_name(self, name): - 'Return a sibling Path with *name* as a filename in the same directory.' - if self.is_url(): - urlparts = list(urlparse(self.given)) -- urlparts[2] = '/'.join(Path(urlparts[2])._parts[1:-1] + [name]) -+ urlparts[2] = '/'.join(list(Path(urlparts[2]).parts[1:-1]) + [name]) - return Path(urlunparse(urlparts)) - else: -- return Path(self._from_parsed_parts(self._drv, self._root, self._parts[:-1] + [name])) -+ return Path(self._from_parsed_parts(self._drv, self._root, list(self.parts[:-1]) + [name])) - - - class RepeatFile: diff --git a/sources b/sources index 86b6d5e..8e14a12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.11.tar.gz) = f42fb38b7776215492174be9a79dd0c40d524fcf9095ca5f32a4a31e54abedb798e9d597c1ad8f2cab5c504a0c6e24969d029966b5770b6001ce07dc46ae40de +SHA512 (visidata-2.11.1.tar.gz) = 366b2f90674f6fe503c51f76bc305c82850af4d4f4ac30332a4b4fa4b88d5d554ec6169152db074e2c5af04ad467528ed1621daca4a4d187ab89da00229d8812 diff --git a/visidata.spec b/visidata.spec index 10c69c8..c979cd6 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,7 +1,7 @@ %global srcname visidata Name: %{srcname} -Version: 2.11 +Version: 2.11.1 Release: %autorelease Summary: Terminal interface for exploring and arranging tabular data @@ -10,7 +10,6 @@ URL: https://visidata.org Source0: %pypi_source %{srcname} # https://github.com/saulpw/visidata/pull/269 Patch0001: 0001-Remove-extra-copy-of-man-page.patch -Patch0002: https://github.com/saulpw/visidata/commit/2b3a569772d734278ba1fbecc9da2db6f88abf24.patch BuildArch: noarch From af431eb5ba2740b88a18d6dc57e303a124c84c33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:46:31 +0000 Subject: [PATCH 29/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 478b771b24c6efc6f211a7f5696592b64a256811 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:00:33 +0000 Subject: [PATCH 30/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 020a88f2f246b8e1d6eeee1b0090ce0fe81db767 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 18 Feb 2024 03:31:00 -0500 Subject: [PATCH 31/46] Update to latest version (#2256319) --- .gitignore | 1 + 0001-Remove-extra-copy-of-man-page.patch | 36 +++++++++---------- ...032b72fb32c8e671b9d66f1e1edaa7181c4b.patch | 21 +++++++++++ sources | 2 +- visidata.spec | 13 +++++-- 5 files changed, 51 insertions(+), 22 deletions(-) create mode 100644 3c4f032b72fb32c8e671b9d66f1e1edaa7181c4b.patch diff --git a/.gitignore b/.gitignore index 07bcaf4..32a3db9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /visidata-2.10.2.tar.gz /visidata-2.11.tar.gz /visidata-2.11.1.tar.gz +/visidata-3.0.2.tar.gz diff --git a/0001-Remove-extra-copy-of-man-page.patch b/0001-Remove-extra-copy-of-man-page.patch index 8892b79..2a4c8d4 100644 --- a/0001-Remove-extra-copy-of-man-page.patch +++ b/0001-Remove-extra-copy-of-man-page.patch @@ -1,7 +1,7 @@ -From 9eb4bfeb9c6fd908f6ed8af519cd43bb3037d507 Mon Sep 17 00:00:00 2001 +From 300d8ade93ae3be332927547e17a85fb3aa8ad3f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Mar 2019 19:13:42 -0400 -Subject: [PATCH] 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 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index 68a71014..374da9c2 100755 +index 8851fdb8..6d903a39 100755 --- a/setup.py +++ b/setup.py -@@ -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', +@@ -62,7 +62,7 @@ setup( + ] + }, + package_data={ +- "visidata.man": ["vd.1", "vd.txt"], ++ "visidata.man": ["vd.txt"], + "visidata.ddw": ["input.ddw", "regex.ddw"], + "visidata.tests": ["sample.tsv", "benchmark.csv"], + "visidata.desktop": ["visidata.desktop"], diff --git a/visidata/help.py b/visidata/help.py -index e43437ff..67dba043 100644 +index ca6e1ab9..34acc76f 100644 --- a/visidata/help.py +++ b/visidata/help.py -@@ -135,7 +135,7 @@ def getHelpPane(vd, name, module='vdplus'): - def openManPage(vd): +@@ -159,7 +159,7 @@ def openManPage(vd): import os with SuspendCurses(): -- if os.system(' '.join(['man', resource_filename(__name__, 'man/vd.1')])) != 0: + 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', 'vd.1'])) != 0: - vd.push(TextSheet('man_vd', source=Path(resource_filename(__name__, 'man/vd.txt')))) + vd.push(TextSheet('man_vd', source=module_path/'man/vd.txt')) -- -2.39.2 +2.43.0 diff --git a/3c4f032b72fb32c8e671b9d66f1e1edaa7181c4b.patch b/3c4f032b72fb32c8e671b9d66f1e1edaa7181c4b.patch new file mode 100644 index 0000000..9095de4 --- /dev/null +++ b/3c4f032b72fb32c8e671b9d66f1e1edaa7181c4b.patch @@ -0,0 +1,21 @@ +From 3c4f032b72fb32c8e671b9d66f1e1edaa7181c4b Mon Sep 17 00:00:00 2001 +From: anjakefala +Date: Thu, 1 Feb 2024 23:37:35 -0800 +Subject: [PATCH] [desktop] validate desktop file #2276 + +--- + visidata/desktop/visidata.desktop | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/visidata/desktop/visidata.desktop b/visidata/desktop/visidata.desktop +index 502a616c2..45e2c01cd 100644 +--- a/visidata/desktop/visidata.desktop ++++ b/visidata/desktop/visidata.desktop +@@ -3,5 +3,5 @@ Type=Application + Terminal=true + Name=VisiData + Icon=utilities-terminal +-Exec=bash -i -c 'vd %f' +-Categories=Application; ++Exec="bash -i -c 'vd %f'" ++Categories=Utility;TextTools diff --git a/sources b/sources index 8e14a12..934a719 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-2.11.1.tar.gz) = 366b2f90674f6fe503c51f76bc305c82850af4d4f4ac30332a4b4fa4b88d5d554ec6169152db074e2c5af04ad467528ed1621daca4a4d187ab89da00229d8812 +SHA512 (visidata-3.0.2.tar.gz) = 299d5ac7ca229740e3a45ba8ce22187492a91720690b1313bc22888b758750bbe7790bef226d102f174c4148810b38c168b7a749de30c5c5ed0dfb67fa590379 diff --git a/visidata.spec b/visidata.spec index c979cd6..73eb145 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,21 +1,24 @@ %global srcname visidata Name: %{srcname} -Version: 2.11.1 +Version: 3.0.2 Release: %autorelease Summary: Terminal interface for exploring and arranging tabular data License: GPL-3.0-only URL: https://visidata.org Source0: %pypi_source %{srcname} -# https://github.com/saulpw/visidata/pull/269 -Patch0001: 0001-Remove-extra-copy-of-man-page.patch +# Fedora specific: +Patch: 0001-Remove-extra-copy-of-man-page.patch +# Fix Desktop file validation +Patch: https://github.com/saulpw/visidata/commit/3c4f032b72fb32c8e671b9d66f1e1edaa7181c4b.patch BuildArch: noarch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} +BuildRequires: desktop-file-utils BuildRequires: python3-devel BuildRequires: python3dist(setuptools) BuildRequires: python3dist(pytest) @@ -76,6 +79,8 @@ 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 @@ -84,9 +89,11 @@ 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 From 5fe5b0b54a95c61e27dd47995c214afad26f34cc Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 21 Feb 2024 07:11:17 -0500 Subject: [PATCH 32/46] Rebuild to fix shebangs From 9b221efca89f2a5a2708a80713cb400dd1869a69 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 14:01:59 +0200 Subject: [PATCH 33/46] Rebuilt for Python 3.13 From 4f01f0db9637406289115360fd50c45494480420 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:54:27 +0000 Subject: [PATCH 34/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5887eca36a4872d942b4a5b34779a9f27a53bb8d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 10 Nov 2024 16:32:55 -0500 Subject: [PATCH 35/46] Update to latest version (#2318608) --- .gitignore | 1 + 0001-Remove-extra-copy-of-man-page.patch | 12 +++++------ ...032b72fb32c8e671b9d66f1e1edaa7181c4b.patch | 21 ------------------- sources | 2 +- visidata.spec | 6 ++---- 5 files changed, 10 insertions(+), 32 deletions(-) delete mode 100644 3c4f032b72fb32c8e671b9d66f1e1edaa7181c4b.patch diff --git a/.gitignore b/.gitignore index 32a3db9..11d99aa 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /visidata-2.11.tar.gz /visidata-2.11.1.tar.gz /visidata-3.0.2.tar.gz +/visidata-3.1.1.tar.gz diff --git a/0001-Remove-extra-copy-of-man-page.patch b/0001-Remove-extra-copy-of-man-page.patch index 2a4c8d4..55ecff0 100644 --- a/0001-Remove-extra-copy-of-man-page.patch +++ b/0001-Remove-extra-copy-of-man-page.patch @@ -1,4 +1,4 @@ -From 300d8ade93ae3be332927547e17a85fb3aa8ad3f Mon Sep 17 00:00:00 2001 +From 32bdda64877ba1c29f3be4092ffeace36004ff42 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Mar 2019 19:13:42 -0400 Subject: [PATCH] Remove extra copy of man page @@ -12,20 +12,20 @@ Signed-off-by: Elliott Sales de Andrade 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index 8851fdb8..6d903a39 100755 +index c8e7e169..b4ad0fba 100755 --- a/setup.py +++ b/setup.py -@@ -62,7 +62,7 @@ setup( +@@ -74,7 +74,7 @@ setup( ] }, 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"], - "visidata.desktop": ["visidata.desktop"], diff --git a/visidata/help.py b/visidata/help.py -index ca6e1ab9..34acc76f 100644 +index 2c8e1a46..9d20f2c5 100644 --- a/visidata/help.py +++ b/visidata/help.py @@ -159,7 +159,7 @@ def openManPage(vd): @@ -38,5 +38,5 @@ index ca6e1ab9..34acc76f 100644 -- -2.43.0 +2.47.0 diff --git a/3c4f032b72fb32c8e671b9d66f1e1edaa7181c4b.patch b/3c4f032b72fb32c8e671b9d66f1e1edaa7181c4b.patch deleted file mode 100644 index 9095de4..0000000 --- a/3c4f032b72fb32c8e671b9d66f1e1edaa7181c4b.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 3c4f032b72fb32c8e671b9d66f1e1edaa7181c4b Mon Sep 17 00:00:00 2001 -From: anjakefala -Date: Thu, 1 Feb 2024 23:37:35 -0800 -Subject: [PATCH] [desktop] validate desktop file #2276 - ---- - visidata/desktop/visidata.desktop | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/visidata/desktop/visidata.desktop b/visidata/desktop/visidata.desktop -index 502a616c2..45e2c01cd 100644 ---- a/visidata/desktop/visidata.desktop -+++ b/visidata/desktop/visidata.desktop -@@ -3,5 +3,5 @@ Type=Application - Terminal=true - Name=VisiData - Icon=utilities-terminal --Exec=bash -i -c 'vd %f' --Categories=Application; -+Exec="bash -i -c 'vd %f'" -+Categories=Utility;TextTools diff --git a/sources b/sources index 934a719..bb291da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visidata-3.0.2.tar.gz) = 299d5ac7ca229740e3a45ba8ce22187492a91720690b1313bc22888b758750bbe7790bef226d102f174c4148810b38c168b7a749de30c5c5ed0dfb67fa590379 +SHA512 (visidata-3.1.1.tar.gz) = 4568c8f6bf01baac1bf9bd3c090425ff5c4c8bf7cd415e8b0faf7e89494fd00a22a373d59e4832e105dbaabf9148a987eb5c89412416e164caa654bf4dde1e23 diff --git a/visidata.spec b/visidata.spec index 73eb145..184ce60 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,7 +1,7 @@ %global srcname visidata Name: %{srcname} -Version: 3.0.2 +Version: 3.1.1 Release: %autorelease Summary: Terminal interface for exploring and arranging tabular data @@ -10,8 +10,6 @@ URL: https://visidata.org Source0: %pypi_source %{srcname} # Fedora specific: Patch: 0001-Remove-extra-copy-of-man-page.patch -# Fix Desktop file validation -Patch: https://github.com/saulpw/visidata/commit/3c4f032b72fb32c8e671b9d66f1e1edaa7181c4b.patch BuildArch: noarch @@ -46,7 +44,7 @@ Recommends: python3dist(mapbox-vector-tile) Recommends: python3dist(namestand) Recommends: python3dist(numpy) Recommends: python3dist(openpyxl) -Recommends: python3dist(pandas) >= 0.19.2 +Recommends: python3dist(pandas) >= 1.5.3 Recommends: python3dist(pdfminer-six) Recommends: python3dist(psycopg2) Recommends: python3dist(pypng) From a175a69654dc82236ff95ec0e2b03dd0f073b960 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:30:06 +0000 Subject: [PATCH 36/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 1f5a3cdd45e7bbdcab112947fd17ca613c48ebcf Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 16:43:41 +0200 Subject: [PATCH 37/46] Rebuilt for Python 3.14 From 7c0ecbff723351c7028df38df775ae92eae9e357 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:09:58 +0000 Subject: [PATCH 38/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5821398fea7519c131ab59e2d282487aea50c74d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 12 Aug 2025 21:55:34 -0400 Subject: [PATCH 39/46] Update to latest version (#2372932) --- .gitignore | 2 ++ 0001-Remove-extra-copy-of-man-page.patch | 14 ++++----- 0002-Fix-test-on-Python-3.14.patch | 36 ++++++++++++++++++++++++ sources | 3 +- visidata.spec | 7 ++++- 5 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 0002-Fix-test-on-Python-3.14.patch diff --git a/.gitignore b/.gitignore index 11d99aa..c5561df 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /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 diff --git a/0001-Remove-extra-copy-of-man-page.patch b/0001-Remove-extra-copy-of-man-page.patch index 55ecff0..7db4b2d 100644 --- a/0001-Remove-extra-copy-of-man-page.patch +++ b/0001-Remove-extra-copy-of-man-page.patch @@ -1,7 +1,7 @@ -From 32bdda64877ba1c29f3be4092ffeace36004ff42 Mon Sep 17 00:00:00 2001 +From 73ab95f8a4eb40140e1904859b135fb2caf6c751 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Mar 2019 19:13:42 -0400 -Subject: [PATCH] Remove extra copy of man page +Subject: [PATCH 1/2] Remove extra copy of man page It's already installed in /usr/share/man/man1. @@ -12,11 +12,11 @@ Signed-off-by: Elliott Sales de Andrade 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index c8e7e169..b4ad0fba 100755 +index fe07f60a..6e18d0cb 100755 --- a/setup.py +++ b/setup.py -@@ -74,7 +74,7 @@ setup( - ] +@@ -101,7 +101,7 @@ setup( + "all": all_requirements(), }, package_data={ - "visidata.man": ["vd.1", "vd.txt"], @@ -25,7 +25,7 @@ index c8e7e169..b4ad0fba 100755 "visidata": ["guides/*.md"], "visidata.tests": ["sample.tsv", "benchmark.csv"], diff --git a/visidata/help.py b/visidata/help.py -index 2c8e1a46..9d20f2c5 100644 +index b7d315b4..f27cc5fa 100644 --- a/visidata/help.py +++ b/visidata/help.py @@ -159,7 +159,7 @@ def openManPage(vd): @@ -38,5 +38,5 @@ index 2c8e1a46..9d20f2c5 100644 -- -2.47.0 +2.50.0 diff --git a/0002-Fix-test-on-Python-3.14.patch b/0002-Fix-test-on-Python-3.14.patch new file mode 100644 index 0000000..d249484 --- /dev/null +++ b/0002-Fix-test-on-Python-3.14.patch @@ -0,0 +1,36 @@ +From 39d2224d455f0b4639aa4e48db27c122372d8274 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +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 +--- + 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 + diff --git a/sources b/sources index bb291da..2528f60 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (visidata-3.1.1.tar.gz) = 4568c8f6bf01baac1bf9bd3c090425ff5c4c8bf7cd415e8b0faf7e89494fd00a22a373d59e4832e105dbaabf9148a987eb5c89412416e164caa654bf4dde1e23 +SHA512 (visidata-3.2.tar.gz) = 5695d2c82d42bec7fb2cc466739ef72af1cf323cac35e282abc4e149286f71104a6579f77430f53ab906b1f86e0f0bb548ac397886ea40d15530bf0b665c32a8 +SHA512 (requirements.txt) = 078446585390a031e7be161bcda41bfe92b55afd269d6cf2ab7e76d696d31eac57c725b46bdddd71e5d4606c4f0dd9a2f3d6156bb192ce0f2eb747b4e858ad13 diff --git a/visidata.spec b/visidata.spec index 184ce60..81e9e92 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,15 +1,19 @@ %global srcname visidata Name: %{srcname} -Version: 3.1.1 +Version: 3.2 Release: %autorelease Summary: Terminal interface for exploring and arranging tabular data License: GPL-3.0-only URL: https://visidata.org Source0: %pypi_source %{srcname} +# https://github.com/saulpw/visidata/issues/2842 +Source1: https://github.com/saulpw/visidata/raw/refs/tags/v3.2/requirements.txt # 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 BuildArch: noarch @@ -66,6 +70,7 @@ a lightweight utility which can handle millions of rows with ease. %prep %autosetup -n %{srcname}-%{version} -p1 +cp %SOURCE1 . %generate_buildrequires %pyproject_buildrequires From 1b4e1753b3cef611de7acf9b255e293bd9b384da Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:22:22 +0200 Subject: [PATCH 40/46] Rebuilt for Python 3.14.0rc2 bytecode From 1110c8167d12017a5ea287dea7ca780159322b83 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:02:43 +0200 Subject: [PATCH 41/46] Rebuilt for Python 3.14.0rc3 bytecode From 547275e6322f704716a66b1a51f4fbf2209769f3 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 21 Sep 2025 15:43:30 -0400 Subject: [PATCH 42/46] Add Packit configuration --- .packit.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..d11d5ba --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,18 @@ +# 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 From afd624ab660e51b2318889b4401b300c735d8ff9 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 21 Sep 2025 15:49:53 -0400 Subject: [PATCH 43/46] Update to latest version (#2393795) --- .gitignore | 1 + sources | 3 +-- visidata.spec | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c5561df..5f77af8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /visidata-3.1.1.tar.gz /visidata-3.2.tar.gz /requirements.txt +/visidata-3.3.tar.gz diff --git a/sources b/sources index 2528f60..eb0c033 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (visidata-3.2.tar.gz) = 5695d2c82d42bec7fb2cc466739ef72af1cf323cac35e282abc4e149286f71104a6579f77430f53ab906b1f86e0f0bb548ac397886ea40d15530bf0b665c32a8 -SHA512 (requirements.txt) = 078446585390a031e7be161bcda41bfe92b55afd269d6cf2ab7e76d696d31eac57c725b46bdddd71e5d4606c4f0dd9a2f3d6156bb192ce0f2eb747b4e858ad13 +SHA512 (visidata-3.3.tar.gz) = 262f12c17d18f0e58e6617bde37ba660199c7b3a078d70e774b65318b5f3daac9c85b2f6b4eaa9e232df85d37bad700b42fb764f9234d3eef3eab2e4e829d176 diff --git a/visidata.spec b/visidata.spec index 81e9e92..3d23b0c 100644 --- a/visidata.spec +++ b/visidata.spec @@ -1,15 +1,13 @@ %global srcname visidata Name: %{srcname} -Version: 3.2 +Version: 3.3 Release: %autorelease Summary: Terminal interface for exploring and arranging tabular data License: GPL-3.0-only URL: https://visidata.org Source0: %pypi_source %{srcname} -# https://github.com/saulpw/visidata/issues/2842 -Source1: https://github.com/saulpw/visidata/raw/refs/tags/v3.2/requirements.txt # Fedora specific: Patch: 0001-Remove-extra-copy-of-man-page.patch # https://github.com/saulpw/visidata/issues/2773 @@ -70,7 +68,6 @@ a lightweight utility which can handle millions of rows with ease. %prep %autosetup -n %{srcname}-%{version} -p1 -cp %SOURCE1 . %generate_buildrequires %pyproject_buildrequires From 594795e0413c315198ce2cb5f56b8bcd9ea2a3c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:59:33 +0000 Subject: [PATCH 44/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From d33391d3078d023859f301ab295152b20ec4712e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 23:36:56 +0200 Subject: [PATCH 45/46] Rebuilt for Python 3.15 From b11b5c9f140d90de3c138c3095f580a594738419 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:33:45 +0000 Subject: [PATCH 46/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild