openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2022
- 1 participants
- 2269 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ansible-lint for openSUSE:Factory checked in at 2022-05-30 12:43:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ansible-lint (Old)
and /work/SRC/openSUSE:Factory/.ansible-lint.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ansible-lint"
Mon May 30 12:43:48 2022 rev:3 rq:979692 version:5.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ansible-lint/ansible-lint.changes 2022-02-15 23:58:13.440368868 +0100
+++ /work/SRC/openSUSE:Factory/.ansible-lint.new.2254/ansible-lint.changes 2022-05-30 12:44:39.056446471 +0200
@@ -1,0 +2,5 @@
+Sun May 29 11:07:05 UTC 2022 - Sebastian Wagner <sebix+novell.com(a)sebix.at>
+
+- Add deprecated-pytest-hook.patch to fix a test fail.
+
+-------------------------------------------------------------------
New:
----
deprecated-pytest-hook.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ansible-lint.spec ++++++
--- /var/tmp/diff_new_pack.nYQaWX/_old 2022-05-30 12:44:40.752448728 +0200
+++ /var/tmp/diff_new_pack.nYQaWX/_new 2022-05-30 12:44:40.756448734 +0200
@@ -26,6 +26,7 @@
License: MIT
URL: https://github.com/ansible-community/ansible-lint
Source0: https://github.com/ansible-community/ansible-lint/archive/v%{version}/ansib…
+Patch0: https://github.com/ansible/ansible-lint/commit/aa6c1c6577f8178643591ddc0699…
BuildArch: noarch
BuildRequires: python-rpm-macros
BuildRequires: python3-PyYAML
@@ -40,11 +41,11 @@
BuildRequires: python3-yamllint
#BuildRequires: git
BuildRequires: python3-enrich >= 1.2.6
+BuildRequires: ansible
BuildRequires: python3-rich >= 9.5.1
BuildRequires: python3-ruamel.yaml >= 0.15.37
BuildRequires: python3-wcmatch >= 7.0
# /SECTION
-BuildRequires: ansible
BuildRequires: fdupes
Requires: ansible
Requires: python3-PyYAML
@@ -61,6 +62,7 @@
%prep
%setup -n ansible-lint-%{version}
+%patch0 -p1
sed -ri 's/(\[metadata\])/\1\nversion = %{version}/' setup.cfg
sed -i '1{/\/usr\/bin\/env python/d;}' src/ansiblelint/__main__.py
@@ -78,7 +80,7 @@
%check
# exclude some tests depending on internet access (galaxy modules)
# exclude test_cli_auto_detect which depends on a local git repository
-# exclude test_co and test_call_from_outside_venv because of https://github.com/ansible-community/ansible-lint/issues/1885
+# exclude test_co and test_call_from_outside_venv because of https://github.com/ansible-community/ansible-lint/issues/1885 FIXED!
PYTHONPATH=${PYTHONPATH:+$PYTHONPATH:}%{buildroot}/%{python3_sitelib} PATH=${PATH:+$PATH:}%{buildroot}/%{_bindir} PYTHONDONTWRITEBYTECODE=1 pytest -v -k 'not (test_prerun_reqs_v1 or test_prerun_reqs_v2 or test_install_collection or test_require_collection_wrong_version or test_cli_auto_detect or test_eco or test_call_from_outside_venv)'
%files
++++++ deprecated-pytest-hook.patch ++++++
From aa6c1c6577f8178643591ddc06996a5d5588cb9a Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea(a)redhat.com>
Date: Sun, 13 Feb 2022 13:21:49 +0000
Subject: [PATCH] Remove deprecated pytest hook (#1891)
---
conftest.py | 22 ----------------------
tox.ini | 1 +
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/conftest.py b/conftest.py
index 303e87302..f93a957af 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,27 +1,5 @@
"""PyTest Fixtures."""
import os
-import re
-import sys
-from typing import List
os.environ["NO_COLOR"] = "1"
pytest_plugins = ["ansiblelint.testing.fixtures"]
-
-
-def pytest_cmdline_preparse(args: List[str]) -> None:
- """Pytest hook."""
- # disable xdist when called with -k args (filtering)
- # https://stackoverflow.com/questions/66407583/how-to-disable-pytest-xdist-on…
- if "xdist" in sys.modules and "-k" in args:
- for i, arg in enumerate(args):
- # remove -n # option
- if arg == "-n":
- del args[i]
- del args[i]
- break
- # remove -n# option
- if re.match(r"-n\d+", arg):
- del args[i]
- break
-
- args[:] = ["-n0"] + args
diff --git a/tox.ini b/tox.ini
index 4ffa9d99e..fb0525be6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,6 +28,7 @@ commands =
{envpython} -m pytest \
--junitxml "{toxworkdir}/junit.{envname}.xml" \
{posargs:\
+ -n0 \
-m "not eco" \
-p pytest_cov \
--cov ansiblelint \
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qpwgraph for openSUSE:Factory checked in at 2022-05-30 12:43:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qpwgraph (Old)
and /work/SRC/openSUSE:Factory/.qpwgraph.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qpwgraph"
Mon May 30 12:43:47 2022 rev:6 rq:979687 version:0.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qpwgraph/qpwgraph.changes 2022-04-30 00:46:11.734985624 +0200
+++ /work/SRC/openSUSE:Factory/.qpwgraph.new.2254/qpwgraph.changes 2022-05-30 12:44:38.056445141 +0200
@@ -1,0 +2,19 @@
+Sun May 29 15:59:49 UTC 2022 - Alexei Sorokin <sor.alexei(a)meowr.ru>
+
+- Update to version 0.3.1:
+ * Only ask to quit an activated patchbay when actually quitting
+ the application (not just closing a patchbay).
+ * Graph/Connect and Disconnect keyboard shortcuts changed from
+ [Ins] and [Del], to [Ctrl+C] and [Ctrl+D] respectively; also
+ added [F2] as brand new keyboard shortcut for Edit/Rename...
+
+-------------------------------------------------------------------
+Wed May 25 19:28:14 UTC 2022 - Alexei Sorokin <sor.alexei(a)meowr.ru>
+
+- Update to version 0.3.0:
+ * Fix document dirtiness (modified state) when making connections
+ and/or disconnections on a clear and new patchbay.
+ * Attempt to save and possibly restore different node positions
+ and aliases when forner original node name is non-unique.
+
+-------------------------------------------------------------------
Old:
----
qpwgraph-v0.2.6.tar.bz2
New:
----
qpwgraph-v0.3.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qpwgraph.spec ++++++
--- /var/tmp/diff_new_pack.ZiD8Pi/_old 2022-05-30 12:44:38.624445896 +0200
+++ /var/tmp/diff_new_pack.ZiD8Pi/_new 2022-05-30 12:44:38.628445902 +0200
@@ -17,7 +17,7 @@
Name: qpwgraph
-Version: 0.2.6
+Version: 0.3.1
Release: 0
Summary: PipeWire Graph Qt GUI Interface
License: GPL-2.0-or-later
++++++ qpwgraph-v0.2.6.tar.bz2 -> qpwgraph-v0.3.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.2.6/CMakeLists.txt new/qpwgraph-v0.3.1/CMakeLists.txt
--- old/qpwgraph-v0.2.6/CMakeLists.txt 2022-04-23 09:43:07.000000000 +0200
+++ new/qpwgraph-v0.3.1/CMakeLists.txt 2022-05-29 11:14:34.000000000 +0200
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.15)
project(qpwgraph
- VERSION 0.2.6
+ VERSION 0.3.1
DESCRIPTION "A PipeWire Graph Qt GUI Interface"
HOMEPAGE_URL "https://gitlab.freedesktop.org/rncbc/qpwgraph"
LANGUAGES C CXX)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.2.6/ChangeLog new/qpwgraph-v0.3.1/ChangeLog
--- old/qpwgraph-v0.2.6/ChangeLog 2022-04-23 09:43:07.000000000 +0200
+++ new/qpwgraph-v0.3.1/ChangeLog 2022-05-29 11:14:34.000000000 +0200
@@ -2,18 +2,35 @@
--------------------------------------------
+0.3.1 2022-05-29 A ninth beta release.
+
+- Only ask to quit an activated patchbay when actually quitting
+ the application (not just closing a patchbay).
+- Graph/Connect and Disconnect keyboard shortcuts changed from
+ [Ins] and [Del], to [Ctrl+C] and [Ctrl+D] respectively; also
+ added [F2] as brand new keyboard shortcut for Edit/Rename...
+
+
+0.3.0 2022-05-21 An eighth beta release.
+
+- Fixed document dirtiness (modified state) when making connections
+ and/or disconnections on a clear and new patchbay.
+- Attempt to save and possibly restore different node positions and
+ aliases when forner original node name is non-unique.
+
+
0.2.6 2022-04-23 A seventh beta release.
- Patchbay now treats multiple nodes and respective ports with
- the same name as one, applying the same rule. (EXPERIMENTAL)
+ the same name as one, applying the same rule.
0.2.5 2022-04-06 A sixth beta release.
- Prevent an graph refresh or update as much as possible while in
- some canvas editing business (fixes issue #29). (EXPERIMENTAL)
+ some canvas editing business (fixes issue #29).
- Possibly fix a random segfault when rendering connection lines
- ahead of time (possibly mitigating issue #26). (EXPERIMENTAL)
+ ahead of time (possibly mitigating issue #26).
0.2.4 2022-03-19 A fifth beta release.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.2.6/src/appdata/org.rncbc.qpwgraph.metainfo.xml new/qpwgraph-v0.3.1/src/appdata/org.rncbc.qpwgraph.metainfo.xml
--- old/qpwgraph-v0.2.6/src/appdata/org.rncbc.qpwgraph.metainfo.xml 2022-04-23 09:43:07.000000000 +0200
+++ new/qpwgraph-v0.3.1/src/appdata/org.rncbc.qpwgraph.metainfo.xml 2022-05-29 11:14:34.000000000 +0200
@@ -37,7 +37,7 @@
<developer_name>rncbc aka. Rui Nuno Capela</developer_name>
<update_contact>rncbc(a)rncbc.org</update_contact>
<releases>
- <release version="0.2.6" date="2022-04-23" urgency="low" />
+ <release version="0.3.1" date="2022-05-29" urgency="low" />
</releases>
<content_rating type="oars-1.0"/>
</component>
Binary files old/qpwgraph-v0.2.6/src/images/qpwgraph.png and new/qpwgraph-v0.3.1/src/images/qpwgraph.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.2.6/src/images/qpwgraph.svg new/qpwgraph-v0.3.1/src/images/qpwgraph.svg
--- old/qpwgraph-v0.2.6/src/images/qpwgraph.svg 2022-04-23 09:43:07.000000000 +0200
+++ new/qpwgraph-v0.3.1/src/images/qpwgraph.svg 2022-05-29 11:14:34.000000000 +0200
@@ -26,11 +26,11 @@
inkscape:collect="always"
id="LinearGradient1">
<stop
- style="stop-color:#000000;stop-opacity:1;"
+ style="stop-color:#000000;stop-opacity:0.8;"
offset="0"
id="stop1145" />
<stop
- style="stop-color:#000000;stop-opacity:0;"
+ style="stop-color:#000000;stop-opacity:0.2;"
offset="1"
id="stop1147" />
</linearGradient>
@@ -259,7 +259,7 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.453125"
- inkscape:cx="160"
+ inkscape:cx="159.79618"
inkscape:cy="160"
inkscape:document-units="px"
inkscape:current-layer="layer1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.2.6/src/qpwgraph.cpp new/qpwgraph-v0.3.1/src/qpwgraph.cpp
--- old/qpwgraph-v0.2.6/src/qpwgraph.cpp 2022-04-23 09:43:07.000000000 +0200
+++ new/qpwgraph-v0.3.1/src/qpwgraph.cpp 2022-05-29 11:14:34.000000000 +0200
@@ -187,7 +187,7 @@
}
-// Local server conection slot.
+// Local server connection slot.
void qpwgraph_application::newConnectionSlot (void)
{
QLocalSocket *socket = m_server->nextPendingConnection();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.2.6/src/qpwgraph_canvas.cpp new/qpwgraph-v0.3.1/src/qpwgraph_canvas.cpp
--- old/qpwgraph-v0.2.6/src/qpwgraph_canvas.cpp 2022-04-23 09:43:07.000000000 +0200
+++ new/qpwgraph-v0.3.1/src/qpwgraph_canvas.cpp 2022-05-29 11:14:34.000000000 +0200
@@ -199,11 +199,17 @@
{
qpwgraph_item *item = m_item;
+ if (item && item->type() == qpwgraph_connect::Type)
+ item = nullptr;
+
if (item == nullptr) {
- const QList<QGraphicsItem *>& list
- = m_scene->selectedItems();
- if (!list.isEmpty())
- item = static_cast<qpwgraph_item *> (list.first());
+ foreach (QGraphicsItem *item2, m_scene->selectedItems()) {
+ if (item2->type() == qpwgraph_connect::Type)
+ continue;
+ item = static_cast<qpwgraph_item *> (item2);
+ if (item2->type() == qpwgraph_node::Type)
+ break;
+ }
}
return item;
@@ -990,6 +996,9 @@
}
else return;
+ m_selected_nodes = 0;
+ m_scene->clearSelection();
+
m_editor->show();
m_editor->setEnabled(true);
m_editor->selectAll();
@@ -1092,7 +1101,11 @@
if (m_settings == nullptr || node == nullptr)
return false;
- const QString& node_key = nodeKey(node);
+ // Assume node name-keys have been added before this...
+ //
+ const qpwgraph_node::NodeNameKey name_key(node);
+ const int n = m_node_keys.values(name_key).count();
+ const QString& node_key = nodeKey(node, n);
m_settings->beginGroup(NodeAliasesGroup);
const QString& node_title
@@ -1107,10 +1120,9 @@
= m_settings->value('/' + node_key).toPointF();
m_settings->endGroup();
- if (node_pos.isNull())
- return false;
+ if (!node_pos.isNull())
+ node->setPos(node_pos);
- node->setPos(node_pos);
return true;
}
@@ -1120,7 +1132,11 @@
if (m_settings == nullptr || node == nullptr)
return false;
- const QString& node_key = nodeKey(node);
+ // Assume node name-keys are to be removed after this...
+ //
+ const qpwgraph_node::NodeNameKey name_key(node);
+ const int n = m_node_keys.values(name_key).count();
+ const QString& node_key = nodeKey(node, n);
m_settings->beginGroup(NodeAliasesGroup);
if (node->nodeName() != node->nodeTitle()) {
@@ -1216,21 +1232,29 @@
if (m_settings == nullptr)
return false;
+ QList<qpwgraph_node *> nodes;
+
const QList<QGraphicsItem *> items(m_scene->items());
foreach (QGraphicsItem *item, items) {
if (item->type() == qpwgraph_node::Type) {
qpwgraph_node *node = static_cast<qpwgraph_node *> (item);
- if (node) {
- const QString& node_key = nodeKey(node);
- m_settings->beginGroup(NodePosGroup);
- m_settings->setValue('/' + node_key, node->pos());
- m_settings->endGroup();
- m_settings->beginGroup(NodeAliasesGroup);
- if (node->nodeName() != node->nodeTitle())
- m_settings->setValue('/' + node_key, node->nodeTitle());
- else
- m_settings->remove('/' + node_key);
- m_settings->endGroup();
+ if (node && !nodes.contains(node)) {
+ int n = 0;
+ const QList<qpwgraph_node *>& nodes2
+ = m_node_keys.values(qpwgraph_node::NodeNameKey(node));
+ foreach (qpwgraph_node *node2, nodes2) {
+ const QString& node2_key = nodeKey(node2, ++n);
+ m_settings->beginGroup(NodePosGroup);
+ m_settings->setValue('/' + node2_key, node2->pos());
+ m_settings->endGroup();
+ m_settings->beginGroup(NodeAliasesGroup);
+ if (node2->nodeName() != node2->nodeTitle())
+ m_settings->setValue('/' + node2_key, node2->nodeTitle());
+ else
+ m_settings->remove('/' + node2_key);
+ m_settings->endGroup();
+ nodes.append(node2);
+ }
}
}
else
@@ -1270,9 +1294,13 @@
// Graph node/port key helpers.
-QString qpwgraph_canvas::nodeKey ( qpwgraph_node *node ) const
+QString qpwgraph_canvas::nodeKey ( qpwgraph_node *node, int n ) const
{
QString node_key = node->nodeName();
+ if (n > 1) {
+ node_key += '-';
+ node_key += QString::number(n - 1);
+ }
switch (node->nodeMode()) {
case qpwgraph_item::Input:
@@ -1289,7 +1317,7 @@
}
-QString qpwgraph_canvas::portKey ( qpwgraph_port *port ) const
+QString qpwgraph_canvas::portKey ( qpwgraph_port *port, int n ) const
{
QString port_key;
@@ -1300,6 +1328,10 @@
port_key += node->nodeName();
port_key += ':';
port_key += port->portName();
+ if (n > 1) {
+ port_key += '-';
+ port_key += QString::number(n - 1);
+ }
switch (port->portMode()) {
case qpwgraph_item::Input:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.2.6/src/qpwgraph_canvas.h new/qpwgraph-v0.3.1/src/qpwgraph_canvas.h
--- old/qpwgraph-v0.2.6/src/qpwgraph_canvas.h 2022-04-23 09:43:07.000000000 +0200
+++ new/qpwgraph-v0.3.1/src/qpwgraph_canvas.h 2022-05-29 11:14:34.000000000 +0200
@@ -196,8 +196,8 @@
void keyPressEvent(QKeyEvent *event);
// Graph node/port key helpers.
- QString nodeKey(qpwgraph_node *node) const;
- QString portKey(qpwgraph_port *port) const;
+ QString nodeKey(qpwgraph_node *node, int n = 0) const;
+ QString portKey(qpwgraph_port *port, int n = 0) const;
// Zoom in rectangle range.
void zoomFitRange(const QRectF& range_rect);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.2.6/src/qpwgraph_form.cpp new/qpwgraph-v0.3.1/src/qpwgraph_form.cpp
--- old/qpwgraph-v0.2.6/src/qpwgraph_form.cpp 2022-04-23 09:43:07.000000000 +0200
+++ new/qpwgraph-v0.3.1/src/qpwgraph_form.cpp 2022-05-29 11:14:34.000000000 +0200
@@ -95,7 +95,9 @@
{
// Setup UI struct...
m_ui.setupUi(this);
-
+#if QT_VERSION < QT_VERSION_CHECK(6, 1, 0)
+ QMainWindow::setWindowIcon(QIcon(":/images/qpwgraph.png"));
+#endif
m_config = new qpwgraph_config("rncbc.org", "qpwgraph");
m_ui.graphCanvas->setSettings(m_config->settings());
@@ -1149,16 +1151,15 @@
-// Whether we can close current patchbay.
+// Whether we can close/quit current patchbay.
bool qpwgraph_form::patchbayQueryClose (void)
{
bool ret = true;
- const QString& title = tr("Warning");
const qpwgraph_patchbay *patchbay
= m_ui.graphCanvas->patchbay();
if (patchbay && patchbay->isDirty()) {
showNormal();
- switch (QMessageBox::warning(this, title,
+ switch (QMessageBox::warning(this, tr("Warning"),
tr("The current patchbay has been changed:\n\n\"%1\"\n\n"
"Do you want to save the changes?").arg(patchbayFileName()),
QMessageBox::Save |
@@ -1174,10 +1175,22 @@
break;
}
}
- else
+
+ return ret;
+}
+
+
+bool qpwgraph_form::patchbayQueryQuit (void)
+{
+ if (!patchbayQueryClose())
+ return false;
+
+ bool ret = true;
+ const qpwgraph_patchbay *patchbay
+ = m_ui.graphCanvas->patchbay();
if (patchbay && patchbay->isActivated()) {
showNormal();
- ret = (QMessageBox::warning(this, title,
+ ret = (QMessageBox::warning(this, tr("Warning"),
tr("A patchbay is currently activated:\n\n\"%1\"\n\n"
"Are you sure you want to quit?").arg(patchbayFileName()),
QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok);
@@ -1261,7 +1274,7 @@
}
else
#endif
- if (patchbayQueryClose()) {
+ if (patchbayQueryQuit()) {
hide();
QMainWindow::closeEvent(event);
} else {
@@ -1482,7 +1495,7 @@
// Forcibly quit application.
void qpwgraph_form::closeQuit (void)
{
- if (!patchbayQueryClose())
+ if (!patchbayQueryQuit())
return;
if (isVisible())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.2.6/src/qpwgraph_form.h new/qpwgraph-v0.3.1/src/qpwgraph_form.h
--- old/qpwgraph-v0.2.6/src/qpwgraph_form.h 2022-04-23 09:43:07.000000000 +0200
+++ new/qpwgraph-v0.3.1/src/qpwgraph_form.h 2022-05-29 11:14:34.000000000 +0200
@@ -156,8 +156,9 @@
QString patchbayFileExt() const;
QString patchbayFileFilter() const;
- // Whether we can close current patchbay.
+ // Whether we can close/quit current patchbay.
bool patchbayQueryClose();
+ bool patchbayQueryQuit();
// Context-menu event handler.
void contextMenuEvent(QContextMenuEvent *event);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.2.6/src/qpwgraph_form.ui new/qpwgraph-v0.3.1/src/qpwgraph_form.ui
--- old/qpwgraph-v0.2.6/src/qpwgraph_form.ui 2022-04-23 09:43:07.000000000 +0200
+++ new/qpwgraph-v0.3.1/src/qpwgraph_form.ui 2022-05-29 11:14:34.000000000 +0200
@@ -246,7 +246,7 @@
<string>Connect selected ports</string>
</property>
<property name="shortcut">
- <string>Ins</string>
+ <string>Ctrl+C</string>
</property>
</action>
<action name="graphDisconnectAction">
@@ -266,7 +266,7 @@
<string>Disconnect selected ports</string>
</property>
<property name="shortcut">
- <string>Del</string>
+ <string>Ctrl+D</string>
</property>
</action>
<action name="patchbayNewAction">
@@ -488,7 +488,7 @@
<string>Rename Item</string>
</property>
<property name="shortcut">
- <string/>
+ <string>F2</string>
</property>
</action>
<action name="viewMenubarAction">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.2.6/src/qpwgraph_patchbay.cpp new/qpwgraph-v0.3.1/src/qpwgraph_patchbay.cpp
--- old/qpwgraph-v0.2.6/src/qpwgraph_patchbay.cpp 2022-04-23 09:43:07.000000000 +0200
+++ new/qpwgraph-v0.3.1/src/qpwgraph_patchbay.cpp 2022-05-29 11:14:34.000000000 +0200
@@ -364,16 +364,14 @@
port2->portName());
Items::ConstIterator iter = m_items.constFind(item);
const Items::ConstIterator& iter_end = m_items.constEnd();
- if (iter == iter_end && connect) {
+ if (iter == iter_end && connect)
m_items.insert(item, new Item(item));
- ++m_dirty;
- }
else
if (iter != iter_end && !connect) {
delete iter.value();
m_items.erase(iter);
- ++m_dirty;
}
+ ++m_dirty;
}
}
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package wayshot for openSUSE:Factory checked in at 2022-05-30 12:43:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wayshot (Old)
and /work/SRC/openSUSE:Factory/.wayshot.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wayshot"
Mon May 30 12:43:46 2022 rev:4 rq:979686 version:1.1.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/wayshot/wayshot.changes 2022-05-18 13:13:43.094690100 +0200
+++ /work/SRC/openSUSE:Factory/.wayshot.new.2254/wayshot.changes 2022-05-30 12:44:36.996443729 +0200
@@ -1,0 +2,17 @@
+Sun May 29 15:41:06 UTC 2022 - socvirnyl.estela(a)gmail.com
+
+- Update to version 1.1.7~0:
+ * [update] replace xdg-output-handler with wl_output
+ * [update] nix deps bump and add repology to readme
+ * [update] Sane error message on missing scrcpy.
+ * [optimize dependencies] - Patch by jirutka
+ * [update] Workflow.
+ * [update] Bump dependencies.
+ * [update] Readme
+ * [update] Remove testing code.
+ * [update] Fixes
+ * [update] Add workflow.
+
+- Use zstd compression :)
+
+-------------------------------------------------------------------
Old:
----
vendor.tar.xz
wayshot-1.1.5~1.tar.xz
New:
----
vendor.tar.zst
wayshot-1.1.7.tar.zst
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wayshot.spec ++++++
--- /var/tmp/diff_new_pack.yAVWD6/_old 2022-05-30 12:44:37.784444778 +0200
+++ /var/tmp/diff_new_pack.yAVWD6/_new 2022-05-30 12:44:37.788444784 +0200
@@ -19,14 +19,14 @@
%global rustflags '-Clink-arg=-Wl,-z,relro,-z,now'
Name: wayshot
-Version: 1.1.5~1
+Version: 1.1.7
Release: 0
Summary: Screenshot tool for wlroots based compositors
License: (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND BSD-3-Clause AND ISC AND MIT AND Zlib AND BSD-2-Clause
Group: Productivity/Graphics/Other
URL: https://github.com/waycrate/wayshot
-Source0: %{name}-%{version}.tar.xz
-Source1: vendor.tar.xz
+Source0: %{name}-%{version}.tar.zst
+Source1: vendor.tar.zst
Source2: cargo_config
BuildRequires: cargo-packaging
++++++ _service ++++++
--- /var/tmp/diff_new_pack.yAVWD6/_old 2022-05-30 12:44:37.820444826 +0200
+++ /var/tmp/diff_new_pack.yAVWD6/_new 2022-05-30 12:44:37.824444832 +0200
@@ -1,11 +1,10 @@
<services>
<service mode="disabled" name="obs_scm">
<param name="url">https://github.com/waycrate/wayshot.git</param>
- <param name="versionformat">@PARENT_TAG@~@TAG_OFFSET@</param>
+ <param name="versionformat">@PARENT_TAG@</param>
<param name="scm">git</param>
- <param name="revision">6b67b97bc6ad878f9ea91b069943d3953c6548fe</param>
- <param name="match-tag">*</param>
- <param name="versionrewrite-pattern">(\d+\.\d+\.\d+)</param>
+ <param name="revision">0469431138d95a2a0ed528c7e796659047a0897f</param>
+ <param name="versionrewrite-pattern">(.*)</param>
<param name="versionrewrite-replacement">\1</param>
<param name="changesgenerate">enable</param>
<param name="changesauthor">socvirnyl.estela(a)gmail.com</param>
@@ -13,12 +12,12 @@
<service mode="disabled" name="tar" />
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
- <param name="compression">xz</param>
+ <param name="compression">zst</param>
</service>
<service mode="disabled" name="set_version"/>
<service name="cargo_vendor" mode="disabled">
<param name="srcdir">wayshot</param>
- <param name="compression">xz</param>
+ <param name="compression">zst</param>
<param name="update">true</param>
</service>
<service name="cargo_audit" mode="disabled">
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-control for openSUSE:Factory checked in at 2022-05-30 12:43:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-control (Old)
and /work/SRC/openSUSE:Factory/.python-control.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-control"
Mon May 30 12:43:45 2022 rev:16 rq:979682 version:0.9.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-control/python-control.changes 2022-02-13 00:16:16.144264686 +0100
+++ /work/SRC/openSUSE:Factory/.python-control.new.2254/python-control.changes 2022-05-30 12:44:34.708440684 +0200
@@ -1,0 +2,26 @@
+Sun May 29 10:07:56 UTC 2022 - Ben Greiner <code(a)bnavigator.de>
+
+- Update to 0.9.2
+ * Improvements in I/O systems, stochastic systems,
+ optimization-based control, Nyquist plots
+ * Round to nearest integer decade for default omega vector by
+ @bnavigator in #688
+ * Fix in documentation of ss2tf by @miroslavfikar in #695
+ * Interpret str-type args to interconnect as non-sequence by
+ @roryyorke in #698
+ * Fixes to various optimization-based control functions by
+ @murrayrm in #709
+ * I/O system enhancements by @murrayrm in #710
+ * Optimal control enhancements by @murrayrm in #712
+ * Keyword argument checking by @murrayrm in #713
+ * Stochastic systems additions by @murrayrm in #714
+ * Updated system class functionality by @murrayrm in #721
+ * Bug fix and improvements to Nyquist plots by @murrayrm in #722
+ * Add linform to compute linear system L-infinity norm by
+ @roryyorke in #729
+ * Improvements to Nichols chart plotting by @roryyorke in #723
+ * Add envs to gitignore by @s35t in #731
+ * Fix README.rst for twine by @murrayrm in #738
+- Drop 688.patch fixed upstream
+
+-------------------------------------------------------------------
Old:
----
688.patch
control-0.9.1.tar.gz
New:
----
control-0.9.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-control.spec ++++++
--- /var/tmp/diff_new_pack.Z89BKF/_old 2022-05-30 12:44:35.976442372 +0200
+++ /var/tmp/diff_new_pack.Z89BKF/_new 2022-05-30 12:44:35.980442377 +0200
@@ -18,15 +18,13 @@
%define skip_python2 1
Name: python-control
-Version: 0.9.1
+Version: 0.9.2
Release: 0
Summary: Python control systems library
License: BSD-3-Clause
-URL: http://python-control.org
+URL: https://python-control.org
Source: https://files.pythonhosted.org/packages/source/c/control/control-%{version}…
Source1: %{name}-rpmlintrc
-# PATCH-FIX-UPSTREAM - https://github.com/python-control/python-control/pull/688
-Patch1: 688.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -71,10 +69,8 @@
# preload malloc library to avoid free() error on i586 architecture
if [[ $(getconf LONG_BIT) == 32 ]]; then
export LD_PRELOAD="%{_libdir}/libjemalloc.so.2"
-# segfault on i586 (?)
-donttest=" or test_nichols"
fi
-%pytest -k "not (ifanything $donttest)"
+%pytest
%files %{python_files}
%doc ChangeLog README.rst
++++++ control-0.9.1.tar.gz -> control-0.9.2.tar.gz ++++++
++++ 12368 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rainbow for openSUSE:Factory checked in at 2022-05-30 12:43:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rainbow (Old)
and /work/SRC/openSUSE:Factory/.rainbow.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rainbow"
Mon May 30 12:43:43 2022 rev:3 rq:979672 version:2.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rainbow/rainbow.changes 2020-03-11 18:51:01.987559167 +0100
+++ /work/SRC/openSUSE:Factory/.rainbow.new.2254/rainbow.changes 2022-05-30 12:44:28.320432183 +0200
@@ -1,0 +2,8 @@
+Thu May 26 18:55:31 UTC 2022 - Andreas Stieger <andreas.stieger(a)gmx.de>
+
+- update to 2.8.0:
+ * add support for light variant of all colors
+ * add builtin config for tcpdump
+- Correct license to GPL-3.0-or-later and ship it in all packages
+
+-------------------------------------------------------------------
Old:
----
rainbow-2.7.1.tar.gz
New:
----
rainbow-2.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rainbow.spec ++++++
--- /var/tmp/diff_new_pack.WqfLxD/_old 2022-05-30 12:44:29.072433184 +0200
+++ /var/tmp/diff_new_pack.WqfLxD/_new 2022-05-30 12:44:29.080433194 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rainbow
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2019, Martin Hauke <mardnh(a)gmx.de>
#
# All modifications and additions to the file contributed by third parties
@@ -18,10 +18,10 @@
Name: rainbow
-Version: 2.7.1
+Version: 2.8.0
Release: 0
Summary: Colorize commands output or STDIN using patterns
-License: GPL-3.0-only
+License: GPL-3.0-or-later
Group: System/Console
URL: https://github.com/nicoulaj/rainbow
Source: https://github.com/nicoulaj/rainbow/archive/%{version}.tar.gz#/%{name}-%{ve…
@@ -56,7 +56,7 @@
%prep
%setup -q
-sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' scripts/rainbow
+sed -i 's|#!%{_bindir}/python|#!%{_bindir}/python3|g' scripts/rainbow
%build
%python3_build
@@ -76,9 +76,11 @@
%{_mandir}/man1/%{name}.1%{?ext_man}
%files bash-completion
+%license COPYING
%{_datadir}/bash-completion/completions/%{name}
%files zsh-completion
+%license COPYING
%dir %{_sysconfdir}/zsh_completion.d
%config %{_sysconfdir}/zsh_completion.d/%{name}
++++++ rainbow-2.7.1.tar.gz -> rainbow-2.8.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/.github/dependabot.yml new/rainbow-2.8.0/.github/dependabot.yml
--- old/rainbow-2.7.1/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/rainbow-2.8.0/.github/dependabot.yml 2022-01-09 20:56:55.000000000 +0100
@@ -0,0 +1,13 @@
+version: 2
+
+updates:
+
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: weekly
+
+ - package-ecosystem: pip
+ directory: "/"
+ schedule:
+ interval: weekly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/.github/workflows/benchmarks.yml new/rainbow-2.8.0/.github/workflows/benchmarks.yml
--- old/rainbow-2.7.1/.github/workflows/benchmarks.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/rainbow-2.8.0/.github/workflows/benchmarks.yml 2022-01-09 20:56:55.000000000 +0100
@@ -0,0 +1,27 @@
+name: Benchmarks
+
+on: [push, pull_request]
+
+jobs:
+ benchmark:
+
+ name: 'benchmarks'
+
+ runs-on: 'ubuntu-latest'
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+
+ - name: Set up Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.10'
+
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install tox
+
+ - name: Run benchmarks
+ run: tox -e benchmarks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/.github/workflows/lint.yml new/rainbow-2.8.0/.github/workflows/lint.yml
--- old/rainbow-2.7.1/.github/workflows/lint.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/rainbow-2.8.0/.github/workflows/lint.yml 2022-01-09 20:56:55.000000000 +0100
@@ -0,0 +1,27 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+ lint:
+
+ name: 'lint'
+
+ runs-on: 'ubuntu-latest'
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+
+ - name: Set up Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.10'
+
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install tox
+
+ - name: Run checks
+ run: tox -e lint
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/.github/workflows/packages.yml new/rainbow-2.8.0/.github/workflows/packages.yml
--- old/rainbow-2.7.1/.github/workflows/packages.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/rainbow-2.8.0/.github/workflows/packages.yml 2022-01-09 20:56:55.000000000 +0100
@@ -0,0 +1,39 @@
+name: Packages
+
+on:
+ push:
+ pull_request:
+ release:
+ types: [released]
+
+jobs:
+
+ python-packages:
+
+ name: 'wheel'
+
+ runs-on: 'ubuntu-latest'
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+
+ - name: Set up Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.10'
+
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install wheel
+
+ - name: Build source distribution and wheel package
+ run: python setup.py sdist bdist_wheel
+
+ - name: Publish on PyPI repository
+ if: github.event_name == 'release' && github.event.action == 'released'
+ uses: pypa/gh-action-pypi-publish@release/v1
+ with:
+ user: __token__
+ password: ${{ secrets.PYPI_API_TOKEN }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/.github/workflows/tests.yml new/rainbow-2.8.0/.github/workflows/tests.yml
--- old/rainbow-2.7.1/.github/workflows/tests.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/rainbow-2.8.0/.github/workflows/tests.yml 2022-01-09 20:56:55.000000000 +0100
@@ -0,0 +1,48 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+ test:
+
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ 'ubuntu-latest', 'macos-latest' ]
+ python: [ '3.6', '3.7', '3.8', '3.9', '3.10', 'pypy-3.6', 'pypy-3.7', 'pypy-3.8' ]
+
+ runs-on: ${{ matrix.os }}
+
+ name: ${{ matrix.os }} - python ${{ matrix.python }}
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+
+ - name: Set up Python ${{ matrix.python }}
+ uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.python }}
+
+ - name: Set up pip cache
+ uses: actions/cache@v2
+ with:
+ path: ~/.cache/pip
+ key: ${{ matrix.os }}-pip
+
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install tox tox-gh-actions
+
+ - name: Run tests
+ run: tox
+
+ - name: Publish code coverage to CodeClimate
+ uses: paambaati/codeclimate-action(a)v3.0.0
+ if: matrix.os == 'ubuntu-latest' && matrix.python == '3.10'
+ continue-on-error: true
+ with:
+ coverageLocations: ${{github.workspace}}/build/tests/*/reports/coverage.xml:coverage.py
+ env:
+ CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/.gitignore new/rainbow-2.8.0/.gitignore
--- old/rainbow-2.7.1/.gitignore 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/.gitignore 2022-01-09 20:56:55.000000000 +0100
@@ -36,3 +36,6 @@
.coverage.*
out/
.pytest_cache/
+*.rpm
+*.deb
+*.tar.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/.travis.yml new/rainbow-2.8.0/.travis.yml
--- old/rainbow-2.7.1/.travis.yml 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,84 +0,0 @@
-# ----------------------------------------------------------------------
-# rainbow, a terminal colorizer - https://github.com/nicoulaj/rainbow
-# copyright (c) 2010-2018 rainbow contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# ----------------------------------------------------------------------
-
-sudo: false
-
-language: python
-
-cache: pip
-
-matrix:
- include:
- - python: 2.7
- - python: 3.4
- - python: 3.5
- - python: 3.6
- - python: 3.7
- dist: xenial
- sudo: true
- - python: 3.8-dev
- dist: xenial
- sudo: true
- - python: nightly
- dist: xenial
- sudo: true
- - python: pypy
- - python: pypy3
- allow_failures:
- - python: 3.8-dev
- - python: nightly
-
-install:
- - pip install tox-travis codeclimate-test-reporter
-
-script:
- - tox
- - tox -e lint
- - tox -e benchmarks
-
-after_success:
- - bash <(curl -s https://codecov.io/bash)
- - codeclimate-test-reporter
-
-deploy:
- provider: pypi
- distributions: sdist bdist_wheel
- user: nicoulaj
- password:
- secure: "PH03sct2gKSxhfefRCNVYUqHGi5gPxBfMBe4ZIdNXR6WbfoLn/tOv1MkIasptABMHkhuSJ+Rr7o4GfsCXUmSuOPdMx9xsFhWyA/HBAeHRJpg4auDPUNIxGn89YJNVsWipJhL9vxjEXhuI1ySzaPR2KQ7wgYa6rfT9yGn34aQUBA="
- on:
- tags: true
- python: 3.6
-
-addons:
- code_climate:
- repo_token: $CODECLIMATE_REPO_TOKEN
-
-notifications:
- email: false
- webhooks:
- urls: https://webhooks.gitter.im/e/3d9dabdef1a3d8b2ae8d
- irc:
- channels:
- - "chat.freenode.net#nicoulaj"
- on_success: never
- on_failure: change
- on_start: never
- use_notice: true
- template:
- - "%{repository}/%{branch}#%{build_number}: %{message} | changes : %{compare_url} | build : %{build_url}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/README.rst new/rainbow-2.8.0/README.rst
--- old/rainbow-2.7.1/README.rst 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/README.rst 2022-01-09 20:56:55.000000000 +0100
@@ -13,13 +13,13 @@
:target: https://pypi.org/project/rainbow
:alt: python versions
-.. image:: https://travis-ci.org/nicoulaj/rainbow.svg?branch=master
- :target: https://travis-ci.org/nicoulaj/rainbow
+.. image:: https://github.com/nicoulaj/rainbow/actions/workflows/tests.yml/badge.svg
+ :target: https://github.com/nicoulaj/rainbow/actions
:alt: continuous integration
-.. image:: https://codecov.io/gh/nicoulaj/rainbow/branch/master/graph/badge.svg
- :target: https://codecov.io/gh/nicoulaj/rainbow
- :alt: test coverage
+.. image:: https://api.codeclimate.com/v1/badges/724f29330eb898c7516b/test_coverage
+ :target: https://codeclimate.com/github/nicoulaj/rainbow/test_coverage
+ :alt: test Coverage
.. image:: https://badges.gitter.im/nicoulaj/rainbow.svg
:target: https://gitter.im/nicoulaj/rainbow
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/packagecore.yaml new/rainbow-2.8.0/packagecore.yaml
--- old/rainbow-2.7.1/packagecore.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/rainbow-2.8.0/packagecore.yaml 2022-01-09 20:56:55.000000000 +0100
@@ -0,0 +1,40 @@
+name: rainbow
+maintainer: Julien Nicoulaud <julien.nicoulaud(a)gmail.com>
+license: GPL3
+summary: Easily colorize commands output using patterns.
+homepage: https://github.com/nicoulaj/rainbow
+
+commands:
+ compile: |
+ python3 -m pip install --user '.[build]'
+ python3 setup.py build
+ install: |
+ python3 setup.py install --prefix=/usr --root="${BP_DESTDIR}/" --optimize=1 --skip-build --single-version-externally-managed --install-lib $(python3 -c 'import site; print(site.getsitepackages()[0])')
+ install -v -m755 -d "${BP_DESTDIR}/etc/bash_completion.d"
+ install -v -m644 build/completion/rainbow "${BP_DESTDIR}/etc/bash_completion.d/"
+ install -v -m755 -d "${BP_DESTDIR}/usr/share/zsh/site-functions"
+ install -v -m644 build/completion/_rainbow "${BP_DESTDIR}/usr/share/zsh/site-functions/"
+ install -v -m755 -d "${BP_DESTDIR}/usr/share/man/man1"
+ install -v -m644 build/man/rainbow.1.gz "${pkgdir}/usr/share/man/man1/"
+ testinstall: |
+ /usr/bin/rainbow --help
+ /usr/bin/rainbow --version
+
+packages:
+ centos7.7: &dependencies-default
+ builddeps:
+ - python3
+ - python3-pip
+ - python3-setuptools
+ deps:
+ - python3
+ centos8.0: *dependencies-default
+ debian9: *dependencies-default
+ debian10: *dependencies-default
+ fedora32: *dependencies-default
+ opensuse.tumbleweed: *dependencies-default
+ opensuse42.3: *dependencies-default
+ opensuse15.1: *dependencies-default
+ opensuse15.2: *dependencies-default
+ ubuntu18.04: *dependencies-default
+ ubuntu20.04: *dependencies-default
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/rainbow/__init__.py new/rainbow-2.8.0/rainbow/__init__.py
--- old/rainbow-2.7.1/rainbow/__init__.py 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/rainbow/__init__.py 2022-01-09 20:56:55.000000000 +0100
@@ -28,7 +28,7 @@
__copyright__ = 'copyright 2010-2018 rainbow contributors'
__license__ = 'GPLv3'
__description__ = 'Colorize commands output using patterns.'
-__version__ = '2.7.1'
+__version__ = '2.8.0'
LOGGER = logging.getLogger(__prog__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/rainbow/ansi.py new/rainbow-2.8.0/rainbow/ansi.py
--- old/rainbow-2.7.1/rainbow/ansi.py 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/rainbow/ansi.py 2022-01-09 20:56:55.000000000 +0100
@@ -17,19 +17,29 @@
# ----------------------------------------------------------------------
ANSI_FOREGROUND_RED = chr(27) + '[31m'
+ANSI_FOREGROUND_LIGHT_RED = chr(27) + '[91m'
ANSI_FOREGROUND_GREEN = chr(27) + '[32m'
+ANSI_FOREGROUND_LIGHT_GREEN = chr(27) + '[92m'
ANSI_FOREGROUND_YELLOW = chr(27) + '[33m'
+ANSI_FOREGROUND_LIGHT_YELLOW = chr(27) + '[93m'
ANSI_FOREGROUND_BLUE = chr(27) + '[34m'
+ANSI_FOREGROUND_LIGHT_BLUE = chr(27) + '[94m'
ANSI_FOREGROUND_MAGENTA = chr(27) + '[35m'
ANSI_FOREGROUND_CYAN = chr(27) + '[36m'
+ANSI_FOREGROUND_LIGHT_CYAN = chr(27) + '[96m'
ANSI_FOREGROUND_RESET = chr(27) + '[39m'
ANSI_BACKGROUND_RED = chr(27) + '[41m'
+ANSI_BACKGROUND_LIGHT_RED = chr(27) + '[101m'
ANSI_BACKGROUND_GREEN = chr(27) + '[42m'
+ANSI_BACKGROUND_LIGHT_GREEN = chr(27) + '[102m'
ANSI_BACKGROUND_YELLOW = chr(27) + '[43m'
+ANSI_BACKGROUND_LIGHT_YELLOW = chr(27) + '[103m'
ANSI_BACKGROUND_BLUE = chr(27) + '[44m'
+ANSI_BACKGROUND_LIGHT_BLUE = chr(27) + '[104m'
ANSI_BACKGROUND_MAGENTA = chr(27) + '[45m'
ANSI_BACKGROUND_CYAN = chr(27) + '[46m'
+ANSI_BACKGROUND_LIGHT_CYAN = chr(27) + '[106m'
ANSI_BACKGROUND_RESET = chr(27) + '[49m'
ANSI_BOLD = chr(27) + '[1m'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/rainbow/build.py new/rainbow-2.8.0/rainbow/build.py
--- old/rainbow-2.7.1/rainbow/build.py 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/rainbow/build.py 2022-01-09 20:56:55.000000000 +0100
@@ -22,7 +22,6 @@
import logging
import os
import shutil
-from distutils import log
from distutils.command.build import build
from distutils.command.clean import clean
from distutils.core import Command
@@ -42,15 +41,15 @@
class Clean(clean): # no cover
- def __init__(self, dist, **kwargs):
- self.paths = None
- clean.__init__(self, dist, **kwargs)
+ def __init__(self, dist):
+ clean.__init__(self, dist)
self.user_options += [
('paths=', 'p', 'paths'),
]
def initialize_options(self):
- clean.initialize_options(self)
+ super(clean, self).initialize_options()
+ self.paths = None
def finalize_options(self):
clean.finalize_options(self)
@@ -64,10 +63,10 @@
if os.path.isdir(path):
remove_tree(path)
elif os.path.isfile(path):
- log.info("removing '%s'", path)
+ self.announce("removing '%s'" % path)
os.remove(path)
else:
- log.info("'%s' does not exist -- can't clean it", path)
+ self.announce("'%s' does not exist -- can't clean it" % path)
class GenerateCompletion(Command):
@@ -78,13 +77,9 @@
('output=', 'O', 'output file')
]
- def __init__(self, dist, **kwargs):
+ def initialize_options(self):
self.shell = None
self.output = None
- Command.__init__(self, dist, **kwargs)
-
- def initialize_options(self):
- pass
def finalize_options(self):
if self.shell is None: # no cover
@@ -114,12 +109,8 @@
('output=', 'O', 'output file')
]
- def __init__(self, dist, **kwargs):
- self.output = None
- Command.__init__(self, dist, **kwargs)
-
def initialize_options(self):
- pass
+ self.output = None
def finalize_options(self):
if self.output is None: # no cover
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/rainbow/config/builtin/tcpdump.cfg new/rainbow-2.8.0/rainbow/config/builtin/tcpdump.cfg
--- old/rainbow-2.7.1/rainbow/config/builtin/tcpdump.cfg 1970-01-01 01:00:00.000000000 +0100
+++ new/rainbow-2.8.0/rainbow/config/builtin/tcpdump.cfg 2022-01-09 20:56:55.000000000 +0100
@@ -0,0 +1,36 @@
+[filters]
+# IPv4 address+port:
+reset-all-after: (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,5}|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})
+magenta-before: \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}
+blue-after: \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\.
+reset-after: \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}
+
+# MAC address:
+yellow: ([0-9a-f]{2}\:){5}[0-9a-f]{2}
+
+# TCP/UDP flags:
+# 1. TCP Flags
+# 2. UDP indicator
+# 3. UDP indicator with checksum indicator
+# Note: Bare "[udp sum ok]" is highlighted because tcpdump will
+# sometimes omit the "UDP"
+cyan: (?<=Flags )\[[SP\.RFU]+\]
+ (?<=\: )UDP
+ (?<=\: )\[udp sum ok\]( UDP)?
+
+# error conditions (UDP, TCP, IPv4):
+red: (?<=\: )\[bad udp cksum.*?\]
+ cksum \S+ \(incorrect.*?\)
+ bad cksum .*?!
+
+# Network-layer Description (e.g. "IP")
+# 1. With -e flag
+# 2. With -e flag where no link layer addresses exist (e.g. VPN interface)
+# 3. Without -e flag
+bold: (?<=ethertype )\S+ \S+(?=,)
+ (?<=^\d{2}\:\d{2}\:\d{2}\.\d{6} AF )[^\s\:]+\s
+ (?<=^\d{2}\:\d{2}\:\d{2}\.\d{6} )[^\s\:]+\s
+
+# Time stamp:
+faint: \d{2}\:\d{2}\:\d{2}\.\d{6}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/rainbow/config/parser.py new/rainbow-2.8.0/rainbow/config/parser.py
--- old/rainbow-2.7.1/rainbow/config/parser.py 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/rainbow/config/parser.py 2022-01-09 20:56:55.000000000 +0100
@@ -80,7 +80,7 @@
elif key == 'enable-stderr-filtering':
try:
enable_stderr_filtering = config_parser.getboolean(section, 'enable-stderr-filtering')
- except ValueError as e:
+ except ValueError:
self.error_handler(
'Invalid value "%s" for key "%s" in config "%s"' % (value, key, config_file))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/rainbow/filter.py new/rainbow-2.8.0/rainbow/filter.py
--- old/rainbow-2.7.1/rainbow/filter.py 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/rainbow/filter.py 2022-01-09 20:56:55.000000000 +0100
@@ -53,24 +53,44 @@
help='print pattern in red',
before=ansi.ANSI_FOREGROUND_RED,
after=ansi.ANSI_FOREGROUND_RESET),
+ Filter(name='foreground-light-red',
+ long_option='lightred',
+ help='print pattern in light red',
+ before=ansi.ANSI_FOREGROUND_LIGHT_RED,
+ after=ansi.ANSI_FOREGROUND_RESET),
Filter(name='foreground-green',
short_option='g',
long_option='green',
help='print pattern in green',
before=ansi.ANSI_FOREGROUND_GREEN,
after=ansi.ANSI_FOREGROUND_RESET),
+ Filter(name='foreground-light-green',
+ long_option='lightgreen',
+ help='print pattern in light green',
+ before=ansi.ANSI_FOREGROUND_LIGHT_GREEN,
+ after=ansi.ANSI_FOREGROUND_RESET),
Filter(name='foreground-yellow',
short_option='y',
long_option='yellow',
help='print pattern in yellow',
before=ansi.ANSI_FOREGROUND_YELLOW,
after=ansi.ANSI_FOREGROUND_RESET),
+ Filter(name='foreground-light-yellow',
+ long_option='lightyellow',
+ help='print pattern in light yellow',
+ before=ansi.ANSI_FOREGROUND_LIGHT_YELLOW,
+ after=ansi.ANSI_FOREGROUND_RESET),
Filter(name='foreground-blue',
short_option='b',
long_option='blue',
help='print pattern in blue',
before=ansi.ANSI_FOREGROUND_BLUE,
after=ansi.ANSI_FOREGROUND_RESET),
+ Filter(name='foreground-light-blue',
+ long_option='lightblue',
+ help='print pattern in light blue',
+ before=ansi.ANSI_FOREGROUND_LIGHT_BLUE,
+ after=ansi.ANSI_FOREGROUND_RESET),
Filter(name='foreground-magenta',
short_option='m',
long_option='magenta',
@@ -83,22 +103,43 @@
help='print pattern in cyan',
before=ansi.ANSI_FOREGROUND_CYAN,
after=ansi.ANSI_FOREGROUND_RESET),
+ Filter(name='foreground-light-cyan',
+ long_option='lightcyan',
+ help='print pattern in light cyan',
+ before=ansi.ANSI_FOREGROUND_LIGHT_CYAN,
+ after=ansi.ANSI_FOREGROUND_RESET),
Filter(name='foreground-red-before',
long_option='red-before',
help='toggle foreground to red on beginning of pattern',
before=ansi.ANSI_FOREGROUND_RED),
+ Filter(name='foreground-light-red-before',
+ long_option='lightred-before',
+ help='toggle foreground to light red on beginning of pattern',
+ before=ansi.ANSI_FOREGROUND_LIGHT_RED),
Filter(name='foreground-green-before',
long_option='green-before',
help='toggle foreground to green on beginning of pattern',
before=ansi.ANSI_FOREGROUND_GREEN),
+ Filter(name='foreground-light-green-before',
+ long_option='lightgreen-before',
+ help='toggle foreground to light green on beginning of pattern',
+ before=ansi.ANSI_FOREGROUND_LIGHT_GREEN),
Filter(name='foreground-yellow-before',
long_option='yellow-before',
help='toggle foreground to yellow on beginning of pattern',
before=ansi.ANSI_FOREGROUND_YELLOW),
+ Filter(name='foreground-light-yellow-before',
+ long_option='lightyellow-before',
+ help='toggle foreground to light yellow on beginning of pattern',
+ before=ansi.ANSI_FOREGROUND_LIGHT_YELLOW),
Filter(name='foreground-blue-before',
long_option='blue-before',
help='toggle foreground to blue on beginning of pattern',
before=ansi.ANSI_FOREGROUND_BLUE),
+ Filter(name='foreground-light-blue-before',
+ long_option='lightblue-before',
+ help='toggle foreground to light blue on beginning of pattern',
+ before=ansi.ANSI_FOREGROUND_LIGHT_BLUE),
Filter(name='foreground-magenta-before',
long_option='magenta-before',
help='toggle foreground to magenta on beginning of pattern',
@@ -107,6 +148,10 @@
long_option='cyan-before',
help='toggle foreground to cyan on beginning of pattern',
before=ansi.ANSI_FOREGROUND_CYAN),
+ Filter(name='foreground-light-cyan-before',
+ long_option='lightcyan-before',
+ help='toggle foreground to light cyan on beginning of pattern',
+ before=ansi.ANSI_FOREGROUND_LIGHT_CYAN),
Filter(name='foreground-reset-before',
long_option='reset-before',
help='reset foreground color on beginning of pattern',
@@ -115,18 +160,34 @@
long_option='red-after',
help='toggle foreground to red on end of pattern',
after=ansi.ANSI_FOREGROUND_RED),
+ Filter(name='foreground-light-red-after',
+ long_option='lightred-after',
+ help='toggle foreground to light red on end of pattern',
+ after=ansi.ANSI_FOREGROUND_LIGHT_RED),
Filter(name='foreground-green-after',
long_option='green-after',
help='toggle foreground to green on end of pattern',
after=ansi.ANSI_FOREGROUND_GREEN),
+ Filter(name='foreground-light-green-after',
+ long_option='lightgreen-after',
+ help='toggle foreground to light green on end of pattern',
+ after=ansi.ANSI_FOREGROUND_LIGHT_GREEN),
Filter(name='foreground-yellow-after',
long_option='yellow-after',
help='toggle foreground to yellow on end of pattern',
after=ansi.ANSI_FOREGROUND_YELLOW),
+ Filter(name='foreground-light-yellow-after',
+ long_option='lightyellow-after',
+ help='toggle foreground to light yellow on end of pattern',
+ after=ansi.ANSI_FOREGROUND_LIGHT_YELLOW),
Filter(name='foreground-blue-after',
long_option='blue-after',
help='toggle foreground to blue on end of pattern',
after=ansi.ANSI_FOREGROUND_BLUE),
+ Filter(name='foreground-light-blue-after',
+ long_option='lightblue-after',
+ help='toggle foreground to light blue on end of pattern',
+ after=ansi.ANSI_FOREGROUND_LIGHT_BLUE),
Filter(name='foreground-magenta-after',
long_option='magenta-after',
help='toggle foreground to magenta on end of pattern',
@@ -135,6 +196,10 @@
long_option='cyan-after',
help='toggle foreground to cyan on end of pattern',
after=ansi.ANSI_FOREGROUND_CYAN),
+ Filter(name='foreground-light-cyan-after',
+ long_option='lightcyan-after',
+ help='toggle foreground to light cyan on end of pattern',
+ after=ansi.ANSI_FOREGROUND_LIGHT_CYAN),
Filter(name='foreground-reset-after',
long_option='reset-after',
help='reset foreground color on end of pattern',
@@ -150,21 +215,41 @@
help='print pattern with red background',
before=ansi.ANSI_BACKGROUND_RED,
after=ansi.ANSI_BACKGROUND_RESET),
+ Filter(name='background-light-red',
+ long_option='background-lightred',
+ help='print pattern with light red background',
+ before=ansi.ANSI_BACKGROUND_LIGHT_RED,
+ after=ansi.ANSI_BACKGROUND_RESET),
Filter(name='background-green',
long_option='background-green',
help='print pattern with green background',
before=ansi.ANSI_BACKGROUND_GREEN,
after=ansi.ANSI_BACKGROUND_RESET),
+ Filter(name='background-light-green',
+ long_option='background-lightgreen',
+ help='print pattern with light green background',
+ before=ansi.ANSI_BACKGROUND_LIGHT_GREEN,
+ after=ansi.ANSI_BACKGROUND_RESET),
Filter(name='background-yellow',
long_option='background-yellow',
help='print pattern with yellow background',
before=ansi.ANSI_BACKGROUND_YELLOW,
after=ansi.ANSI_BACKGROUND_RESET),
+ Filter(name='background-light-yellow',
+ long_option='background-lightyellow',
+ help='print pattern with light yellow background',
+ before=ansi.ANSI_BACKGROUND_LIGHT_YELLOW,
+ after=ansi.ANSI_BACKGROUND_RESET),
Filter(name='background-blue',
long_option='background-blue',
help='print pattern with blue background',
before=ansi.ANSI_BACKGROUND_BLUE,
after=ansi.ANSI_BACKGROUND_RESET),
+ Filter(name='background-light-blue',
+ long_option='background-lightblue',
+ help='print pattern with light blue background',
+ before=ansi.ANSI_BACKGROUND_LIGHT_BLUE,
+ after=ansi.ANSI_BACKGROUND_RESET),
Filter(name='background-magenta',
long_option='background-magenta',
help='print pattern with magenta background',
@@ -175,22 +260,43 @@
help='print pattern with cyan background',
before=ansi.ANSI_BACKGROUND_CYAN,
after=ansi.ANSI_BACKGROUND_RESET),
+ Filter(name='background-light-cyan',
+ long_option='background-lightcyan',
+ help='print pattern with light cyan background',
+ before=ansi.ANSI_BACKGROUND_LIGHT_CYAN,
+ after=ansi.ANSI_BACKGROUND_RESET),
Filter(name='background-red-before',
long_option='background-red-before',
help='toggle background to red on beginning of pattern',
before=ansi.ANSI_BACKGROUND_RED),
+ Filter(name='background-light-red-before',
+ long_option='background-lightred-before',
+ help='toggle background to light red on beginning of pattern',
+ before=ansi.ANSI_BACKGROUND_LIGHT_RED),
Filter(name='background-green-before',
long_option='background-green-before',
help='toggle background to green on beginning of pattern',
before=ansi.ANSI_BACKGROUND_GREEN),
+ Filter(name='background-light-green-before',
+ long_option='background-lightgreen-before',
+ help='toggle background to light green on beginning of pattern',
+ before=ansi.ANSI_BACKGROUND_LIGHT_GREEN),
Filter(name='background-yellow-before',
long_option='background-yellow-before',
help='toggle background to yellow on beginning of pattern',
before=ansi.ANSI_BACKGROUND_YELLOW),
+ Filter(name='background-light-yellow-before',
+ long_option='background-lightyellow-before',
+ help='toggle background to light yellow on beginning of pattern',
+ before=ansi.ANSI_BACKGROUND_LIGHT_YELLOW),
Filter(name='background-blue-before',
long_option='background-blue-before',
help='toggle background to blue on beginning of pattern',
before=ansi.ANSI_BACKGROUND_BLUE),
+ Filter(name='background-light-blue-before',
+ long_option='background-lightblue-before',
+ help='toggle background to light blue on beginning of pattern',
+ before=ansi.ANSI_BACKGROUND_LIGHT_BLUE),
Filter(name='background-magenta-before',
long_option='background-magenta-before',
help='toggle background to magenta on beginning of pattern',
@@ -199,6 +305,10 @@
long_option='background-cyan-before',
help='toggle background to cyan on beginning of pattern',
before=ansi.ANSI_BACKGROUND_CYAN),
+ Filter(name='background-light-cyan-before',
+ long_option='background-lightcyan-before',
+ help='toggle background to light cyan on beginning of pattern',
+ before=ansi.ANSI_BACKGROUND_LIGHT_CYAN),
Filter(name='background-reset-before',
long_option='background-reset-before',
help='reset background color on beginning of pattern',
@@ -207,18 +317,34 @@
long_option='background-red-after',
help='toggle background to red on end of pattern',
after=ansi.ANSI_BACKGROUND_RED),
+ Filter(name='background-light-red-after',
+ long_option='background-lightred-after',
+ help='toggle background to light red on end of pattern',
+ after=ansi.ANSI_BACKGROUND_LIGHT_RED),
Filter(name='background-green-after',
long_option='background-green-after',
help='toggle background to green on end of pattern',
after=ansi.ANSI_BACKGROUND_GREEN),
+ Filter(name='background-light-green-after',
+ long_option='background-lightgreen-after',
+ help='toggle background to light green on end of pattern',
+ after=ansi.ANSI_BACKGROUND_LIGHT_GREEN),
Filter(name='background-yellow-after',
long_option='background-yellow-after',
help='toggle background to yellow on end of pattern',
after=ansi.ANSI_BACKGROUND_YELLOW),
+ Filter(name='background-light-yellow-after',
+ long_option='background-lightyellow-after',
+ help='toggle background to light yellow on end of pattern',
+ after=ansi.ANSI_BACKGROUND_LIGHT_YELLOW),
Filter(name='background-blue-after',
long_option='background-blue-after',
help='toggle background to blue on end of pattern',
after=ansi.ANSI_BACKGROUND_BLUE),
+ Filter(name='background-light-blue-after',
+ long_option='background-lightblue-after',
+ help='toggle background to light blue on end of pattern',
+ after=ansi.ANSI_BACKGROUND_LIGHT_BLUE),
Filter(name='background-magenta-after',
long_option='background-magenta-after',
help='toggle background to magenta on end of pattern',
@@ -227,6 +353,10 @@
long_option='background-cyan-after',
help='toggle background to cyan on end of pattern',
after=ansi.ANSI_BACKGROUND_CYAN),
+ Filter(name='background-light-cyan-after',
+ long_option='background-lightcyan-after',
+ help='toggle background to light cyan on end of pattern',
+ after=ansi.ANSI_BACKGROUND_LIGHT_CYAN),
Filter(name='background-reset-after',
long_option='background-reset-after',
help='reset background color on end of pattern',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/scripts/rainbow new/rainbow-2.8.0/scripts/rainbow
--- old/rainbow-2.7.1/scripts/rainbow 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/scripts/rainbow 2022-01-09 20:56:55.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# ----------------------------------------------------------------------
# rainbow, a terminal colorizer - https://github.com/nicoulaj/rainbow
# copyright (c) 2010-2018 rainbow contributors
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/setup.cfg new/rainbow-2.8.0/setup.cfg
--- old/rainbow-2.7.1/setup.cfg 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/setup.cfg 2022-01-09 20:56:55.000000000 +0100
@@ -37,3 +37,6 @@
[bdist_wheel]
universal = 1
+
+[flake8]
+max-line-length = 120
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/setup.py new/rainbow-2.8.0/setup.py
--- old/rainbow-2.7.1/setup.py 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/setup.py 2022-01-09 20:56:55.000000000 +0100
@@ -45,35 +45,33 @@
'Intended Audience :: System Administrators',
'Natural Language :: English',
'Programming Language :: Python',
- 'Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.4',
- 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
+ 'Programming Language :: Python :: 3.9',
+ 'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'License :: OSI Approved :: GNU General Public License (GPL)'
],
packages=find_packages(exclude=['tests*']),
include_package_data=True,
+ python_requires='>=3.6',
extras_require={
'build': [
- 'Jinja2==2.7.2',
+ 'Jinja2==3.0.3',
],
'test': [
- # stuck on pytest 3.2.x until next pytest-benchmark release, see
- # https://github.com/ionelmc/pytest-benchmark/commit/cb3ea794bf6019efb63190fa…
- 'pytest==3.2.5',
- 'coverage==4.5.1',
- 'pytest-cov==2.6.0',
- 'pytest-html==1.17.0',
- 'pytest-timeout==1.2.1',
- 'pytest-flake8==1.0.0',
- 'pytest-benchmark==3.1.1',
- 'pygal==2.4.0',
- 'pygaljs==1.0.1'
+ 'pytest==6.2.5',
+ 'coverage==6.2',
+ 'pytest-cov==3.0.0',
+ 'pytest-html==3.1.1',
+ 'pytest-timeout==2.0.2',
+ 'flake8==4.0.1',
+ 'pygal==3.0.0',
+ 'pygaljs==1.0.2',
+ 'pytest-benchmark==3.4.1'
]
},
scripts=['scripts/rainbow'],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/tests/config/test_builtin.py new/rainbow-2.8.0/tests/config/test_builtin.py
--- old/rainbow-2.7.1/tests/config/test_builtin.py 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/tests/config/test_builtin.py 2022-01-09 20:56:55.000000000 +0100
@@ -20,12 +20,20 @@
import pytest
-from rainbow.ansi import ANSI_BACKGROUND_BLUE, ANSI_BACKGROUND_CYAN, ANSI_BACKGROUND_GREEN, ANSI_BACKGROUND_MAGENTA, \
- ANSI_BACKGROUND_RED, ANSI_BACKGROUND_RESET, ANSI_BACKGROUND_YELLOW, ANSI_BLINK, ANSI_BLINK_RAPID, ANSI_BOLD, \
- ANSI_FAINT, ANSI_FOREGROUND_BLUE, ANSI_FOREGROUND_CYAN, ANSI_FOREGROUND_GREEN, ANSI_FOREGROUND_MAGENTA, \
- ANSI_FOREGROUND_RED, ANSI_FOREGROUND_RESET, ANSI_FOREGROUND_YELLOW, ANSI_HIDE, ANSI_ITALIC, ANSI_NEGATIVE, \
- ANSI_RESET_ALL, ANSI_RESET_BLINK, ANSI_RESET_HIDE, ANSI_RESET_INTENSITY, ANSI_RESET_ITALIC, ANSI_RESET_NEGATIVE, \
- ANSI_RESET_UNDERLINE, ANSI_UNDERLINE, ANSI_UNDERLINE_DOUBLE
+from rainbow.ansi import ANSI_BACKGROUND_BLUE, ANSI_BACKGROUND_CYAN, \
+ ANSI_BACKGROUND_GREEN, ANSI_BACKGROUND_MAGENTA, ANSI_BACKGROUND_RED, \
+ ANSI_BACKGROUND_RESET, ANSI_BACKGROUND_YELLOW, ANSI_BACKGROUND_LIGHT_RED, \
+ ANSI_BACKGROUND_LIGHT_GREEN, ANSI_BACKGROUND_LIGHT_YELLOW, \
+ ANSI_BACKGROUND_LIGHT_BLUE, ANSI_BACKGROUND_LIGHT_CYAN, ANSI_BLINK, \
+ ANSI_BLINK_RAPID, ANSI_BOLD, ANSI_FAINT, ANSI_FOREGROUND_BLUE, \
+ ANSI_FOREGROUND_CYAN, ANSI_FOREGROUND_GREEN, ANSI_FOREGROUND_MAGENTA, \
+ ANSI_FOREGROUND_RED, ANSI_FOREGROUND_RESET, ANSI_FOREGROUND_YELLOW, \
+ ANSI_FOREGROUND_LIGHT_RED, ANSI_FOREGROUND_LIGHT_GREEN, \
+ ANSI_FOREGROUND_LIGHT_YELLOW, ANSI_FOREGROUND_LIGHT_BLUE, \
+ ANSI_FOREGROUND_LIGHT_CYAN, ANSI_HIDE, ANSI_ITALIC, ANSI_NEGATIVE, \
+ ANSI_RESET_ALL, ANSI_RESET_BLINK, ANSI_RESET_HIDE, ANSI_RESET_INTENSITY, \
+ ANSI_RESET_ITALIC, ANSI_RESET_NEGATIVE, ANSI_RESET_UNDERLINE, \
+ ANSI_UNDERLINE, ANSI_UNDERLINE_DOUBLE
from rainbow.config.loader import ConfigLoader
from rainbow.transformer import DummyTransformerBuilder, TransformerBuilder, ListTransformer, ReplaceTransformer
from tests.test_utils import BUILTIN_CONFIGS_NAMES, BUILTIN_CONFIGS_REFERENCES, BUILTIN_CONFIGS_REFERENCE_PAIRS
@@ -42,7 +50,7 @@
stderr_builder=DummyTransformerBuilder(),
paths=['rainbow/config/builtin'],
error_handler=errors.append) \
- .load_config_by_name(config, )
+ .load_config_by_name(config)
return stdout_builder.build(), errors
@@ -79,12 +87,22 @@
ReplaceTransformer(ANSI_FOREGROUND_MAGENTA, '[FOREGROUND_MAGENTA]'),
ReplaceTransformer(ANSI_FOREGROUND_CYAN, '[FOREGROUND_CYAN]'),
ReplaceTransformer(ANSI_FOREGROUND_RESET, '[FOREGROUND_RESET]'),
+ ReplaceTransformer(ANSI_FOREGROUND_LIGHT_RED, '[FOREGROUND_LIGHT_RED]'),
+ ReplaceTransformer(ANSI_FOREGROUND_LIGHT_GREEN, '[FOREGROUND_LIGHT_GREEN]'),
+ ReplaceTransformer(ANSI_FOREGROUND_LIGHT_YELLOW, '[FOREGROUND_LIGHT_YELLOW]'),
+ ReplaceTransformer(ANSI_FOREGROUND_LIGHT_BLUE, '[FOREGROUND_LIGHT_BLUE]'),
+ ReplaceTransformer(ANSI_FOREGROUND_LIGHT_CYAN, '[ANSI_FOREGROUND_LIGHT_CYAN]'),
ReplaceTransformer(ANSI_BACKGROUND_RED, '[BACKGROUND_RED]'),
ReplaceTransformer(ANSI_BACKGROUND_GREEN, '[BACKGROUND_GREEN]'),
ReplaceTransformer(ANSI_BACKGROUND_YELLOW, '[BACKGROUND_YELLOW]'),
ReplaceTransformer(ANSI_BACKGROUND_BLUE, '[BACKGROUND_BLUE]'),
ReplaceTransformer(ANSI_BACKGROUND_MAGENTA, '[BACKGROUND_MAGENTA]'),
ReplaceTransformer(ANSI_BACKGROUND_CYAN, '[BACKGROUND_CYAN]'),
+ ReplaceTransformer(ANSI_BACKGROUND_LIGHT_RED, '[BACKGROUND_LIGHT_RED]'),
+ ReplaceTransformer(ANSI_BACKGROUND_LIGHT_GREEN, '[BACKGROUND_LIGHT_GREEN]'),
+ ReplaceTransformer(ANSI_BACKGROUND_LIGHT_YELLOW, '[BACKGROUND_LIGHT_YELLOW]'),
+ ReplaceTransformer(ANSI_BACKGROUND_LIGHT_BLUE, '[BACKGROUND_LIGHT_BLUE]'),
+ ReplaceTransformer(ANSI_BACKGROUND_LIGHT_CYAN, '[BACKGROUND_LIGHT_CYAN]'),
ReplaceTransformer(ANSI_BACKGROUND_RESET, '[BACKGROUND_RESET]'),
ReplaceTransformer(ANSI_BOLD, '[BOLD]'),
ReplaceTransformer(ANSI_FAINT, '[FAINT]'),
@@ -105,7 +123,7 @@
])
with open(input_file) as f:
- actual_lines = [transformer.transform(l) for l in f.read().splitlines()]
+ actual_lines = [transformer.transform(line) for line in f.read().splitlines()]
if GENERATE_REFERENCES:
with open(expected_file, 'w') as f:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/tests/config/test_loader.py new/rainbow-2.8.0/tests/config/test_loader.py
--- old/rainbow-2.7.1/tests/config/test_loader.py 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/tests/config/test_loader.py 2022-01-09 20:56:55.000000000 +0100
@@ -57,14 +57,14 @@
def test_load_empty_config_file():
- (stdout_transformer, stderr_transformer, errors) = load_by_name('tests/data/cfg/config001.cfg')
+ (stdout_transformer, stderr_transformer, errors) = load_by_name(u'tests/data/cfg/config001.cfg')
assert not errors
assert isinstance(stdout_transformer, IdentityTransformer)
assert isinstance(stderr_transformer, IdentityTransformer)
def test_load_empty_config_file_from_command_line():
- (stdout_transformer, stderr_transformer, errors) = load_from_command_line(['config001'])
+ (stdout_transformer, stderr_transformer, errors) = load_from_command_line([u'config001'])
assert not errors
assert isinstance(stdout_transformer, IdentityTransformer)
assert isinstance(stderr_transformer, IdentityTransformer)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/tests/data/cfg/config031.cfg new/rainbow-2.8.0/tests/data/cfg/config031.cfg
--- old/rainbow-2.7.1/tests/data/cfg/config031.cfg 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/tests/data/cfg/config031.cfg 2022-01-09 20:56:55.000000000 +0100
@@ -20,68 +20,128 @@
foreground-red: test
r: test
red: test
+foreground-light-red: test
+lightred: test
foreground-green: test
g: test
green: test
+foreground-light-green: test
+lightgreen: test
foreground-yellow: test
y: test
yellow: test
+foreground-light-yellow: test
+lightyellow: test
foreground-blue: test
b: test
blue: test
+foreground-light-blue: test
+lightblue: test
foreground-magenta: test
m: test
magenta: test
foreground-cyan: test
c: test
cyan: test
+foreground-light-cyan: test
+lightcyan: test
foreground-red-before: test
red-before: test
+foreground-light-red-before: test
+lightred-before: test
foreground-green-before: test
green-before: test
+foreground-light-green-before: test
+lightgreen-before: test
foreground-yellow-before: test
yellow-before: test
+foreground-light-yellow-before: test
+lightyellow-before: test
foreground-blue-before: test
blue-before: test
foreground-magenta-before: test
+foreground-light-blue-before: test
+lightblue-before: test
magenta-before: test
foreground-cyan-before: test
cyan-before: test
+foreground-light-cyan-before: test
+lightcyan-before: test
foreground-reset-before: test
reset-before: test
foreground-red-after: test
red-after: test
+foreground-light-red-after: test
+lightred-after: test
foreground-green-after: test
green-after: test
+foreground-light-green-after: test
+lightgreen-after: test
foreground-yellow-after: test
yellow-after: test
+foreground-light-yellow-after: test
+lightyellow-after: test
foreground-blue-after: test
blue-after: test
+foreground-light-blue-after: test
+lightblue-after: test
foreground-magenta-after: test
magenta-after: test
foreground-cyan-after: test
cyan-after: test
+foreground-light-cyan-after: test
+lightcyan-after: test
foreground-reset-after: test
reset-after: test
background-red: test
+background-light-red: test
+background-lightred: test
background-green: test
+background-light-green: test
+background-lightgreen: test
background-yellow: test
+background-light-yellow: test
+background-lightyellow: test
background-blue: test
+background-light-blue: test
+background-lightblue: test
background-magenta: test
background-cyan: test
+background-light-cyan: test
+background-lightcyan: test
background-red-before: test
+background-light-red-before: test
+background-lightred-before: test
background-green-before: test
+background-light-green-before: test
+background-lightgreen-before: test
background-yellow-before: test
+background-light-yellow-before: test
+background-lightyellow-before: test
background-blue-before: test
+background-light-blue-before: test
+background-lightblue-before: test
background-magenta-before: test
background-cyan-before: test
+background-light-cyan-before: test
+background-lightcyan-before: test
background-reset-before: test
background-red-after: test
+background-light-red-after: test
+background-lightred-after: test
background-green-after: test
+background-light-green-after: test
+background-lightgreen-after: test
background-yellow-after: test
+background-light-yellow-after: test
+background-lightyellow-after: test
background-blue-after: test
+background-light-blue-after: test
+background-lightblue-after: test
background-magenta-after: test
background-cyan-after: test
+background-light-cyan-after: test
+background-lightcyan-after: test
background-reset-after: test
bold: test
bold-before: test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/tests/data/ref/tcpdump-001.log new/rainbow-2.8.0/tests/data/ref/tcpdump-001.log
--- old/rainbow-2.7.1/tests/data/ref/tcpdump-001.log 1970-01-01 01:00:00.000000000 +0100
+++ new/rainbow-2.8.0/tests/data/ref/tcpdump-001.log 2022-01-09 20:56:55.000000000 +0100
@@ -0,0 +1,51 @@
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0xff56 (incorrect -> 0x2fdc), seq 1504125:1507021, ack 275, win 269, options [nop,nop,TS val 1088319702 ecr 3891091735], length 2896
+18:54:43.133515 IP (tos 0x0, ttl 54, id 52203, offset 0, flags [DF], proto TCP (6), length 2948)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0xff56 (incorrect -> 0x7864), seq 1507021:1509917, ack 275, win 269, options [nop,nop,TS val 1088319702 ecr 3891091735], length 2896
+18:54:43.133630 IP (tos 0x0, ttl 64, id 9684, offset 0, flags [DF], proto TCP (6), length 52)
+ 4.5.6.7.57434 > 1.2.3.4.443: Flags [.], cksum 0xf406 (incorrect -> 0x39cc), ack 1509917, win 24576, options [nop,nop,TS val 3891091744 ecr 1088319702], length 0
+18:54:43.134576 IP (tos 0x0, ttl 54, id 52205, offset 0, flags [DF], proto TCP (6), length 1500)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0x6d2a (correct), seq 1509917:1511365, ack 275, win 269, options [nop,nop,TS val 1088319704 ecr 3891091736], length 1448
+18:54:43.134646 IP (tos 0x0, ttl 54, id 52206, offset 0, flags [DF], proto TCP (6), length 4396)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0x04ff (incorrect -> 0x6b41), seq 1511365:1515709, ack 275, win 269, options [nop,nop,TS val 1088319704 ecr 3891091736], length 4344
+18:54:43.134697 IP (tos 0x0, ttl 64, id 9685, offset 0, flags [DF], proto TCP (6), length 52)
+ 4.5.6.7.57434 > 1.2.3.4.443: Flags [.], cksum 0xf406 (incorrect -> 0x2329), ack 1515709, win 24576, options [nop,nop,TS val 3891091745 ecr 1088319704], length 0
+18:54:43.134969 IP (tos 0x0, ttl 54, id 52209, offset 0, flags [DF], proto TCP (6), length 2948)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0xff56 (incorrect -> 0x2851), seq 1515709:1518605, ack 275, win 269, options [nop,nop,TS val 1088319704 ecr 3891091737], length 2896
+18:54:43.135026 IP (tos 0x0, ttl 54, id 52211, offset 0, flags [DF], proto TCP (6), length 4396)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0x04ff (incorrect -> 0xee44), seq 1518605:1522949, ack 275, win 269, options [nop,nop,TS val 1088319704 ecr 3891091737], length 4344
+18:54:43.135084 IP (tos 0x0, ttl 64, id 9686, offset 0, flags [DF], proto TCP (6), length 52)
+ 4.5.6.7.57434 > 1.2.3.4.443: Flags [.], cksum 0xf406 (incorrect -> 0x06e1), ack 1522949, win 24576, options [nop,nop,TS val 3891091745 ecr 1088319704], length 0
+18:54:43.137133 IP (tos 0x0, ttl 54, id 52214, offset 0, flags [DF], proto TCP (6), length 4396)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0x04ff (incorrect -> 0xd273), seq 1522949:1527293, ack 275, win 269, options [nop,nop,TS val 1088319706 ecr 3891091738], length 4344
+18:54:43.137180 IP (tos 0x0, ttl 54, id 52217, offset 0, flags [DF], proto TCP (6), length 2948)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0xff56 (incorrect -> 0x941c), seq 1527293:1530189, ack 275, win 269, options [nop,nop,TS val 1088319706 ecr 3891091738], length 2896
+18:54:43.137240 IP (tos 0x0, ttl 64, id 9687, offset 0, flags [DF], proto TCP (6), length 52)
+ 4.5.6.7.57434 > 1.2.3.4.443: Flags [.], cksum 0xf406 (incorrect -> 0xea94), ack 1530189, win 24576, options [nop,nop,TS val 3891091747 ecr 1088319706], length 0
+18:54:43.137566 IP (tos 0x0, ttl 54, id 52219, offset 0, flags [DF], proto TCP (6), length 4396)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0x04ff (incorrect -> 0xaca8), seq 1530189:1534533, ack 275, win 269, options [nop,nop,TS val 1088319706 ecr 3891091739], length 4344
+18:54:43.137640 IP (tos 0x0, ttl 54, id 52222, offset 0, flags [DF], proto TCP (6), length 2948)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0xff56 (incorrect -> 0x5043), seq 1534533:1537429, ack 275, win 269, options [nop,nop,TS val 1088319706 ecr 3891091739], length 2896
+18:54:43.137649 IP (tos 0x0, ttl 64, id 9688, offset 0, flags [DF], proto TCP (6), length 52)
+ 4.5.6.7.57434 > 1.2.3.4.443: Flags [.], cksum 0xf406 (incorrect -> 0xd99b), ack 1534533, win 24576, options [nop,nop,TS val 3891091748 ecr 1088319706], length 0
+18:54:43.137712 IP (tos 0x0, ttl 64, id 9689, offset 0, flags [DF], proto TCP (6), length 52)
+ 4.5.6.7.57434 > 1.2.3.4.443: Flags [.], cksum 0xf406 (incorrect -> 0xce4b), ack 1537429, win 24576, options [nop,nop,TS val 3891091748 ecr 1088319706], length 0
+18:54:43.138483 IP (tos 0x0, ttl 54, id 52224, offset 0, flags [DF], proto TCP (6), length 1500)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0xdb84 (correct), seq 1537429:1538877, ack 275, win 269, options [nop,nop,TS val 1088319707 ecr 3891091740], length 1448
+18:54:43.138539 IP (tos 0x0, ttl 54, id 52225, offset 0, flags [DF], proto TCP (6), length 5491)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [P.], cksum 0x0946 (incorrect -> 0x01e5), seq 1538877:1544316, ack 275, win 269, options [nop,nop,TS val 1088319707 ecr 3891091740], length 5439
+18:54:43.138584 IP (tos 0x0, ttl 64, id 9690, offset 0, flags [DF], proto TCP (6), length 52)
+ 4.5.6.7.57434 > 1.2.3.4.443: Flags [.], cksum 0xf406 (incorrect -> 0xb362), ack 1544316, win 24576, options [nop,nop,TS val 3891091749 ecr 1088319707], length 0
+18:54:43.139452 IP (tos 0x0, ttl 54, id 52229, offset 0, flags [DF], proto TCP (6), length 2948)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0xff56 (incorrect -> 0xe254), seq 1544316:1547212, ack 275, win 269, options [nop,nop,TS val 1088319708 ecr 3891091741], length 2896
+18:54:43.139543 IP (tos 0x0, ttl 64, id 9691, offset 0, flags [DF], proto TCP (6), length 52)
+ 4.5.6.7.57434 > 1.2.3.4.443: Flags [.], cksum 0xf406 (incorrect -> 0xa811), ack 1547212, win 24576, options [nop,nop,TS val 3891091749 ecr 1088319708], length 0
+18:54:43.139745 IP (tos 0x0, ttl 54, id 52231, offset 0, flags [DF], proto TCP (6), length 1500)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0x895a (correct), seq 1547212:1548660, ack 275, win 269, options [nop,nop,TS val 1088319708 ecr 3891091741], length 1448
+18:54:43.139803 IP (tos 0x0, ttl 54, id 52232, offset 0, flags [DF], proto TCP (6), length 5844)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0x0aa7 (incorrect -> 0x3f47), seq 1548660:1554452, ack 275, win 269, options [nop,nop,TS val 1088319708 ecr 3891091741], length 5792
+18:54:43.139883 IP (tos 0x0, ttl 64, id 9692, offset 0, flags [DF], proto TCP (6), length 52)
+ 4.5.6.7.57434 > 1.2.3.4.443: Flags [.], cksum 0xf406 (incorrect -> 0x8bc8), ack 1554452, win 24576, options [nop,nop,TS val 3891091750 ecr 1088319708], length 0
+18:54:43.140658 IP (tos 0x0, ttl 54, id 52236, offset 0, flags [DF], proto TCP (6), length 1500)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0x77da (correct), seq 1554452:1555900, ack 275, win 269, options [nop,nop,TS val 1088319709 ecr 3891091742], length 1448
+18:54:43.140726 IP (tos 0x0, ttl 54, id 52237, offset 0, flags [DF], proto TCP (6), length 5844)
+ 1.2.3.4.443 > 4.5.6.7.57434: Flags [.], cksum 0x0aa7 (incorrect -> 0xf06b), seq 1555900:1561692, ack 275, win 269, options [nop,nop,TS val 1088319709 ecr 3891091742], length 5792
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/tests/data/ref/tcpdump-001.log.out new/rainbow-2.8.0/tests/data/ref/tcpdump-001.log.out
--- old/rainbow-2.7.1/tests/data/ref/tcpdump-001.log.out 1970-01-01 01:00:00.000000000 +0100
+++ new/rainbow-2.8.0/tests/data/ref/tcpdump-001.log.out 2022-01-09 20:56:55.000000000 +0100
@@ -0,0 +1,51 @@
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xff56 (incorrect -> 0x2fdc)[FOREGROUND_RESET], seq 1504125:1507021, ack 275, win 269, options [nop,nop,TS val 1088319702 ecr 3891091735], length 2896
+[FAINT]18:54:43.133515[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52203, offset 0, flags [DF], proto TCP (6), length 2948)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xff56 (incorrect -> 0x7864)[FOREGROUND_RESET], seq 1507021:1509917, ack 275, win 269, options [nop,nop,TS val 1088319702 ecr 3891091735], length 2896
+[FAINT]18:54:43.133630[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 64, id 9684, offset 0, flags [DF], proto TCP (6), length 52)
+ [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL] > [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xf406 (incorrect -> 0x39cc)[FOREGROUND_RESET], ack 1509917, win 24576, options [nop,nop,TS val 3891091744 ecr 1088319702], length 0
+[FAINT]18:54:43.134576[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52205, offset 0, flags [DF], proto TCP (6), length 1500)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], cksum 0x6d2a (correct), seq 1509917:1511365, ack 275, win 269, options [nop,nop,TS val 1088319704 ecr 3891091736], length 1448
+[FAINT]18:54:43.134646[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52206, offset 0, flags [DF], proto TCP (6), length 4396)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0x04ff (incorrect -> 0x6b41)[FOREGROUND_RESET], seq 1511365:1515709, ack 275, win 269, options [nop,nop,TS val 1088319704 ecr 3891091736], length 4344
+[FAINT]18:54:43.134697[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 64, id 9685, offset 0, flags [DF], proto TCP (6), length 52)
+ [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL] > [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xf406 (incorrect -> 0x2329)[FOREGROUND_RESET], ack 1515709, win 24576, options [nop,nop,TS val 3891091745 ecr 1088319704], length 0
+[FAINT]18:54:43.134969[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52209, offset 0, flags [DF], proto TCP (6), length 2948)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xff56 (incorrect -> 0x2851)[FOREGROUND_RESET], seq 1515709:1518605, ack 275, win 269, options [nop,nop,TS val 1088319704 ecr 3891091737], length 2896
+[FAINT]18:54:43.135026[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52211, offset 0, flags [DF], proto TCP (6), length 4396)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0x04ff (incorrect -> 0xee44)[FOREGROUND_RESET], seq 1518605:1522949, ack 275, win 269, options [nop,nop,TS val 1088319704 ecr 3891091737], length 4344
+[FAINT]18:54:43.135084[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 64, id 9686, offset 0, flags [DF], proto TCP (6), length 52)
+ [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL] > [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xf406 (incorrect -> 0x06e1)[FOREGROUND_RESET], ack 1522949, win 24576, options [nop,nop,TS val 3891091745 ecr 1088319704], length 0
+[FAINT]18:54:43.137133[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52214, offset 0, flags [DF], proto TCP (6), length 4396)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0x04ff (incorrect -> 0xd273)[FOREGROUND_RESET], seq 1522949:1527293, ack 275, win 269, options [nop,nop,TS val 1088319706 ecr 3891091738], length 4344
+[FAINT]18:54:43.137180[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52217, offset 0, flags [DF], proto TCP (6), length 2948)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xff56 (incorrect -> 0x941c)[FOREGROUND_RESET], seq 1527293:1530189, ack 275, win 269, options [nop,nop,TS val 1088319706 ecr 3891091738], length 2896
+[FAINT]18:54:43.137240[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 64, id 9687, offset 0, flags [DF], proto TCP (6), length 52)
+ [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL] > [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xf406 (incorrect -> 0xea94)[FOREGROUND_RESET], ack 1530189, win 24576, options [nop,nop,TS val 3891091747 ecr 1088319706], length 0
+[FAINT]18:54:43.137566[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52219, offset 0, flags [DF], proto TCP (6), length 4396)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0x04ff (incorrect -> 0xaca8)[FOREGROUND_RESET], seq 1530189:1534533, ack 275, win 269, options [nop,nop,TS val 1088319706 ecr 3891091739], length 4344
+[FAINT]18:54:43.137640[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52222, offset 0, flags [DF], proto TCP (6), length 2948)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xff56 (incorrect -> 0x5043)[FOREGROUND_RESET], seq 1534533:1537429, ack 275, win 269, options [nop,nop,TS val 1088319706 ecr 3891091739], length 2896
+[FAINT]18:54:43.137649[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 64, id 9688, offset 0, flags [DF], proto TCP (6), length 52)
+ [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL] > [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xf406 (incorrect -> 0xd99b)[FOREGROUND_RESET], ack 1534533, win 24576, options [nop,nop,TS val 3891091748 ecr 1088319706], length 0
+[FAINT]18:54:43.137712[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 64, id 9689, offset 0, flags [DF], proto TCP (6), length 52)
+ [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL] > [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xf406 (incorrect -> 0xce4b)[FOREGROUND_RESET], ack 1537429, win 24576, options [nop,nop,TS val 3891091748 ecr 1088319706], length 0
+[FAINT]18:54:43.138483[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52224, offset 0, flags [DF], proto TCP (6), length 1500)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], cksum 0xdb84 (correct), seq 1537429:1538877, ack 275, win 269, options [nop,nop,TS val 1088319707 ecr 3891091740], length 1448
+[FAINT]18:54:43.138539[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52225, offset 0, flags [DF], proto TCP (6), length 5491)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][P.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0x0946 (incorrect -> 0x01e5)[FOREGROUND_RESET], seq 1538877:1544316, ack 275, win 269, options [nop,nop,TS val 1088319707 ecr 3891091740], length 5439
+[FAINT]18:54:43.138584[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 64, id 9690, offset 0, flags [DF], proto TCP (6), length 52)
+ [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL] > [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xf406 (incorrect -> 0xb362)[FOREGROUND_RESET], ack 1544316, win 24576, options [nop,nop,TS val 3891091749 ecr 1088319707], length 0
+[FAINT]18:54:43.139452[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52229, offset 0, flags [DF], proto TCP (6), length 2948)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xff56 (incorrect -> 0xe254)[FOREGROUND_RESET], seq 1544316:1547212, ack 275, win 269, options [nop,nop,TS val 1088319708 ecr 3891091741], length 2896
+[FAINT]18:54:43.139543[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 64, id 9691, offset 0, flags [DF], proto TCP (6), length 52)
+ [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL] > [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xf406 (incorrect -> 0xa811)[FOREGROUND_RESET], ack 1547212, win 24576, options [nop,nop,TS val 3891091749 ecr 1088319708], length 0
+[FAINT]18:54:43.139745[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52231, offset 0, flags [DF], proto TCP (6), length 1500)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], cksum 0x895a (correct), seq 1547212:1548660, ack 275, win 269, options [nop,nop,TS val 1088319708 ecr 3891091741], length 1448
+[FAINT]18:54:43.139803[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52232, offset 0, flags [DF], proto TCP (6), length 5844)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0x0aa7 (incorrect -> 0x3f47)[FOREGROUND_RESET], seq 1548660:1554452, ack 275, win 269, options [nop,nop,TS val 1088319708 ecr 3891091741], length 5792
+[FAINT]18:54:43.139883[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 64, id 9692, offset 0, flags [DF], proto TCP (6), length 52)
+ [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL] > [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0xf406 (incorrect -> 0x8bc8)[FOREGROUND_RESET], ack 1554452, win 24576, options [nop,nop,TS val 3891091750 ecr 1088319708], length 0
+[FAINT]18:54:43.140658[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52236, offset 0, flags [DF], proto TCP (6), length 1500)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], cksum 0x77da (correct), seq 1554452:1555900, ack 275, win 269, options [nop,nop,TS val 1088319709 ecr 3891091742], length 1448
+[FAINT]18:54:43.140726[RESET_INTENSITY] [BOLD]IP [RESET_INTENSITY](tos 0x0, ttl 54, id 52237, offset 0, flags [DF], proto TCP (6), length 5844)
+ [FOREGROUND_MAGENTA]1.2.3.4[FOREGROUND_RESET].[FOREGROUND_BLUE]443[RESET_ALL] > [FOREGROUND_MAGENTA]4.5.6.7[FOREGROUND_RESET].[FOREGROUND_BLUE]57434[RESET_ALL]: Flags [FOREGROUND_CYAN][.][FOREGROUND_RESET], [FOREGROUND_RED]cksum 0x0aa7 (incorrect -> 0xf06b)[FOREGROUND_RESET], seq 1555900:1561692, ack 275, win 269, options [nop,nop,TS val 1088319709 ecr 3891091742], length 5792
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/tests/test_build.py new/rainbow-2.8.0/tests/test_build.py
--- old/rainbow-2.7.1/tests/test_build.py 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/tests/test_build.py 2022-01-09 20:56:55.000000000 +0100
@@ -29,7 +29,9 @@
def generate_completion(request, shell):
path = 'build/tests-workspace/completion_' + shell + '_' + request.node.name
- command = GenerateCompletion(Distribution(), shell=shell, output=path)
+ command = GenerateCompletion(Distribution())
+ setattr(command, 'shell', shell)
+ setattr(command, 'output', path)
command.run()
return open(path).read()
@@ -51,7 +53,8 @@
def generate_man_page(request):
path = 'build/tests-workspace/manpage_' + request.node.name
- command = GenerateManPage(Distribution(), output=path)
+ command = GenerateManPage(Distribution())
+ setattr(command, 'output', path)
command.run()
return open(path).read()
@@ -67,8 +70,8 @@
man_page = generate_man_page(request)
for filter in FILTERS:
if filter.short_option:
- assert '\-' + filter.short_option in man_page
- assert '\-\-' + filter.long_option in man_page
+ assert '\\-' + filter.short_option in man_page
+ assert '\\-\\-' + filter.long_option in man_page
assert filter.help in man_page
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/tests/test_cli.py new/rainbow-2.8.0/tests/test_cli.py
--- old/rainbow-2.7.1/tests/test_cli.py 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/tests/test_cli.py 2022-01-09 20:56:55.000000000 +0100
@@ -275,7 +275,7 @@
def test_config_file_by_relative_path_short_option():
- (command, errors) = parse(['-f', 'tests/data/cfg/config006.cfg'])
+ (command, errors) = parse(['-f', u'tests/data/cfg/config006.cfg'])
assert not errors
assert isinstance(command, STDINCommand)
assert command.transformer == TransformerBuilder.make_transformer(re.compile(u'ERROR'),
@@ -283,7 +283,7 @@
def test_config_file_by_relative_path_without_extension_short_option():
- (command, errors) = parse(['-f', 'tests/data/cfg/config006'])
+ (command, errors) = parse(['-f', u'tests/data/cfg/config006'])
assert not errors
assert isinstance(command, STDINCommand)
assert command.transformer == TransformerBuilder.make_transformer(re.compile(u'ERROR'),
@@ -291,7 +291,7 @@
def test_config_file_by_relative_path_long_option():
- (command, errors) = parse(['--config', 'tests/data/cfg/config006.cfg'])
+ (command, errors) = parse(['--config', u'tests/data/cfg/config006.cfg'])
assert not errors
assert isinstance(command, STDINCommand)
assert command.transformer == TransformerBuilder.make_transformer(re.compile(u'ERROR'),
@@ -299,7 +299,7 @@
def test_config_file_by_relative_path_without_extension_long_option():
- (command, errors) = parse(['--config', 'tests/data/cfg/config006'])
+ (command, errors) = parse(['--config', u'tests/data/cfg/config006'])
assert not errors
assert isinstance(command, STDINCommand)
assert command.transformer == TransformerBuilder.make_transformer(re.compile(u'ERROR'),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/tests/test_utils.py new/rainbow-2.8.0/tests/test_utils.py
--- old/rainbow-2.7.1/tests/test_utils.py 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/tests/test_utils.py 2022-01-09 20:56:55.000000000 +0100
@@ -43,7 +43,10 @@
# Configs collections
# ----------------------------------------------------------------------
-BUILTIN_CONFIGS_NAMES = [os.path.splitext(os.path.basename(f))[0] for f in glob.glob('rainbow/config/builtin/*.cfg')]
+if sys.version_info.major == 3:
+ unicode = str
+BUILTIN_CONFIGS_NAMES = [unicode(os.path.splitext(os.path.basename(f))[0])
+ for f in glob.glob('rainbow/config/builtin/*.cfg')]
BUILTIN_CONFIGS_REFERENCES = dict((f, glob.glob('tests/data/ref/%s-*.log' % f)) for f in BUILTIN_CONFIGS_NAMES)
BUILTIN_CONFIGS_REFERENCE_PAIRS = [(f, r) for f in BUILTIN_CONFIGS_NAMES for r in BUILTIN_CONFIGS_REFERENCES[f]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rainbow-2.7.1/tox.ini new/rainbow-2.8.0/tox.ini
--- old/rainbow-2.7.1/tox.ini 2018-09-29 21:21:00.000000000 +0200
+++ new/rainbow-2.8.0/tox.ini 2022-01-09 20:56:55.000000000 +0100
@@ -17,7 +17,20 @@
# ----------------------------------------------------------------------
[tox]
-envlist = py27,py34,py35,py36,py37,py38,pypy,pypy3,benchmarks,lint
+envlist = py36,py37,py38,py39,py310,pypy3,benchmarks,lint
+
+[gh-actions]
+python =
+ 3.6: py36
+ 3.7: py37
+ 3.8: py38
+ 3.9: py39
+ 3.10: py310
+ pypy-3.6: pypy3
+ pypy-3.7: pypy3
+ pypy-3.8: pypy3
+ pypy-3.9: pypy3
+ pypy-3.10: pypy3
[pytest]
flake8-max-line-length = 120
@@ -26,8 +39,9 @@
[testenv]
extras = build,test
commands = py.test \
+ --color=yes \
--basetemp {envtmpdir} \
- --timeout=10 \
+ --timeout=600 \
--html=build/tests/{envname}/reports/tests.html \
--cov rainbow \
--cov-report term \
@@ -36,13 +50,11 @@
--benchmark-skip
[testenv:lint]
-commands = py.test \
- --basetemp {envtmpdir} \
- --flake8 \
- --benchmark-skip
+commands = flake8 .
[testenv:benchmarks]
commands = py.test \
+ --color=yes \
--basetemp {envtmpdir} \
--benchmark-only \
--benchmark-verbose \
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package erlang for openSUSE:Factory checked in at 2022-05-30 12:43:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/erlang (Old)
and /work/SRC/openSUSE:Factory/.erlang.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "erlang"
Mon May 30 12:43:42 2022 rev:120 rq:979661 version:25.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/erlang/erlang.changes 2022-04-08 00:28:10.926010248 +0200
+++ /work/SRC/openSUSE:Factory/.erlang.new.2254/erlang.changes 2022-05-30 12:44:26.068429185 +0200
@@ -1,0 +2,126 @@
+Sun May 22 11:19:11 UTC 2022 - Matwey Kornilov <matwey.kornilov(a)gmail.com>
+
+- Version 25.0:
+ - stdlib
+ * New function filelib:ensure_path/1 will ensure that all
+ directories for the given path exists
+ * New functions groups_from_list/2 and groups_from_list/3 in
+ the maps module
+ * New functions uniq/1 uniq/2 in the lists module
+ * New PRNG added to the rand module, for fast pseudo-random
+ numers.
+ - compiler, kernel, stdlib, syntax_tools:
+ * Added support for selectable features as described in EEP-60.
+ Features can be enabled/disabled during compilation with
+ options (ordinary and +term) to erlc as well as with
+ directives in the file. Similar options can be used to erl
+ for enabling/disabling features allowed at runtime. The new
+ maybe expression EEP-49 is fully supported as the feature
+ maybe_expr.
+ - erts & JIT:
+ * The JIT now works for 64-bit ARM processors.
+ * The JIT now does type-based optimizations based on type
+ information in the BEAM files.
+ * Improved the JIT���s support for external tools like perf and
+ gdb, allowing them to show line numbers and even the original
+ Erlang source code when that can be found.
+ - erts, stdlib, kernel:
+ * Users can now configure ETS tables with the
+ {write_concurrency, auto} option. This option forces tables
+ to automatically change the number of locks that are used at
+ run-time depending on how much concurrency is detected. The
+ {decentralized_counters, true} option is enabled by default
+ when {write_concurrency, auto} is active.
+ * Benchmark results comparing this option with the other ETS
+ optimization options are available here: benchmarks.
+ * To enable more optimizations, BEAM files compiled with OTP 21
+ and earlier cannot be loaded in OTP 25.
+ * The signal queue of a process with the process flag
+ message_queue_data=off_heap has been optimized to allow
+ parallel reception of signals from multiple processes. This
+ can improve performance when many processes are sending in
+ parallel to one process. See benchmark.
+ * The Erlang installation directory is now relocatable on the
+ file system given that the paths in the installation���s
+ RELEASES file are paths that are relative to the
+ installations root directory.
+ * A new option called short has been added to the functions
+ erlang:float_to_list/2 and erlang:float_to_binary/2. This
+ option creates the shortest correctly rounded string
+ representation of the given float that can be converted back
+ to the same float again.
+ * Introduction of quote/1 and unquote/1 functions in the
+ uri_string module - a replacement for the deprecated
+ functions http_uri:encode and http_uri:decode.
+ * The new module peer supersedes the slave module. The slave
+ module is now deprecated and will be removed in OTP 27.
+ * global will now by default prevent overlapping partitions due
+ to network issues. This is done by actively disconnecting
+ from nodes that reports that they have lost connections to
+ other nodes. This will cause fully connected partitions to
+ form instead of leaving the network in a state with
+ overlapping partitions.
+ * It is possible to turn off the new behavior by setting the
+ the kernel configuration parameter
+ prevent_overlapping_partitions to false. Doing this will
+ retain the same behavior as in OTP 24 and earlier.
+ * The format_status/2 callback for gen_server, gen_statem and
+ gen_event has been deprecated in favor of the new
+ format_status/1 callback.
+ * The new callback adds the possibility to limit and change
+ many more things than the just the state.
+ * The timer module has been modernized and made more efficient,
+ which makes the timer server less susceptible to being
+ overloaded. The timer:sleep/1 function now accepts an
+ arbitrarily large integer.
+ - compiler:
+ * The maybe ... end construction as proposed in EEP-49 has been
+ implemented. It can simplify complex code where otherwise
+ deeply nested cases would have to be used.
+ * To enable maybe, give the option {enable_feature,maybe_expr}
+ to the compiler. The exact option to use will change in a
+ coming release candidate and then it will also be possible to
+ use from inside the module being compiled.
+ * When a record matching or record update fails, a {badrecord,
+ ExpectedRecordTag} exception used to be raised. In this
+ release, the exception has been changed to {badrecord,
+ ActualValue}, where ActualValue is the value that was found
+ instead of the expected record.
+ * Add compile attribute -nifs() to empower compiler and loader
+ with information about which functions may be overridden as
+ NIFs by erlang:load_nif/2.
+ * Improved and more detailed error messages when binary
+ construction with the binary syntax fails. This applies both
+ for error messages in the shell and for
+ erl_error:format_exception/3,4.
+ * Change format of feature options and directives for better
+ consistency. Options to erlc and the -compile(..) directive
+ now has the format {feature, feature-name, enable | disable}.
+ The -feature(..) now has the format -feature(feature-name,
+ enable | disable).
+ - crypto:
+ * Add crypto:hash_equals/2 which is a constant time comparision
+ of hashvalues.
+ - ssl:
+ * Introducing a new (still experimental) option
+ {certs_keys,[cert_key_conf()]}. With this a list of a
+ certificates with their associated key may be used to
+ authenticate the client or the server. The certificate key
+ pair that is considered best and matches negotiated
+ parameters for the connection will be selected.
+ - public_key:
+ * Functions for retrieving OS provided CA-certs added.
+ - dialyzer:
+ * Optimize operations in the erl_types module. Parallelize the
+ Dialyzer pass remote.
+ * Added the missing_return and extra_return options to raise
+ warnings when specifications differ from inferred types.
+ These are similar to, but not quite as verbose as overspecs
+ and underspecs.
+ * Dialyzer now better understands the types for min/2, max/2,
+ and erlang:raise/3. Because of that, Dialyzer can potentially
+ generate new warnings. In particular, functions that use
+ erlang:raise/3 could now need a spec with a no_return()
+ return type to avoid an unwanted warning.
+
+-------------------------------------------------------------------
Old:
----
OTP-24.3.2.tar.gz
New:
----
OTP-25.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ erlang.spec ++++++
--- /var/tmp/diff_new_pack.QWhxbl/_old 2022-05-30 12:44:26.920430319 +0200
+++ /var/tmp/diff_new_pack.QWhxbl/_new 2022-05-30 12:44:26.924430325 +0200
@@ -23,7 +23,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: erlang
-Version: 24.3.2
+Version: 25.0
Release: 0
Summary: General-purpose programming language and runtime environment
License: Apache-2.0
@@ -262,6 +262,7 @@
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS=$CFLAGS
+export LANG="en_US.UTF-8"
%configure \
--enable-systemd \
++++++ OTP-24.3.2.tar.gz -> OTP-25.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/erlang/OTP-24.3.2.tar.gz /work/SRC/openSUSE:Factory/.erlang.new.2254/OTP-25.0.tar.gz differ: char 13, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cacti for openSUSE:Factory checked in at 2022-05-30 12:43:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cacti (Old)
and /work/SRC/openSUSE:Factory/.cacti.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cacti"
Mon May 30 12:43:40 2022 rev:42 rq:979660 version:1.2.21
Changes:
--------
--- /work/SRC/openSUSE:Factory/cacti/cacti.changes 2022-04-22 22:00:21.739222616 +0200
+++ /work/SRC/openSUSE:Factory/.cacti.new.2254/cacti.changes 2022-05-30 12:44:21.844423564 +0200
@@ -1,0 +2,8 @@
+Sun May 29 11:19:31 UTC 2022 - Andreas Stieger <andreas.stieger(a)gmx.de>
+
+- cacti 1.2.21:
+ * Add a CLI script to install/enable/disable/uninstall plugins
+ * Add log message when purging DS stats and poller repopulate
+ * A collection of bug fixes
+
+-------------------------------------------------------------------
Old:
----
cacti-1.2.20.tar.gz
New:
----
cacti-1.2.21.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cacti.spec ++++++
--- /var/tmp/diff_new_pack.h6hIlX/_old 2022-05-30 12:44:22.520424464 +0200
+++ /var/tmp/diff_new_pack.h6hIlX/_new 2022-05-30 12:44:22.524424469 +0200
@@ -28,7 +28,7 @@
%bcond_with systemd
%endif
Name: cacti
-Version: 1.2.20
+Version: 1.2.21
Release: 0
Summary: Web Front-End to Monitor System Data via RRDtool
License: GPL-2.0-or-later
++++++ cacti-1.2.20.tar.gz -> cacti-1.2.21.tar.gz ++++++
/work/SRC/openSUSE:Factory/cacti/cacti-1.2.20.tar.gz /work/SRC/openSUSE:Factory/.cacti.new.2254/cacti-1.2.21.tar.gz differ: char 12, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cacti-spine for openSUSE:Factory checked in at 2022-05-30 12:43:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cacti-spine (Old)
and /work/SRC/openSUSE:Factory/.cacti-spine.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cacti-spine"
Mon May 30 12:43:39 2022 rev:36 rq:979659 version:1.2.21
Changes:
--------
--- /work/SRC/openSUSE:Factory/cacti-spine/cacti-spine.changes 2022-04-22 22:00:20.511221235 +0200
+++ /work/SRC/openSUSE:Factory/.cacti-spine.new.2254/cacti-spine.changes 2022-05-30 12:44:20.664421993 +0200
@@ -1,0 +2,6 @@
+Sun May 29 11:16:21 UTC 2022 - Andreas Stieger <andreas.stieger(a)gmx.de>
+
+- cacti-spine 1.2.21:
+ * Disable DES if Net-SNMP doesn't have it
+
+-------------------------------------------------------------------
Old:
----
cacti-spine-1.2.20.tar.gz
New:
----
cacti-spine-1.2.21.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cacti-spine.spec ++++++
--- /var/tmp/diff_new_pack.iYJUJ0/_old 2022-05-30 12:44:21.108422585 +0200
+++ /var/tmp/diff_new_pack.iYJUJ0/_new 2022-05-30 12:44:21.112422590 +0200
@@ -18,7 +18,7 @@
%{!?make_build: %define make_build make %{?_smp_mflags}}
Name: cacti-spine
-Version: 1.2.20
+Version: 1.2.21
Release: 0
Summary: Threaded poller for Cacti written in C
License: LGPL-2.1-or-later
++++++ cacti-spine-1.2.20.tar.gz -> cacti-spine-1.2.21.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cacti-spine-1.2.20/CHANGELOG new/cacti-spine-1.2.21/CHANGELOG
--- old/cacti-spine-1.2.20/CHANGELOG 2022-04-05 15:49:57.000000000 +0200
+++ new/cacti-spine-1.2.21/CHANGELOG 2022-05-18 23:20:59.000000000 +0200
@@ -1,5 +1,8 @@
The Cacti Group | spine
+1.2.21
+-issue#258: Disable DES if Net-SNMP doesn't have it
+
1.2.20
-issue#233: Add support for newer versions of MySQL/MariaDB
-issue#238: When checking for uptime of device, don't assume a non-responce is always fatal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cacti-spine-1.2.20/configure.ac new/cacti-spine-1.2.21/configure.ac
--- old/cacti-spine-1.2.20/configure.ac 2022-04-05 15:49:57.000000000 +0200
+++ new/cacti-spine-1.2.21/configure.ac 2022-05-18 23:20:59.000000000 +0200
@@ -1,5 +1,5 @@
AC_PREREQ([2.63])
-AC_INIT([Spine Poller],[1.2.20],[http://www.cacti.net/issues.php]
+AC_INIT([Spine Poller],[1.2.21],[http://www.cacti.net/issues.php]
AC_CONFIG_AUX_DIR(config)
AC_SUBST(ac_aux_dir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cacti-spine-1.2.20/snmp.c new/cacti-spine-1.2.21/snmp.c
--- old/cacti-spine-1.2.20/snmp.c 2022-04-05 15:49:57.000000000 +0200
+++ new/cacti-spine-1.2.21/snmp.c 2022-05-18 23:20:59.000000000 +0200
@@ -283,7 +283,7 @@
}
} else {
if (strcmp(snmp_priv_protocol, "DES") == 0) {
- #if defined(USM_PRIV_PROTO_DES_LEN)
+ #if defined(USM_PRIV_PROTO_DES_LEN) && !defined(NETSNMP_DISABLE_DES)
session.securityPrivProto = snmp_duplicate_objid(usmDESPrivProtocol, USM_PRIV_PROTO_DES_LEN);
session.securityPrivProtoLen = USM_PRIV_PROTO_DES_LEN;
session.securityPrivKeyLen = USM_PRIV_KU_LEN;
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-ansible-compat for openSUSE:Factory checked in at 2022-05-30 12:43:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ansible-compat (Old)
and /work/SRC/openSUSE:Factory/.python-ansible-compat.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ansible-compat"
Mon May 30 12:43:38 2022 rev:3 rq:979651 version:2.0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ansible-compat/python-ansible-compat.changes 2022-04-08 22:46:58.254305261 +0200
+++ /work/SRC/openSUSE:Factory/.python-ansible-compat.new.2254/python-ansible-compat.changes 2022-05-30 12:44:19.800420844 +0200
@@ -1,0 +2,8 @@
+Sun May 22 10:21:20 UTC 2022 - Sebastian Wagner <sebix+novell.com(a)sebix.at>
+
+- update to version 2.0.4:
+ - Add support for tower requirements (#140)
+ - Add offline option to prepare_environment (#138)
+ Fixes: #137
+
+-------------------------------------------------------------------
Old:
----
ansible-compat-2.0.2.tar.gz
New:
----
ansible-compat-2.0.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ansible-compat.spec ++++++
--- /var/tmp/diff_new_pack.PVolWu/_old 2022-05-30 12:44:20.444421701 +0200
+++ /var/tmp/diff_new_pack.PVolWu/_new 2022-05-30 12:44:20.448421706 +0200
@@ -19,25 +19,25 @@
# only works with the python version which the package 'ansible' uses
%define pythons python3
Name: python-ansible-compat
-Version: 2.0.2
+Version: 2.0.4
Release: 0
Summary: Compatibility shim for Ansible 2.9 and newer
License: MIT
URL: https://github.com/ansible-community/ansible-compat
Source: https://files.pythonhosted.org/packages/source/a/ansible-compat/ansible-com…
-BuildRequires: python-rpm-macros
-BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module setuptools_scm}
-BuildRequires: %{python_module setuptools_scm_git_archive}
BuildRequires: %{python_module pip}
+BuildRequires: %{python_module setuptools_scm_git_archive}
+BuildRequires: %{python_module setuptools_scm}
+BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel}
+BuildRequires: python-rpm-macros
# SECTION test
BuildRequires: %{python_module pytest}
-BuildRequires: %{python_module pytest-mock}
-BuildRequires: ansible
+BuildRequires: %{python_module PyYAML}
BuildRequires: %{python_module flaky}
+BuildRequires: %{python_module pytest-mock}
BuildRequires: %{python_module subprocess-tee}
-BuildRequires: %{python_module PyYAML}
+BuildRequires: ansible
# /SECTION
BuildRequires: fdupes
BuildRequires: python-rpm-generators
++++++ ansible-compat-2.0.2.tar.gz -> ansible-compat-2.0.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-compat-2.0.2/.pre-commit-config.yaml new/ansible-compat-2.0.4/.pre-commit-config.yaml
--- old/ansible-compat-2.0.2/.pre-commit-config.yaml 2022-03-17 14:29:53.000000000 +0100
+++ new/ansible-compat-2.0.4/.pre-commit-config.yaml 2022-05-16 18:24:27.000000000 +0200
@@ -17,14 +17,14 @@
repos:
- repo: https://github.com/pre-commit/mirrors-prettier
# keep it before yamllint
- rev: "v2.5.1"
+ rev: "v2.6.2"
hooks:
- id: prettier
additional_dependencies:
- prettier
- prettier-plugin-toml
- repo: https://github.com/pre-commit/pre-commit-hooks.git
- rev: v4.1.0
+ rev: v4.2.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
@@ -44,7 +44,7 @@
hooks:
- id: codespell
- repo: https://github.com/PyCQA/doc8
- rev: 0.10.1
+ rev: 0.11.1
hooks:
- id: doc8
- repo: https://github.com/adrienverge/yamllint.git
@@ -62,7 +62,7 @@
# https://github.com/pre-commit/mirrors-isort/issues/9#issuecomment-624404082
- --filter-files
- repo: https://github.com/psf/black
- rev: 22.1.0
+ rev: 22.3.0
hooks:
- id: black
language_version: python3
@@ -78,7 +78,7 @@
- flake8-rst-docstrings>=0.2.3
- flake8-rst>=0.8.0
- repo: https://github.com/pre-commit/mirrors-mypy
- rev: v0.931
+ rev: v0.950
hooks:
- id: mypy
# empty args needed in order to match mypy cli behavior
@@ -93,7 +93,7 @@
- types-PyYAML
- types-pkg_resources
- repo: https://github.com/pycqa/pylint
- rev: v2.12.2
+ rev: v2.13.8
hooks:
- id: pylint
additional_dependencies:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-compat-2.0.2/PKG-INFO new/ansible-compat-2.0.4/PKG-INFO
--- old/ansible-compat-2.0.2/PKG-INFO 2022-03-17 14:30:14.721925000 +0100
+++ new/ansible-compat-2.0.4/PKG-INFO 2022-05-16 18:24:46.884977600 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: ansible-compat
-Version: 2.0.2
+Version: 2.0.4
Summary: Ansible compatibility goodies
Home-page: https://github.com/ansible-community/ansible-compat
Author: Sorin Sbarnea
@@ -12,7 +12,6 @@
Project-URL: Source Code, https://github.com/ansible-community/ansible-compat
Project-URL: Documentation, https://ansible-compat.readthedocs.io/
Keywords: ansible
-Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Console
Classifier: Intended Audience :: Developers
@@ -50,5 +49,3 @@
versions of Ansible 2.9 and newer.
Documentation is available at [ansible-compat.readthedocs.io](https://ansible-compat.readthedocs.io/en/latest/).
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-compat-2.0.2/constraints.txt new/ansible-compat-2.0.4/constraints.txt
--- old/ansible-compat-2.0.2/constraints.txt 2022-03-17 14:29:53.000000000 +0100
+++ new/ansible-compat-2.0.4/constraints.txt 2022-05-16 18:24:27.000000000 +0200
@@ -4,31 +4,31 @@
#
# pip-compile --extra=test --output-file=constraints.txt setup.cfg
#
-attrs==21.2.0
+attrs==21.4.0
# via pytest
-click==8.0.3
+click==8.1.3
# via pip-tools
commonmark==0.9.1
# via pytest-markdown
-coverage==6.2
+coverage==6.3.3
# via ansible-compat (setup.cfg)
flaky==3.7.0
# via ansible-compat (setup.cfg)
iniconfig==1.1.1
# via pytest
-more-itertools==8.12.0
+more-itertools==8.13.0
# via pytest-plus
packaging==21.3
# via pytest
pep517==0.12.0
# via pip-tools
-pip-tools==6.5.1
+pip-tools==6.6.1
# via ansible-compat (setup.cfg)
pluggy==1.0.0
# via pytest
py==1.11.0
# via pytest
-pyparsing==3.0.6
+pyparsing==3.0.9
# via packaging
pytest==6.2.5
# via
@@ -38,7 +38,7 @@
# pytest-plus
pytest-markdown==1.0.2
# via ansible-compat (setup.cfg)
-pytest-mock==3.6.1
+pytest-mock==3.7.0
# via ansible-compat (setup.cfg)
pytest-plus==0.2
# via ansible-compat (setup.cfg)
@@ -48,9 +48,9 @@
# via ansible-compat (setup.cfg)
toml==0.10.2
# via pytest
-tomli==1.2.2
+tomli==2.0.1
# via pep517
-wheel==0.37.0
+wheel==0.37.1
# via pip-tools
# The following packages are considered to be unsafe in a requirements file:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-compat-2.0.2/docs/requirements.txt new/ansible-compat-2.0.4/docs/requirements.txt
--- old/ansible-compat-2.0.2/docs/requirements.txt 2022-03-17 14:29:53.000000000 +0100
+++ new/ansible-compat-2.0.4/docs/requirements.txt 2022-05-16 18:24:27.000000000 +0200
@@ -6,17 +6,15 @@
#
alabaster==0.7.12
# via sphinx
-ansible-pygments==0.1.0
+ansible-pygments==0.1.1
# via sphinx-ansible-theme
argh==0.26.2
# via sphinx-autobuild
-attrs==21.2.0
- # via markdown-it-py
-babel==2.9.1
+babel==2.10.1
# via sphinx
certifi==2021.10.8
# via requests
-charset-normalizer==2.0.8
+charset-normalizer==2.0.12
# via requests
docutils==0.17.1
# via
@@ -27,21 +25,25 @@
# via requests
imagesize==1.3.0
# via sphinx
-jinja2==3.0.3
+importlib-metadata==4.11.3
+ # via sphinx
+jinja2==3.1.2
# via
# myst-parser
# sphinx
livereload==2.6.3
# via sphinx-autobuild
-markdown-it-py==1.1.0
+markdown-it-py==2.1.0
# via
# mdit-py-plugins
# myst-parser
-markupsafe==2.0.1
+markupsafe==2.1.1
# via jinja2
-mdit-py-plugins==0.2.8
+mdit-py-plugins==0.3.0
# via myst-parser
-myst-parser==0.15.2
+mdurl==0.1.1
+ # via markdown-it-py
+myst-parser==0.17.2
# via -r docs/requirements.in
packaging==21.3
# via sphinx
@@ -49,32 +51,32 @@
# via sphinx-autobuild
port-for==0.3.1
# via sphinx-autobuild
-pygments==2.10.0
+pygments==2.12.0
# via
# ansible-pygments
# sphinx
-pyparsing==3.0.6
+pyparsing==3.0.9
# via packaging
-pytz==2021.3
+pytz==2022.1
# via babel
pyyaml==6.0
# via
# ansible-compat (setup.cfg)
# myst-parser
# sphinx-autobuild
-requests==2.26.0
+requests==2.27.1
# via sphinx
six==1.16.0
# via livereload
snowballstemmer==2.2.0
# via sphinx
-sphinx==4.3.1
+sphinx==4.5.0
# via
# -r docs/requirements.in
# myst-parser
# sphinx-ansible-theme
# sphinx-rtd-theme
-sphinx-ansible-theme==0.8.0
+sphinx-ansible-theme==0.9.1
# via -r docs/requirements.in
sphinx-autobuild==0.7.1
# via -r docs/requirements.in
@@ -98,10 +100,11 @@
# via
# livereload
# sphinx-autobuild
-urllib3==1.26.7
+typing-extensions==4.2.0
+ # via myst-parser
+urllib3==1.26.9
# via requests
-watchdog==2.1.6
+watchdog==2.1.8
# via sphinx-autobuild
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
+zipp==3.8.0
+ # via importlib-metadata
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-compat-2.0.2/src/ansible_compat/runtime.py new/ansible-compat-2.0.4/src/ansible_compat/runtime.py
--- old/ansible-compat-2.0.2/src/ansible_compat/runtime.py 2022-03-17 14:29:53.000000000 +0100
+++ new/ansible-compat-2.0.4/src/ansible_compat/runtime.py 2022-05-16 18:24:27.000000000 +0200
@@ -301,12 +301,23 @@
required_collections: Optional[Dict[str, str]] = None,
retry: bool = False,
install_local: bool = False,
+ offline: bool = False,
) -> None:
"""Make dependencies available if needed."""
if required_collections is None:
required_collections = {}
- self.install_requirements("requirements.yml", retry=retry)
+ if not offline:
+ # first one is standard for collection layout repos and the last two
+ # are part of Tower specification
+ # https://docs.ansible.com/ansible-tower/latest/html/userguide/projects.html#…
+ # https://docs.ansible.com/ansible-tower/latest/html/userguide/projects.html#…
+ for req_file in [
+ "requirements.yml",
+ "roles/requirements.yml",
+ "collections/requirements.yml",
+ ]:
+ self.install_requirements(req_file, retry=retry)
destination = f"{self.cache_dir}/collections" if self.cache_dir else None
for name, min_version in required_collections.items():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-compat-2.0.2/src/ansible_compat.egg-info/PKG-INFO new/ansible-compat-2.0.4/src/ansible_compat.egg-info/PKG-INFO
--- old/ansible-compat-2.0.2/src/ansible_compat.egg-info/PKG-INFO 2022-03-17 14:30:14.000000000 +0100
+++ new/ansible-compat-2.0.4/src/ansible_compat.egg-info/PKG-INFO 2022-05-16 18:24:46.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: ansible-compat
-Version: 2.0.2
+Version: 2.0.4
Summary: Ansible compatibility goodies
Home-page: https://github.com/ansible-community/ansible-compat
Author: Sorin Sbarnea
@@ -12,7 +12,6 @@
Project-URL: Source Code, https://github.com/ansible-community/ansible-compat
Project-URL: Documentation, https://ansible-compat.readthedocs.io/
Keywords: ansible
-Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Console
Classifier: Intended Audience :: Developers
@@ -50,5 +49,3 @@
versions of Ansible 2.9 and newer.
Documentation is available at [ansible-compat.readthedocs.io](https://ansible-compat.readthedocs.io/en/latest/).
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-compat-2.0.2/src/ansible_compat.egg-info/SOURCES.txt new/ansible-compat-2.0.4/src/ansible_compat.egg-info/SOURCES.txt
--- old/ansible-compat-2.0.2/src/ansible_compat.egg-info/SOURCES.txt 2022-03-17 14:30:14.000000000 +0100
+++ new/ansible-compat-2.0.4/src/ansible_compat.egg-info/SOURCES.txt 2022-05-16 18:24:46.000000000 +0200
@@ -57,6 +57,8 @@
test/collections/acme.goodies/roles/baz/molecule/deep_scenario/converge.yml
test/collections/acme.goodies/roles/baz/molecule/deep_scenario/molecule.yml
test/collections/acme.goodies/roles/baz/tasks/main.yml
+test/roles/acme.missing_deps/requirements.yml
+test/roles/acme.missing_deps/meta/main.yml
test/roles/acme.sample2/meta/main.yml
test/roles/ansible-role-sample/meta/main.yml
test/roles/sample3/meta/main.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-compat-2.0.2/test/roles/acme.missing_deps/meta/main.yml new/ansible-compat-2.0.4/test/roles/acme.missing_deps/meta/main.yml
--- old/ansible-compat-2.0.2/test/roles/acme.missing_deps/meta/main.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/ansible-compat-2.0.4/test/roles/acme.missing_deps/meta/main.yml 2022-05-16 18:24:27.000000000 +0200
@@ -0,0 +1,8 @@
+---
+galaxy_info:
+ name: missing_deps
+ namespace: acme
+ description: foo
+ license: GPL
+ min_ansible_version: "2.10"
+ platforms: []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-compat-2.0.2/test/roles/acme.missing_deps/requirements.yml new/ansible-compat-2.0.4/test/roles/acme.missing_deps/requirements.yml
--- old/ansible-compat-2.0.2/test/roles/acme.missing_deps/requirements.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/ansible-compat-2.0.4/test/roles/acme.missing_deps/requirements.yml 2022-05-16 18:24:27.000000000 +0200
@@ -0,0 +1,2 @@
+collections:
+ - foo.bar # collection that does not exist, so we can test offline mode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-compat-2.0.2/test/test_runtime.py new/ansible-compat-2.0.4/test/test_runtime.py
--- old/ansible-compat-2.0.2/test/test_runtime.py 2022-03-17 14:29:53.000000000 +0100
+++ new/ansible-compat-2.0.4/test/test_runtime.py 2022-05-16 18:24:27.000000000 +0200
@@ -619,6 +619,13 @@
runtime.prepare_environment(install_local=True)
+def test_prepare_environment_offline_role() -> None:
+ """Ensure that we can make use of offline roles."""
+ with remember_cwd("test/roles/acme.missing_deps"):
+ runtime = Runtime(isolated=True)
+ runtime.prepare_environment(install_local=True, offline=True)
+
+
def test_runtime_run(runtime: Runtime) -> None:
"""Check if tee and non tee mode return same kind of results."""
result1 = runtime.exec(["seq", "10"])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-compat-2.0.2/tox.ini new/ansible-compat-2.0.4/tox.ini
--- old/ansible-compat-2.0.2/tox.ini 2022-03-17 14:29:53.000000000 +0100
+++ new/ansible-compat-2.0.4/tox.ini 2022-05-16 18:24:27.000000000 +0200
@@ -52,7 +52,7 @@
PIP_DISABLE_PIP_VERSION_CHECK = 1
PIP_CONSTRAINT = {toxinidir}/constraints.txt
PRE_COMMIT_COLOR = always
- PYTEST_REQPASS = 74
+ PYTEST_REQPASS = 75
FORCE_COLOR = 1
allowlist_externals =
ansible
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xonsh for openSUSE:Factory checked in at 2022-05-30 12:43:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xonsh (Old)
and /work/SRC/openSUSE:Factory/.xonsh.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xonsh"
Mon May 30 12:43:37 2022 rev:33 rq:979650 version:0.12.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/xonsh/xonsh.changes 2022-05-12 07:59:07.705541995 +0200
+++ /work/SRC/openSUSE:Factory/.xonsh.new.2254/xonsh.changes 2022-05-30 12:44:18.960419725 +0200
@@ -1,0 +2,14 @@
+Sun May 22 10:36:35 UTC 2022 - Sebastian Wagner <sebix+novell.com(a)sebix.at>
+
+- update to version 0.12.4:
+- update to version 0.12.3:
+ - Changed:
+ - fix: remove os.path.basename from _get_git_branch()
+ - now 3rd party xontrib list is maintained at `Awesome Xontribs <https://github.com/xonsh/awesome-xontribs/>`_ page.
+ Going forward, new contributions will be updated here, making it not depending on `the xonsh release <https://github.com/xonsh/xonsh/issues/4679>`_.
+ - Removed:
+ - Removed Python 3.7 support following `NEP0029 <https://numpy.org/neps/nep-0029-deprecation_policy.html>`_
+ - Fixed:
+ - Dictionaries are now pretty-printed with their items in the correct order
+
+-------------------------------------------------------------------
@@ -107 +121 @@
- These codes need to be escaped with ``..`` instead.
+ These codes need to be escaped with ``..`` instead.
Old:
----
xonsh-0.12.2.tar.gz
New:
----
xonsh-0.12.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xonsh.spec ++++++
--- /var/tmp/diff_new_pack.jzzjI4/_old 2022-05-30 12:44:19.620420604 +0200
+++ /var/tmp/diff_new_pack.jzzjI4/_new 2022-05-30 12:44:19.624420610 +0200
@@ -18,7 +18,7 @@
%define pythons python3
Name: xonsh
-Version: 0.12.2
+Version: 0.12.4
Release: 0
Summary: A general purpose, Python-powered shell
License: BSD-3-Clause AND BSD-2-Clause
++++++ xonsh-0.12.2.tar.gz -> xonsh-0.12.4.tar.gz ++++++
/work/SRC/openSUSE:Factory/xonsh/xonsh-0.12.2.tar.gz /work/SRC/openSUSE:Factory/.xonsh.new.2254/xonsh-0.12.4.tar.gz differ: char 15, line 1
1
0