Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package git-cola for openSUSE:Factory checked in at 2023-08-23 14:58:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-cola (Old) and /work/SRC/openSUSE:Factory/.git-cola.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-cola" Wed Aug 23 14:58:01 2023 rev:43 rq:1105247 version:4.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/git-cola/git-cola.changes 2023-08-14 22:35:51.060450959 +0200 +++ /work/SRC/openSUSE:Factory/.git-cola.new.1766/git-cola.changes 2023-08-23 14:59:14.218164211 +0200 @@ -1,0 +2,8 @@ +Tue Aug 22 11:43:37 UTC 2023 - Marcin Bajor <[email protected]> + +- Update to 4.3.1 +- Fixes + * The pypi wheel was fixed to include entry_points.txt. + * The "Revert" command was throwing an exception after succesfully completing. + +------------------------------------------------------------------- Old: ---- v4.3.0.tar.gz New: ---- v4.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-cola.spec ++++++ --- /var/tmp/diff_new_pack.3yMgKe/_old 2023-08-23 14:59:14.978165570 +0200 +++ /var/tmp/diff_new_pack.3yMgKe/_new 2023-08-23 14:59:14.982165577 +0200 @@ -18,7 +18,7 @@ Name: git-cola -Version: 4.3.0 +Version: 4.3.1 Release: 0 Summary: A GUI for Git License: GPL-2.0-or-later ++++++ v4.3.0.tar.gz -> v4.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/.flake8 new/git-cola-4.3.1/.flake8 --- old/git-cola-4.3.0/.flake8 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/.flake8 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -[flake8] -doctests = true -max-line-length = 88 -ignore = - # W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513 - W503 - # W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545 - W504 - # Black creates whitespace before colon - E203 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/.github/workflows/main.yml new/git-cola-4.3.1/.github/workflows/main.yml --- old/git-cola-4.3.0/.github/workflows/main.yml 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/.github/workflows/main.yml 2023-08-19 00:18:21.000000000 +0200 @@ -45,7 +45,6 @@ sudo apt-get install \ black \ gettext \ - flake8 \ pylint \ python-is-python3 \ python3-setuptools-scm \ @@ -71,9 +70,6 @@ - name: Run Linter run: make pylint color=0 - - name: Check Code Style - run: make flake8 - - name: Check Code Formatting # For strict adherence to formatting, run 'black' with --check run: make format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/.gitignore new/git-cola-4.3.1/.gitignore --- old/git-cola-4.3.0/.gitignore 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/.gitignore 2023-08-19 00:18:21.000000000 +0200 @@ -4,11 +4,14 @@ /build /config.mak /cola/_build_version.py +/deb /dist /.eggs /env* +/fedora /git-cola.app /local +/pages /patches /pip-wheel-metadata /pynsist_pkgs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/CHANGES.rst new/git-cola-4.3.1/CHANGES.rst --- old/git-cola-4.3.0/CHANGES.rst 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/CHANGES.rst 2023-08-19 00:18:21.000000000 +0200 @@ -1,3 +1,15 @@ +.. _v4.3.1: + +v4.3.1 +====== + +Fixes +----- +* The pypi wheel was fixed to include `entry_points.txt`. + +* The "Revert" command was throwing an exception after succesfully completing. + + .. _v4.3.0: v4.3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/Makefile new/git-cola-4.3.1/Makefile --- old/git-cola-4.3.0/Makefile 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/Makefile 2023-08-19 00:18:21.000000000 +0200 @@ -9,10 +9,9 @@ # make test [flags=...] # run tests; flags=-x fails fast, --ff failed first # make test V=2 # run tests; V=2 increases test verbosity # make doc # build docs -# make flake8 # python style checks # make pylint [color=1] # run pylint; color=1 colorizes output # make format # run the black python formatter -# make check [color=1] # run test, doc, flake8 and pylint +# make check [color=1] # run test, doc and pylint # make check file=<filename> # run checks on <filename> # # Release Prep @@ -30,7 +29,6 @@ BLACK = black CP = cp FIND = find -FLAKE8 = flake8 GREP = grep GIT = git MARKDOWN = markdown @@ -63,8 +61,6 @@ QUIET = --quiet endif -FLAKE8_FLAGS = $(VERBOSE) - PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE) uname_S := $(shell uname -s) ifneq ($(uname_S),Linux) @@ -233,7 +229,7 @@ git-cola.app:: $(MKDIR_P) $(cola_app)/Contents/MacOS $(MKDIR_P) $(cola_app_resources) - $(PYTHON3) -m venv --copies $(cola_app_resources) + $(PYTHON3) -m venv $(cola_app_resources) $(cola_app_resources)/bin/pip install --requirement requirements/requirements.txt $(cola_app_resources)/bin/pip install --requirement requirements/requirements-optional.txt $(cola_app_resources)/bin/pip install --requirement requirements/requirements-dev.txt @@ -258,12 +254,6 @@ %.html: %.md $(MARKDOWN) $< >$@ -.PHONY: flake8 -flake8:: - $(FLAKE8) --version - $(FLAKE8) $(FLAKE8_FLAGS) $(flags) \ - $(ALL_PYTHON_DIRS) contrib - .PHONY: pylint pylint:: $(PYLINT) --version @@ -274,13 +264,11 @@ .PHONY: check ifdef file check:: - $(FLAKE8) $(FLAKE8_FLAGS) $(flags) $(file) $(PYLINT) $(PYLINT_FLAGS) --output-format=colorized $(flags) $(file) else check:: all check:: test check:: doc -check:: flake8 check:: pylint endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/README.md new/git-cola-4.3.1/README.md --- old/git-cola-4.3.0/README.md 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/README.md 2023-08-19 00:18:21.000000000 +0200 @@ -364,7 +364,7 @@ # Run the unit tests $ make test - # Run tests and longer-running pylint and flake8 checks + # Run tests and longer-running pylint checks $ make check # Run tests against multiple python interpreters using tox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/_version.py new/git-cola-4.3.1/cola/_version.py --- old/git-cola-4.3.0/cola/_version.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/_version.py 2023-08-19 00:18:21.000000000 +0200 @@ -1 +1 @@ -VERSION = '4.3.0' +VERSION = '4.3.1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/cmds.py new/git-cola-4.3.1/cola/cmds.py --- old/git-cola-4.3.0/cola/cmds.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/cmds.py 2023-08-19 00:18:21.000000000 +0200 @@ -586,14 +586,14 @@ class Revert(ContextCommand): - """Cherry pick commits into the current branch.""" + """Revert a commit""" def __init__(self, context, oid): super(Revert, self).__init__(context) self.oid = oid def do(self): - status, output, err = self.git.revert(self.oid, no_edit=True) + status, out, err = self.git.revert(self.oid, no_edit=True) self.model.update_file_status() title = N_('Revert failed') out = '# git revert %s\n\n' % self.oid @@ -1767,7 +1767,6 @@ self.old_commitmsg = self.model.commitmsg def get_message(self): - title = N_('Error running prepare-commitmsg hook') hook = gitcmds.prepare_commit_message_hook(self.context) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/compat.py new/git-cola-4.3.1/cola/compat.py --- old/git-cola-4.3.0/cola/compat.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/compat.py 2023-08-19 00:18:21.000000000 +0200 @@ -42,13 +42,13 @@ uchr = chr else: bchr = chr - maxsize = 2 ** 31 + maxsize = 2**31 ustr = unicode # noqa uchr = unichr # noqa int_types = (int, long) # noqa # Qt's max 32-bit signed integer range (-2147483648 to 2147483647) -maxint = (2 ** 31) - 1 +maxint = (2**31) - 1 def setenv(key, value): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/core.py new/git-cola-4.3.1/cola/core.py --- old/git-cola-4.3.0/cola/core.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/core.py 2023-08-19 00:18:21.000000000 +0200 @@ -60,7 +60,6 @@ """ def __new__(cls, string, encoding): - if isinstance(string, UStr): if encoding != string.encoding: raise ValueError( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/fsmonitor.py new/git-cola-4.3.1/cola/fsmonitor.py --- old/git-cola-4.3.0/cola/fsmonitor.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/fsmonitor.py 2023-08-19 00:18:21.000000000 +0200 @@ -46,7 +46,6 @@ class _Monitor(QtCore.QObject): - files_changed = Signal() config_changed = Signal() @@ -232,7 +231,7 @@ if not events: self.notify() else: - for (fd, _) in events: + for fd, _ in events: if fd == self._inotify_fd: self._handle_events() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/git.py new/git-cola-4.3.1/cola/git.py --- old/git-cola-4.3.0/cola/git.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/git.py 2023-08-19 00:18:21.000000000 +0200 @@ -57,7 +57,6 @@ and core.isfile(join(git_dir, 'commondir')) ) ): - result = core.isfile(headref) or ( core.islink(headref) and core.readlink(headref).startswith('refs/') ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/gitcfg.py new/git-cola-4.3.1/cola/gitcfg.py --- old/git-cola-4.3.0/cola/gitcfg.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/gitcfg.py 2023-08-19 00:18:21.000000000 +0200 @@ -158,7 +158,7 @@ worktree_scope = 'worktree' cache_paths = set() - for (current_scope, current_key, current_value, continuation) in reader( + for current_scope, current_key, current_value, continuation in reader( self.context, cache_paths, self._renamed_keys ): # Store the values for fast cached lookup. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/interaction.py new/git-cola-4.3.1/cola/interaction.py --- old/git-cola-4.3.0/cola/interaction.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/interaction.py 2023-08-19 00:18:21.000000000 +0200 @@ -88,7 +88,6 @@ default=True, cancel_text=None, ): - cancel_text = cancel_text or 'Cancel' icon = icon or '?' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/qtutils.py new/git-cola-4.3.1/cola/qtutils.py --- old/git-cola-4.3.0/cola/qtutils.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/qtutils.py 2023-08-19 00:18:21.000000000 +0200 @@ -265,7 +265,7 @@ def combo_mapped(data, editable=False, transform=None, parent=None): """Create a readonly (by default) combobox from a list of items""" widget = ComboBox(editable=editable, transform=transform, parent=parent) - for (k, v) in data: + for k, v in data: widget.add_item(k, v) return widget @@ -373,7 +373,6 @@ class TreeWidgetItem(QtWidgets.QTreeWidgetItem): - TYPE = standard_item_type_value(101) def __init__(self, path, icon, deleted): @@ -999,7 +998,7 @@ def __exit__(self, exc_type, exc_val, exc_tb): """Restore Qt signals when we exit the scope""" - for (widget, value) in zip(self.widgets, self.values): + for widget, value in zip(self.widgets, self.values): widget.blockSignals(value) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/sequenceeditor.py new/git-cola-4.3.1/cola/sequenceeditor.py --- old/git-cola-4.3.0/cola/sequenceeditor.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/sequenceeditor.py 2023-08-19 00:18:21.000000000 +0200 @@ -1,4 +1,3 @@ -# flake8: noqa from __future__ import absolute_import, division, print_function, unicode_literals import sys import re @@ -548,7 +547,6 @@ class RebaseTreeWidgetItem(QtWidgets.QTreeWidgetItem): - ENABLED_COLUMN = 1 COMMAND_COLUMN = 2 OID_LENGTH = 7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/spellcheck.py new/git-cola-4.3.1/cola/spellcheck.py --- old/git-cola-4.3.0/cola/spellcheck.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/spellcheck.py 2023-08-19 00:18:21.000000000 +0200 @@ -103,7 +103,7 @@ if cfg_dictionary and os.path.exists(cfg_dictionary): paths.append((cfg_dictionary, False)) - for (path, title) in paths: + for path, title in paths: try: with codecs.open( path, 'r', encoding='utf-8', errors='ignore' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/textwrap.py new/git-cola-4.3.1/cola/textwrap.py --- old/git-cola-4.3.0/cola/textwrap.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/textwrap.py 2023-08-19 00:18:21.000000000 +0200 @@ -112,7 +112,6 @@ chunks = list(reversed(chunks)) while chunks: - # Start the list of chunks that will make up the current line. # cur_len is just the length of all the chunks in cur_line. cur_line = [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/action.py new/git-cola-4.3.1/cola/widgets/action.py --- old/git-cola-4.3.0/cola/widgets/action.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/action.py 2023-08-19 00:18:21.000000000 +0200 @@ -16,7 +16,6 @@ class QFlowLayoutWidget(QtWidgets.QFrame): - _horizontal = QtWidgets.QBoxLayout.LeftToRight _vertical = QtWidgets.QBoxLayout.TopToBottom diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/archive.py new/git-cola-4.3.1/cola/widgets/archive.py --- old/git-cola-4.3.0/cola/widgets/archive.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/archive.py 2023-08-19 00:18:21.000000000 +0200 @@ -20,7 +20,6 @@ class ExpandableGroupBox(QtWidgets.QGroupBox): - expanded = Signal(bool) def __init__(self, parent=None): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/branch.py new/git-cola-4.3.1/cola/widgets/branch.py --- old/git-cola-4.3.0/cola/widgets/branch.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/branch.py 2023-08-19 00:18:21.000000000 +0200 @@ -238,7 +238,6 @@ if root.name != N_('Tags'): # local branch if root.name == N_('Local'): - remote = gitcmds.tracked_branch(context, full_name) if remote is not None: menu.addSeparator() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/browse.py new/git-cola-4.3.1/cola/widgets/browse.py --- old/git-cola-4.3.0/cola/widgets/browse.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/browse.py 2023-08-19 00:18:21.000000000 +0200 @@ -663,7 +663,6 @@ # pylint: disable=too-many-ancestors class GitTreeWidget(standard.TreeView): - selection_changed = Signal() path_chosen = Signal(object) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/cfgactions.py new/git-cola-4.3.1/cola/widgets/cfgactions.py --- old/git-cola-4.3.0/cola/widgets/cfgactions.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/cfgactions.py 2023-08-19 00:18:21.000000000 +0200 @@ -177,7 +177,6 @@ class ActionDialog(standard.Dialog): - VALUES = {} def __init__(self, context, parent, name, opts): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/clone.py new/git-cola-4.3.1/cola/widgets/clone.py --- old/git-cola-4.3.0/cola/widgets/clone.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/clone.py 2023-08-19 00:18:21.000000000 +0200 @@ -92,7 +92,6 @@ class Clone(standard.Dialog): - # Signal binding for returning the input data result = QtCore.Signal(object, object, bool, bool) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/commitmsg.py new/git-cola-4.3.1/cola/widgets/commitmsg.py --- old/git-cola-4.3.0/cola/widgets/commitmsg.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/commitmsg.py 2023-08-19 00:18:21.000000000 +0200 @@ -229,7 +229,7 @@ QtCore.QTimer.singleShot(1, self.restore_size) def restore_size(self): - self.setMaximumHeight(2 ** 13) + self.setMaximumHeight(2**13) def focus_summary(self): self.summary.setFocus() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/completion.py new/git-cola-4.3.1/cola/widgets/completion.py --- old/git-cola-4.3.0/cola/widgets/completion.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/completion.py 2023-08-19 00:18:21.000000000 +0200 @@ -292,7 +292,6 @@ class GatherCompletionsThread(QtCore.QThread): - items_gathered = Signal(object) def __init__(self, model): @@ -399,7 +398,6 @@ class CompletionModel(QtGui.QStandardItemModel): - updated = Signal() items_gathered = Signal(object) model_updated = Signal() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/createbranch.py new/git-cola-4.3.1/cola/widgets/createbranch.py --- old/git-cola-4.3.0/cola/widgets/createbranch.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/createbranch.py 2023-08-19 00:18:21.000000000 +0200 @@ -308,7 +308,7 @@ self.progress.hide() del self.progress - for (cmd, status, _, _) in results: + for cmd, status, _, _ in results: if status != 0: Interaction.critical( N_('Error Creating Branch'), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/dag.py new/git-cola-4.3.1/cola/widgets/dag.py --- old/git-cola-4.3.0/cola/widgets/dag.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/dag.py 2023-08-19 00:18:21.000000000 +0200 @@ -1113,7 +1113,6 @@ class Cache(object): - _label_font = None @classmethod @@ -1129,7 +1128,6 @@ item_type = qtutils.standard_item_type_value(1) def __init__(self, source, dest): - QtWidgets.QGraphicsItem.__init__(self) self.setAcceptedMouseButtons(Qt.NoButton) @@ -1388,7 +1386,6 @@ return self.item_shape def paint(self, painter, option, _widget): - # Do not draw outside the exposed rect painter.setClipRect(option.exposedRect) @@ -1416,7 +1413,6 @@ class Label(QtWidgets.QGraphicsItem): - item_type = qtutils.graphics_item_type_value(3) head_color = QtGui.QColor(Qt.green) @@ -1524,7 +1520,6 @@ # pylint: disable=too-many-ancestors class GraphView(QtWidgets.QGraphicsView, ViewerMixin): - commits_selected = Signal(object) diff_commits = Signal(object, object) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/diff.py new/git-cola-4.3.1/cola/widgets/diff.py --- old/git-cola-4.3.0/cola/widgets/diff.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/diff.py 2023-08-19 00:18:21.000000000 +0200 @@ -616,7 +616,7 @@ self.cleanup() def cleanup(self): - for (image, unlink) in self.images: + for image, unlink in self.images: if unlink and core.exists(image): os.unlink(image) self.images = [] @@ -875,7 +875,6 @@ # pylint: disable=too-many-ancestors class DiffEditor(DiffTextEdit): - up = Signal() down = Signal() options_changed = Signal() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/editremotes.py new/git-cola-4.3.1/cola/widgets/editremotes.py --- old/git-cola-4.3.0/cola/widgets/editremotes.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/editremotes.py 2023-08-19 00:18:21.000000000 +0200 @@ -415,7 +415,6 @@ class RemoteWidget(QtWidgets.QWidget): - name = property( lambda self: get(self.remote_name), lambda self, value: self.remote_name.set_value(value), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/filelist.py new/git-cola-4.3.1/cola/widgets/filelist.py --- old/git-cola-4.3.0/cola/widgets/filelist.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/filelist.py 2023-08-19 00:18:21.000000000 +0200 @@ -13,7 +13,6 @@ # pylint: disable=too-many-ancestors class FileWidget(TreeWidget): - files_selected = Signal(object) difftool_selected = Signal(object) histories_selected = Signal(object) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/main.py new/git-cola-4.3.1/cola/widgets/main.py --- old/git-cola-4.3.0/cola/widgets/main.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/main.py 2023-08-19 00:18:21.000000000 +0200 @@ -1395,7 +1395,7 @@ return menu.addSeparator() cache = {} - for (name, shortcut) in names_and_shortcuts: + for name, shortcut in names_and_shortcuts: sub_menu, action_name = build_menus(name, menu, cache) callback = cmds.run(cmds.RunConfigAction, context, name) menu_action = sub_menu.addAction(action_name, callback) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/patch.py new/git-cola-4.3.1/cola/widgets/patch.py --- old/git-cola-4.3.0/cola/widgets/patch.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/patch.py 2023-08-19 00:18:21.000000000 +0200 @@ -38,11 +38,7 @@ def get_patches_from_paths(paths): """Returns all patches benath a given path""" paths = [core.decode(p) for p in paths] - patches = [ - p - for p in paths - if core.isfile(p) and p.endswith(('.patch', '.mbox')) - ] + patches = [p for p in paths if core.isfile(p) and p.endswith(('.patch', '.mbox'))] dirs = [p for p in paths if core.isdir(p)] dirs.sort() for d in dirs: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/spellcheck.py new/git-cola-4.3.1/cola/widgets/spellcheck.py --- old/git-cola-4.3.0/cola/widgets/spellcheck.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/spellcheck.py 2023-08-19 00:18:21.000000000 +0200 @@ -191,7 +191,6 @@ class Highlighter(QtGui.QSyntaxHighlighter): - WORDS = r"(?iu)[\w']+" def __init__(self, doc, spellcheck_widget): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/standard.py new/git-cola-4.3.1/cola/widgets/standard.py --- old/git-cola-4.3.0/cola/widgets/standard.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/standard.py 2023-08-19 00:18:21.000000000 +0200 @@ -746,6 +746,7 @@ class DirectoryPathLineEdit(QtWidgets.QWidget): """A combined line edit and file browser button""" + def __init__(self, path, parent): QtWidgets.QWidget.__init__(self, parent) @@ -775,9 +776,7 @@ def _select_directory(self): """Open a file browser and select a directory""" - output_dir = qtutils.opendir_dialog( - N_('Select directory'), self.value() - ) + output_dir = qtutils.opendir_dialog(N_('Select directory'), self.value()) if not output_dir: return # Make the directory relative only if it the current directory or @@ -836,7 +835,6 @@ cancel_text=None, cancel_icon=None, ): - Dialog.__init__(self, parent=parent) if parent: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/status.py new/git-cola-4.3.1/cola/widgets/status.py --- old/git-cola-4.3.0/cola/widgets/status.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/status.py 2023-08-19 00:18:21.000000000 +0200 @@ -98,7 +98,7 @@ def set_initial_size(self): """Set the initial size of the status widget""" self.setMaximumWidth(222) - QtCore.QTimer.singleShot(1, lambda: self.setMaximumWidth(2 ** 13)) + QtCore.QTimer.singleShot(1, lambda: self.setMaximumWidth(2**13)) def refresh(self): """Refresh the tree and rerun the diff to see updates""" @@ -419,7 +419,7 @@ did_reselect = False with qtutils.BlockSignals(self): - for (new, old, sel, reselect) in saved_selection: + for new, old, sel, reselect in saved_selection: for item in sel: if item in new: reselect(item, current=False) @@ -436,7 +436,7 @@ # # The following block of code implements the behavior of selecting # the next item based on the previous selection. - for (new, old, sel, reselect) in saved_selection: + for new, old, sel, reselect in saved_selection: # When modified is staged, select the next modified item # When unmerged is staged, select the next unmerged item # When unstaging, select the next staged item diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/cola/widgets/text.py new/git-cola-4.3.1/cola/widgets/text.py --- old/git-cola-4.3.0/cola/widgets/text.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/cola/widgets/text.py 2023-08-19 00:18:21.000000000 +0200 @@ -25,7 +25,6 @@ class LineEdit(QtWidgets.QLineEdit): - cursor_changed = Signal(int, int) esc_pressed = Signal() @@ -286,7 +285,6 @@ class PlainTextEdit(QtWidgets.QPlainTextEdit): - cursor_changed = Signal(int, int) leave = Signal() @@ -522,7 +520,6 @@ class TextEdit(QtWidgets.QTextEdit): - cursor_changed = Signal(int, int) leave = Signal() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/docs/git-dag.rst new/git-cola-4.3.1/docs/git-dag.rst --- old/git-cola-4.3.0/docs/git-dag.rst 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/docs/git-dag.rst 2023-08-19 00:18:21.000000000 +0200 @@ -15,21 +15,21 @@ OPTIONS ======= ---prompt --------- +``--prompt`` +------------ Prompt for a Git repository instead of using the current directory. --r, --repo <path> ------------------ +``-r, --repo <path>`` +--------------------- Run `git dag` on the git repository in `<path>`. Defaults to the current directory. ---version ---------- +``--version`` +------------- Print the `git dag` version and exit. --h, --help ----------- +``-h, --help`` +-------------- Show usage and optional arguments. Log Options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/docs/relnotes.rst new/git-cola-4.3.1/docs/relnotes.rst --- old/git-cola-4.3.0/docs/relnotes.rst 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/docs/relnotes.rst 2023-08-19 00:18:21.000000000 +0200 @@ -5,7 +5,7 @@ Latest Release ============== -:ref:`v4.3.0 <v4.3.0>` is the latest stable release. +:ref:`v4.3.1 <v4.3.1>` is the latest stable release. Development version =================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/extras/sphinxtogithub/__init__.py new/git-cola-4.3.1/extras/sphinxtogithub/__init__.py --- old/git-cola-4.3.0/extras/sphinxtogithub/__init__.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/extras/sphinxtogithub/__init__.py 2023-08-19 00:18:21.000000000 +0200 @@ -1,6 +1,5 @@ """Script for preparing the html output of the Sphinx documentation system for github pages. """ -# flake8: noqa from __future__ import absolute_import, division, unicode_literals VERSION = (1, 1, 0, 'dev') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/extras/sphinxtogithub/sphinxtogithub.py new/git-cola-4.3.1/extras/sphinxtogithub/sphinxtogithub.py --- old/git-cola-4.3.0/extras/sphinxtogithub/sphinxtogithub.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/extras/sphinxtogithub/sphinxtogithub.py 2023-08-19 00:18:21.000000000 +0200 @@ -16,7 +16,6 @@ class DirHelper(object): def __init__(self, is_dir, list_dir, walk, rmtree): - self.is_dir = is_dir self.list_dir = list_dir self.walk = walk @@ -25,7 +24,6 @@ class FileSystemHelper(object): def __init__(self, open_, path_join, move, exists): - self.open_ = open_ self.path_join = path_join self.move = move @@ -36,12 +34,10 @@ "Encapsulates a simple text replace" def __init__(self, from_, to): - self.from_ = from_ self.to = to def process(self, text): - return text.replace(self.from_, self.to) @@ -49,13 +45,11 @@ "Applies a series of replacements the contents of a file inplace" def __init__(self, name, replacers, opener): - self.name = name self.replacers = replacers self.opener = opener def process(self): - text = self.opener(self.name, "r").read() for replacer in self.replacers: @@ -70,31 +64,26 @@ self.remove = remove def __call__(self, name): - if self.exists(name): self.remove(name) class ForceRename(object): def __init__(self, renamer, remove): - self.renamer = renamer self.remove = remove def __call__(self, from_, to): - self.remove(to) self.renamer(from_, to) class VerboseRename(object): def __init__(self, renamer, stream): - self.renamer = renamer self.stream = stream def __call__(self, from_, to): - self.stream.write( "Renaming directory '%s' -> '%s'\n" % (os.path.basename(from_), os.path.basename(to)) @@ -107,28 +96,23 @@ "Encapsulates renaming a directory by removing its first character" def __init__(self, name, root, renamer): - self.name = name self.new_name = name[1:] self.root = root + os.sep self.renamer = renamer def path(self): - return os.path.join(self.root, self.name) def relative_path(self, directory, filename): - path = directory.replace(self.root, "", 1) return os.path.join(path, filename) def new_relative_path(self, directory, filename): - path = self.relative_path(directory, filename) return path.replace(self.name, self.new_name, 1) def process(self): - from_ = os.path.join(self.root, self.name) to = os.path.join(self.root, self.new_name) self.renamer(from_, to) @@ -136,29 +120,23 @@ class HandlerFactory(object): def create_file_handler(self, name, replacers, opener): - return FileHandler(name, replacers, opener) def create_dir_handler(self, name, root, renamer): - return DirectoryHandler(name, root, renamer) class OperationsFactory(object): def create_force_rename(self, renamer, remover): - return ForceRename(renamer, remover) def create_verbose_rename(self, renamer, stream): - return VerboseRename(renamer, stream) def create_replacer(self, from_, to): - return Replacer(from_, to) def create_remover(self, exists, remove): - return Remover(exists, remove) @@ -169,12 +147,10 @@ """ def __init__(self, directory_handlers, file_handlers): - self.directory_handlers = directory_handlers self.file_handlers = file_handlers def process(self): - for handler in self.file_handlers: handler.process() @@ -204,7 +180,6 @@ stream, force, ): - self.operations_factory = operations_factory self.handler_factory = handler_factory @@ -216,7 +191,6 @@ self.force = force def create_layout(self, path): - contents = self.dir_helper.list_dir(path) renamer = self.file_helper.move @@ -287,7 +261,6 @@ return Layout(underscore_directories, filelist) def is_underscore_dir(self, path, directory): - return self.dir_helper.is_dir( self.file_helper.path_join(path, directory) ) and directory.startswith("_") @@ -347,7 +320,6 @@ def main(args): - usage = "usage: %prog [options] <html directory>" parser = OptionParser(usage=usage) parser.add_option( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/garden.yaml new/git-cola-4.3.1/garden.yaml --- old/git-cola-4.3.0/garden.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/git-cola-4.3.1/garden.yaml 2023-08-19 00:18:21.000000000 +0200 @@ -0,0 +1,211 @@ +# Use "cargo install garden-tools" to install garden https://gitlab.com/garden-rs/garden +# +# Usage: +# +# # Development Workflows +# garden develop # Runs "pip install --editable ." +# garden requirements # Install runtime requirements +# garden requirements/opt # Install optional runtime requirements +# garden requirements/dev # Install developer requirements +# garden test # Run the test suite +# garden fmt # Format code using "black" +# garden doc # Generate documentation: html + manual pages +# garden html # Generate documentation: html only +# garden man # Generate documentation: manual pages only +# garden pot # Regenerate git-cola.pot with new translations +# garden po # Update .po files with new translations from git-cola.pot +# +# # Installation +# garden install # Install git-cola to the installation ${prefix} +# garden install docs # Install documentation +# +# # Variables can be overridden using "-D name=value", eg: +# garden -D DESTDIR=/tmp/stage -D prefix=/usr/local install +# garden -D prefix=$PWD/dist install docs +# +# # Related Projects +# garden grow pages # Clone the Git Cola homepage +# garden grow fedora # Clone the Fedora packaging +# garden grow deb # Clone the Debian packaging +--- +garden: + root: "${GARDEN_CONFIG_DIR}" + +trees: + git-cola: + path: "${GARDEN_CONFIG_DIR}" + url: "[email protected]:git-cola/git-cola.git" + commands: + develop: ${PIP} install --editable . + doc: garden -vv cmd docs html man + check: | + garden -vv test + garden -vv doc + garden -vv pylint + fmt: | + ${GIT} ls-files -- '*.py' | + ${GREP} -v ^qtpy | + ${XARGS} ${BLACK} --skip-string-normalization + html: garden -vv html docs + install: | + if test -n "${DESTDIR}" + then + pip_root="--root=${DESTDIR}" + export DESTDIR="${DESTDIR}" + fi + ${PIP} install --disable-pip-version-check $pip_root --prefix=${prefix} "$@" . + po: | + for po in cola/i18n/*.po + do + ${MSGMERGE} \ + --no-wrap \ + --no-fuzzy-matching \ + --sort-output \ + --output-file $$po.new \ + $$po \ + cola/i18n/git-cola.pot + mv $$po.new $$po + done + pot: | + ${XGETTEXT} \ + --language=Python \ + --keyword=N_ \ + --no-wrap \ + --omit-header \ + --sort-output \ + --output-dir cola/i18n \ + --output git-cola.pot \ + cola/*.py \ + cola/*/*.py + man: garden -vv man docs + pylint: | + ${PYLINT} --version + ${PYLINT} --rcfile=.pylintrc ${PYLINT_OPTIONS} "$@" cola test + requirements: ${PIP} install --requirement requirements/requirements.txt + requirements/opt: ${PIP} install --requirement requirements/requirements-optional.txt + requirements/dev: ${PIP} install --requirement requirements/requirements-dev.txt + test: ${PYTEST} ${PYTEST_OPTIONS} "$@" cola test + remotes: + DasaniT: "https://github.com/DasaniT/git-cola.git"; + Mailaender: "https://github.com/Mailaender/git-cola.git"; + Mithil467: "https://github.com/Mithil467/git-cola.git"; + NielBuys: "https://github.com/NielBuys/git-cola.git"; + WNguyen14: "https://github.com/WNguyen14/git-cola.git"; + abid1998: "https://github.com/abid1998/git-cola.git"; + achernet: "https://github.com/achernet/git-cola.git"; + axel-h: "https://github.com/axel-h/git-cola.git"; + bearsh: "https://github.com/bearsh/git-cola.git"; + bensmrs: "https://github.com/bensmrs/git-cola.git"; + bobvanderlinden: "https://github.com/bobvanderlinden/git-cola.git"; + brccabral: "https://github.com/brccabral/git-cola.git"; + davvid: "[email protected]:davvid/git-cola.git" + dschwoerer: "https://github.com/dschwoerer/git-cola.git"; + florisla: "https://github.com/florisla/git-cola.git"; + fu7mu4: "https://github.com/fu7mu4/git-cola.git"; + gdebure: "https://github.com/gdebure/git-cola.git"; + github: "[email protected]:git-cola/git-cola.git" + guoyunhe: "https://github.com/guoyunhe/git-cola.git"; + gyuris: "https://github.com/gyuris/git-cola.git"; + haffmans: "https://github.com/haffmans/git-cola.git"; + harmathy: "https://github.com/harmathy/git-cola.git"; + hsoft: "https://github.com/hsoft/git-cola.git"; + jamie-pate: "https://github.com/jamie-pate/git-cola.git"; + kenyuy: "https://github.com/kenyuy/git-cola.git"; + kisaragi-hiu: "https://github.com/kisaragi-hiu/git-cola.git"; + kneirinck: "https://github.com/kneirinck/git-cola.git"; + kurtmckee: "https://github.com/kurtmckee/git-cola.git"; + laerreal: "https://github.com/laerreal/git-cola.git"; + lah7: "https://github.com/lah7/git-cola.git"; + living180: "https://github.com/living180/git-cola.git"; + ljhcage: "https://github.com/ljhcage/git-cola.git"; + malpas: "https://github.com/malpas/git-cola.git"; + melkecelioglu: "https://github.com/melkecelioglu/git-cola.git"; + milestone12: "https://github.com/milestone12/git-cola.git"; + mmargoliono: "https://github.com/mmargoliono/git-cola"; + mp-chet: "https://github.com/mp-chet/git-cola.git"; + nakanoi: "https://github.com/nakanoi/git-cola.git"; + nandalopes: "https://github.com/nandalopes/git-cola.git"; + pilarmolinalopez: "https://github.com/pilarmolinalopez/git-cola.git"; + quintusfelix: "https://github.com/quintusfelix/git-cola.git"; + rafaelreuber: "https://github.com/rafaelreuber/git-cola.git"; + scop: "https://github.com/scop/git-cola.git"; + sergei-dyshel: "https://github.com/sergei-dyshel/git-cola.git"; + skunkwerks: "https://github.com/skunkwerks/git-cola.git"; + takluyver: "https://github.com/takluyver/git-cola.git"; + thk123: "https://github.com/thk123/git-cola.git"; + timgates42: "https://github.com/timgates42/git-cola.git"; + vdragon: "https://github.com/Vdragon/git-cola.git"; + victorhck: "https://github.com/victorhck/git-cola.git"; + virtualstaticvoid: "https://github.com/virtualstaticvoid/git-cola.git"; + wm4: "https://github.com/wm4/git-cola.git"; + wojnilowicz: "https://github.com/wojnilowicz/git-cola.git"; + deb: + description: Debian packaging for Git Cola + url: "[email protected]:git-cola/git-cola-debian.git" + remotes: + davvid: "[email protected]:davvid/git-cola-debian.git" + docs: + commands: + clean: rm -fr _build + doctest: ${SPHINXBUILD} -b doctest ${SPHINX_OPTIONS_ALL} _build/doctest + html: ${SPHINXBUILD} -b html ${SPHINX_OPTIONS_ALL} _build/html + man: ${SPHINXBUILD} -b man ${SPHINX_OPTIONS_ALL} _build/man + linkcheck: ${SPHINXBUILD} -b linkcheck ${SPHINX_OPTIONS_ALL} _build/linkcheck + install: | + ${MKDIR_P} ${DESTDIR}${docdir} + ${INSTALL} -m 644 *.html ${DESTDIR}${docdir} + ${INSTALL} -m 644 *.rst ${DESTDIR}${docdir} + # HTML documentation + ${MKDIR_P} ${DESTDIR}${htmldir} + ${RSYNC} ${RSYNC_OPTIONS} _build/html/ ${DESTDIR}${htmldir}/ + # Manual pages + ${MKDIR_P} ${DESTDIR}${mandir} + ${INSTALL} -m 644 _build/man/git-cola.1 ${DESTDIR}${mandir} + ${INSTALL} -m 644 _build/man/git-dag.1 ${DESTDIR}${mandir} + fedora: + description: Fedora packaging for Git Cola + url: "https://src.fedoraproject.org/rpms/git-cola.git"; + remotes: + git-cola: "[email protected]:git-cola/git-cola-fedora.git" + davvid: "[email protected]:davvid/git-cola-fedora.git" + pages: + description: "Git Cola's homepage" + url: "[email protected]:git-cola/git-cola.gitlab.io.git" + remotes: + github: "[email protected]:git-cola/git-cola.github.io.git" + ls-jad-elkik: "git://github.com/ls-jad-elkik/git-cola.github.io.git" + lz-coder: "https://github.com/lz-coder/git-cola.github.io.git"; + links: + - "https://git-cola.gitlab.io"; + - "https://git-cola.github.io"; + +# Variables can be overridden externally using "garden -D name=value ...". +variables: + # Traditional DESTDIR + prefix variables + DESTDIR: "" + prefix: ${GARDEN_CONFIG_DIR}/dist + docdir: ${prefix}/share/doc/git-cola + htmldir: ${docdir}/html + mandir: ${prefix}/share/man/man1 + # External commands and options + BLACK: black + GIT: git + GREP: grep + INSTALL: install + MKDIR_P: mkdir -p + MSGMERGE: msgmerge + PIP: pip + PYLINT: ${PYTHON} -B -m pylint + PYLINT_OPTIONS: $ ${PYLINT} --score=no --help >/dev/null 2>&1 && printf '%s' --score=no + PYTEST: ${PYTHON3} -B -m pytest + PYTEST_OPTIONS: $ test "$(uname -s)" != "Linux" && printf '%s' --ignore=cola/inotify.py + PYTHON: python3 + RSYNC: rsync + RSYNC_OPTIONS: "-r --delete --exclude=.buildinfo" + SPHINXBUILD: sphinx-build + SPHINX_OPTIONS: "-a" + SPHINX_OPTIONS_ALL: "-d _build/doctrees ." + XARGS: xargs + XGETTEXT: xgettext + +... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/pynsist.cfg new/git-cola-4.3.1/pynsist.cfg --- old/git-cola-4.3.0/pynsist.cfg 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/pynsist.cfg 2023-08-19 00:18:21.000000000 +0200 @@ -2,7 +2,7 @@ [Application] name=git-cola -version=4.3.0 +version=4.3.1 entry_point=cola.main:shortcut_launch icon=cola/icons/git-cola.ico extra_preamble=contrib/win32/pynsist-preamble.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/pyproject.toml new/git-cola-4.3.1/pyproject.toml --- old/git-cola-4.3.0/pyproject.toml 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/pyproject.toml 2023-08-19 00:18:21.000000000 +0200 @@ -34,4 +34,4 @@ # "fallback_version" does not (currently) work when building from tarballs. # "fallback_version" should start working once this upstream issue is resolved: # https://github.com/pypa/setuptools_scm/issues/549 -fallback_version = "4.3.0" +fallback_version = "4.3.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/requirements/requirements-dev.txt new/git-cola-4.3.1/requirements/requirements-dev.txt --- old/git-cola-4.3.0/requirements/requirements-dev.txt 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/requirements/requirements-dev.txt 2023-08-19 00:18:21.000000000 +0200 @@ -6,15 +6,14 @@ setuptools_scm[toml] >= 3.4.1 wheel -## pylint, flake8 checkers are used by "make check". -flake8 +## pylint is used by "garden check". pylint>=2.14.0 -## pytest packages are used by the "make test" test suite. +## pytest packages are used by the "garden test" test suite. pytest>=3.6 pytest-cov -## Build and install documentation using "make doc" and "make install-doc". +## Build and install documentation using "garden doc" and "garden install-doc". jaraco.packaging >= 9 rst.linker >= 1.9 Sphinx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/share/metainfo/git-cola.appdata.xml new/git-cola-4.3.1/share/metainfo/git-cola.appdata.xml --- old/git-cola-4.3.0/share/metainfo/git-cola.appdata.xml 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/share/metainfo/git-cola.appdata.xml 2023-08-19 00:18:21.000000000 +0200 @@ -17,6 +17,7 @@ </screenshots> <url type="homepage">https://git-cola.github.io/</url> <releases> + <release version="4.3.1" date="2023-08-18" /> <release version="4.3.0" date="2023-08-12" /> <release version="4.2.1" date="2023-03-31" /> <release version="4.2.0" date="2023-03-23" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/share/metainfo/git-dag.appdata.xml new/git-cola-4.3.1/share/metainfo/git-dag.appdata.xml --- old/git-cola-4.3.0/share/metainfo/git-dag.appdata.xml 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/share/metainfo/git-dag.appdata.xml 2023-08-19 00:18:21.000000000 +0200 @@ -11,6 +11,7 @@ </description> <url type="homepage">https://git-cola.github.io/</url> <releases> + <release version="4.3.1" date="2023-08-18" /> <release version="4.3.0" date="2023-08-12" /> <release version="4.2.1" date="2023-03-31" /> <release version="4.2.0" date="2023-03-23" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/test/browse_model_test.py new/git-cola-4.3.1/test/browse_model_test.py --- old/git-cola-4.3.0/test/browse_model_test.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/test/browse_model_test.py 2023-08-19 00:18:21.000000000 +0200 @@ -9,7 +9,7 @@ from .helper import app_context -# These assertions make flake8 happy. It considers them unused imports otherwise. +# These assertions make pylint happy. It considers them unused imports otherwise. assert app_context is not None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/test/git_test.py new/git-cola-4.3.1/test/git_test.py --- old/git-cola-4.3.0/test/git_test.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/test/git_test.py 2023-08-19 00:18:21.000000000 +0200 @@ -124,7 +124,6 @@ @patch('cola.core.getenv') @patch('cola.git.is_git_dir') def test_find_git_honors_ceiling_dirs(is_git_dir, getenv): - git_dir = '/ceiling/.git' ceiling = '/tmp:/ceiling:/other/ceiling' is_git_dir.side_effect = lambda x: x == git_dir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/test/gitcfg_test.py new/git-cola-4.3.1/test/gitcfg_test.py --- old/git-cola-4.3.0/test/gitcfg_test.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/test/gitcfg_test.py 2023-08-19 00:18:21.000000000 +0200 @@ -6,7 +6,7 @@ from .helper import app_context -# These assertions make flake8 happy. It considers them unused imports otherwise. +# These assertions make pylint happy. It considers them unused imports otherwise. assert app_context is not None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/test/gitcmds_test.py new/git-cola-4.3.1/test/gitcmds_test.py --- old/git-cola-4.3.0/test/gitcmds_test.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/test/gitcmds_test.py 2023-08-19 00:18:21.000000000 +0200 @@ -11,7 +11,7 @@ from .helper import app_context -# These assertions make flake8 happy. It considers them unused imports otherwise. +# These assertions make pylint happy. It considers them unused imports otherwise. assert app_context is not None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/test/gitops_test.py new/git-cola-4.3.1/test/gitops_test.py --- old/git-cola-4.3.0/test/gitops_test.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/test/gitops_test.py 2023-08-19 00:18:21.000000000 +0200 @@ -6,7 +6,7 @@ from .helper import app_context -# These assertions make flake8 happy. It considers them unused imports otherwise. +# These assertions make pylint happy. It considers them unused imports otherwise. assert app_context is not None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/test/main_model_test.py new/git-cola-4.3.1/test/main_model_test.py --- old/git-cola-4.3.0/test/main_model_test.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/test/main_model_test.py 2023-08-19 00:18:21.000000000 +0200 @@ -13,7 +13,7 @@ from .helper import Mock -# These assertions make flake8 happy. It considers them unused imports otherwise. +# These assertions make pylint happy. It considers them unused imports otherwise. assert app_context is not None REMOTE = 'server' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/test/startup_test.py new/git-cola-4.3.1/test/startup_test.py --- old/git-cola-4.3.0/test/startup_test.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/test/startup_test.py 2023-08-19 00:18:21.000000000 +0200 @@ -6,7 +6,7 @@ from .helper import app_context -# These assertions make flake8 happy. It considers them unused imports otherwise. +# These assertions make pylint happy. It considers them unused imports otherwise. assert app_context is not None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-cola-4.3.0/test/stash_model_test.py new/git-cola-4.3.1/test/stash_model_test.py --- old/git-cola-4.3.0/test/stash_model_test.py 2023-08-13 06:41:48.000000000 +0200 +++ new/git-cola-4.3.1/test/stash_model_test.py 2023-08-19 00:18:21.000000000 +0200 @@ -7,7 +7,7 @@ from .helper import app_context -# These assertions make flake8 happy. It considers them unused imports otherwise. +# These assertions make pylint happy. It considers them unused imports otherwise. assert app_context is not None
