Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pingparsing for
openSUSE:Factory checked in at 2024-04-21 20:28:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pingparsing (Old)
and /work/SRC/openSUSE:Factory/.python-pingparsing.new.26366 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pingparsing"
Sun Apr 21 20:28:59 2024 rev:13 rq:1169473 version:1.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pingparsing/python-pingparsing.changes
2023-02-13 16:43:02.488125560 +0100
+++
/work/SRC/openSUSE:Factory/.python-pingparsing.new.26366/python-pingparsing.changes
2024-04-21 20:30:24.740816906 +0200
@@ -1,0 +2,11 @@
+Sun Apr 21 08:48:08 UTC 2024 - Dirk Müller <dmuel...@suse.com>
+
+- update to 1.4.1:
+ * Fix Pygemnts requirement in setup.py
+ * Change the output of the CLI logger to stderr
+ * Add support for Python 3.11
+ * Update help messages
+ * Update requirements
+- drop fix-requirements.patch (upstream)
+
+-------------------------------------------------------------------
Old:
----
fix-requirements.patch
pingparsing-1.4.0.tar.gz
New:
----
pingparsing-1.4.1.tar.gz
BETA DEBUG BEGIN:
Old: * Update requirements
- drop fix-requirements.patch (upstream)
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pingparsing.spec ++++++
--- /var/tmp/diff_new_pack.pddxAL/_old 2024-04-21 20:30:25.660850680 +0200
+++ /var/tmp/diff_new_pack.pddxAL/_new 2024-04-21 20:30:25.660850680 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-pingparsing
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +16,19 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define skip_python2 1
+%{?sle15_python_module_pythons}
Name: python-pingparsing
-Version: 1.4.0
+Version: 1.4.1
Release: 0
Summary: CLI-tool/Python-library for parsing ping command output
License: MIT
Group: Development/Languages/Python
URL: https://github.com/thombashi/pingparsing
Source:
https://github.com/thombashi/pingparsing/archive/v%{version}.tar.gz#/pingparsing-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM gh#thombashi/pingparsing#47
-Patch0: fix-requirements.patch
BuildRequires: %{python_module setuptools >= 38.3.0}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: python-humanreadable >= 0.1.0
+Requires: python-humanreadable >= 0.2
Requires: python-loguru >= 0.4.1
Requires: python-pyparsing >= 2.0.3
Requires: python-pytz >= 2018.9
@@ -40,7 +37,7 @@
Requires: python-subprocrunner >= 1.2.2
Requires: python-typepy >= 1.1.0
Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
BuildArch: noarch
# SECTION test requirements
BuildRequires: %{python_module humanreadable >= 0.1.0}
++++++ pingparsing-1.4.0.tar.gz -> pingparsing-1.4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pingparsing-1.4.0/.github/workflows/codeql-analysis.yml
new/pingparsing-1.4.1/.github/workflows/codeql-analysis.yml
--- old/pingparsing-1.4.0/.github/workflows/codeql-analysis.yml 2021-10-24
17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/.github/workflows/codeql-analysis.yml 2023-02-18
07:44:11.000000000 +0100
@@ -25,12 +25,12 @@
steps:
- name: Checkout repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Initialize CodeQL
- uses: github/codeql-action/init@v1
+ uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ uses: github/codeql-action/analyze@v2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pingparsing-1.4.0/.github/workflows/lint_and_test.yml
new/pingparsing-1.4.1/.github/workflows/lint_and_test.yml
--- old/pingparsing-1.4.0/.github/workflows/lint_and_test.yml 2021-10-24
17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/.github/workflows/lint_and_test.yml 2023-02-18
07:44:11.000000000 +0100
@@ -4,41 +4,18 @@
jobs:
lint:
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
- python-version: ['3.8']
- os: [ubuntu-latest]
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ concurrency:
+ group: ${{ github.workflow }}-${{ github.job }}
+ cancel-in-progress: true
timeout-minutes: 20
+ container:
+ image: ghcr.io/thombashi/python-ci:3.8
steps:
- - uses: actions/checkout@v2
-
- - name: Setup Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
- with:
- python-version: ${{ matrix.python-version }}
-
- - name: Install pip
- run: python -m pip install --upgrade --disable-pip-version-check
"pip>=21.1"
-
- - name: Get pip cache dir
- id: pip-cache
- run: echo "::set-output name=dir::$(pip cache dir)"
-
- - name: Cache pip
- id: cache-pip
- uses: actions/cache@v2
- with:
- path: |
- ${{ steps.pip-cache.outputs.dir }}
- ./.tox
- key: ${{ matrix.os }}-${{ matrix.python-version }}-pip-${{
hashFiles('**/requirements.txt') }}
- restore-keys: |
- ${{ matrix.os }}-${{ matrix.python-version }}-pip-
-
- - name: Install dependencies
- run: make setup-ci
+ - uses: actions/checkout@v3
- name: Lint
run: make check
@@ -48,50 +25,41 @@
strategy:
fail-fast: false
matrix:
- python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", pypy3]
- os: [ubuntu-latest, macos-latest, windows-latest]
+ python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11','pypy-3.8']
+ os: [ubuntu-20.04, macos-latest, windows-latest]
exclude:
- os: windows-latest
python-version: "3.6"
timeout-minutes: 20
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Setup Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
+ cache: pip
+ cache-dependency-path: |
+ setup.py
+ **/*requirements.txt
+ tox.ini
- name: Install pip
run: python -m pip install --upgrade --disable-pip-version-check
"pip>=21.1"
- - name: Get pip cache dir
- id: pip-cache
- run: echo "::set-output name=dir::$(pip cache dir)"
-
- - name: Cache pip
- uses: actions/cache@v2
- with:
- path: |
- ${{ steps.pip-cache.outputs.dir }}
- ./.tox
- key: ${{ matrix.os }}-${{ matrix.python-version }}-pip-${{
hashFiles('**/requirements.txt') }}
- restore-keys: |
- ${{ matrix.os }}-${{ matrix.python-version }}-pip-
-
- name: Install dependencies
run: make setup-ci
- - name: Run tox
+ - name: Run tests
run: tox -e cov -- --discord-verbose=0
env:
PYTEST_DISCORD_WEBHOOK: ${{ secrets.PYTEST_DISCORD_WEBHOOK }}
- name: Upload coverage report
- run: |
- python -m pip install --upgrade --disable-pip-version-check coveralls
- coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.8'
+ if: matrix.os == 'ubuntu-20.04' && matrix.python-version == '3.8'
+ run: |
+ python -m pip install --upgrade --disable-pip-version-check
coveralls tomli
+ coveralls --service=github
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/Makefile
new/pingparsing-1.4.1/Makefile
--- old/pingparsing-1.4.0/Makefile 2021-10-24 17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/Makefile 2023-02-18 07:44:11.000000000 +0100
@@ -36,7 +36,7 @@
.PHONY: idocs
idocs:
@$(PYTHON) -m pip install -q --disable-pip-version-check --upgrade .
- @make docs
+ @$(MAKE) docs
.PHONY: fmt
fmt:
@@ -50,7 +50,7 @@
.PHONY: release
release:
@cd $(PKG_BUILD_DIR) && $(PYTHON) setup.py release --sign --search-dir
$(PACKAGE)
- @make clean
+ @$(MAKE) clean
.PHONY: setup-ci
setup-ci:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/README.rst
new/pingparsing-1.4.1/README.rst
--- old/pingparsing-1.4.0/README.rst 2021-10-24 17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/README.rst 2023-02-18 07:44:11.000000000 +0100
@@ -28,7 +28,7 @@
CLI Usage
====================
-A CLI command (``pingparsing`` command) included in the packaged. The command
could do the following:
+A CLI command (``pingparsing`` command) is included in the package. The
command could do the following:
- Execute ``ping`` and parse the result
- Parse ping results from:
@@ -40,7 +40,7 @@
If you specify destination(s) to the ``pingparsing`` command as positional
arguments,
the command executes ``ping`` for each destination(s) and parses the result.
``ping`` will execute in parallel for multiple destinations.
-The parsed result outputted with JSON format.
+The parsed result is outputted in JSON format.
.. code-block:: console
@@ -293,16 +293,16 @@
destination_or_file [destination_or_file ...]
positional arguments:
- destination_or_file Destinations to send ping, or files to parse. '-'
for
- parse the standard input.
+ destination_or_file Destinations to send ping or files to parse. '-'
for
+ parsing the standard input.
- optional arguments:
+ options:
-h, --help show this help message and exit
-V, --version show program's version number and exit
--max-workers MAX_WORKERS
- Number of threads for when multiple
destination/file
- specified. defaults to equals to two times number
of
- cores.
+ Number of threads for when multiple
destinations/files
+ are specified. Defaults to equal two times the
number
+ of cores.
--debug for debug print.
--quiet suppress execution log messages.
@@ -325,21 +325,22 @@
us/usec/usecs/microsecond/microseconds. if no unit
string found, considered seconds as the time unit.
see
also ping(8) [-w deadline] option description.
note:
- meaning of the 'deadline' may differ system to
system.
+ meaning of the 'deadline' may differ system from to
+ system.
--timeout TIMEOUT Time to wait for a response per packet. Valid time
units are: d/day/days, h/hour/hours,
m/min/mins/minute/minutes,
s/sec/secs/second/seconds,
ms/msec/msecs/millisecond/milliseconds,
- us/usec/usecs/microsecond/microseconds. if no unit
- string found, considered milliseconds as the time
+ us/usec/usecs/microsecond/microseconds. If no unit
+ string is found, consider milliseconds as the time
unit. Attempt to send packets with milliseconds
granularity in default. If the system does not
support
timeout in milliseconds, round up as seconds. Use
system default if not specified. This option will
be
ignored if the system does not support timeout
itself.
See also ping(8) [-W timeout] option description.
- note: meaning of the 'timeout' may differ system to
- system.
+ note: meaning of the 'timeout' may differ from
system
+ to system.
-I INTERFACE, --interface INTERFACE
network interface
--addopts OPTIONS extra command line options
@@ -540,9 +541,15 @@
Sponsors
====================================
-.. image::
https://avatars0.githubusercontent.com/u/44389260?s=48&u=6da7176e51ae2654bcfd22564772ef8a3bb22318&v=4
+.. image::
https://avatars.githubusercontent.com/u/44389260?s=48&u=6da7176e51ae2654bcfd22564772ef8a3bb22318&v=4
:target: https://github.com/chasbecker
:alt: Charles Becker (chasbecker)
+.. image::
https://avatars.githubusercontent.com/u/46711571?s=48&u=57687c0e02d5d6e8eeaf9177f7b7af4c9f275eb5&v=4
+ :target: https://github.com/Arturi0
+ :alt: onetime: Arturi0
+.. image:: https://avatars.githubusercontent.com/u/3658062?s=48&v=4
+ :target: https://github.com/b4tman
+ :alt: onetime: Dmitry Belyaev (b4tman)
`Become a sponsor <https://github.com/sponsors/thombashi>`__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/docs/pages/sponsors.rst
new/pingparsing-1.4.1/docs/pages/sponsors.rst
--- old/pingparsing-1.4.0/docs/pages/sponsors.rst 2021-10-24
17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/docs/pages/sponsors.rst 2023-02-18
07:44:11.000000000 +0100
@@ -1,7 +1,13 @@
Sponsors
====================================
-.. image::
https://avatars0.githubusercontent.com/u/44389260?s=48&u=6da7176e51ae2654bcfd22564772ef8a3bb22318&v=4
+.. image::
https://avatars.githubusercontent.com/u/44389260?s=48&u=6da7176e51ae2654bcfd22564772ef8a3bb22318&v=4
:target: https://github.com/chasbecker
:alt: Charles Becker (chasbecker)
+.. image::
https://avatars.githubusercontent.com/u/46711571?s=48&u=57687c0e02d5d6e8eeaf9177f7b7af4c9f275eb5&v=4
+ :target: https://github.com/Arturi0
+ :alt: onetime: Arturi0
+.. image:: https://avatars.githubusercontent.com/u/3658062?s=48&v=4
+ :target: https://github.com/b4tman
+ :alt: onetime: Dmitry Belyaev (b4tman)
`Become a sponsor <https://github.com/sponsors/thombashi>`__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/docs/pages/usage/cli_help.txt
new/pingparsing-1.4.1/docs/pages/usage/cli_help.txt
--- old/pingparsing-1.4.0/docs/pages/usage/cli_help.txt 2021-10-24
17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/docs/pages/usage/cli_help.txt 2023-02-18
07:44:11.000000000 +0100
@@ -11,16 +11,16 @@
destination_or_file [destination_or_file ...]
positional arguments:
- destination_or_file Destinations to send ping, or files to parse. '-'
for
- parse the standard input.
+ destination_or_file Destinations to send ping or files to parse. '-'
for
+ parsing the standard input.
- optional arguments:
+ options:
-h, --help show this help message and exit
-V, --version show program's version number and exit
--max-workers MAX_WORKERS
- Number of threads for when multiple
destination/file
- specified. defaults to equals to two times number
of
- cores.
+ Number of threads for when multiple
destinations/files
+ are specified. Defaults to equal two times the
number
+ of cores.
--debug for debug print.
--quiet suppress execution log messages.
@@ -43,21 +43,22 @@
us/usec/usecs/microsecond/microseconds. if no unit
string found, considered seconds as the time unit.
see
also ping(8) [-w deadline] option description.
note:
- meaning of the 'deadline' may differ system to
system.
+ meaning of the 'deadline' may differ system from to
+ system.
--timeout TIMEOUT Time to wait for a response per packet. Valid time
units are: d/day/days, h/hour/hours,
m/min/mins/minute/minutes,
s/sec/secs/second/seconds,
ms/msec/msecs/millisecond/milliseconds,
- us/usec/usecs/microsecond/microseconds. if no unit
- string found, considered milliseconds as the time
+ us/usec/usecs/microsecond/microseconds. If no unit
+ string is found, consider milliseconds as the time
unit. Attempt to send packets with milliseconds
granularity in default. If the system does not
support
timeout in milliseconds, round up as seconds. Use
system default if not specified. This option will
be
ignored if the system does not support timeout
itself.
See also ping(8) [-W timeout] option description.
- note: meaning of the 'timeout' may differ system to
- system.
+ note: meaning of the 'timeout' may differ from
system
+ to system.
-I INTERFACE, --interface INTERFACE
network interface
--addopts OPTIONS extra command line options
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/docs/pages/usage/cli_usage.txt
new/pingparsing-1.4.1/docs/pages/usage/cli_usage.txt
--- old/pingparsing-1.4.0/docs/pages/usage/cli_usage.txt 2021-10-24
17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/docs/pages/usage/cli_usage.txt 2023-02-18
07:44:11.000000000 +0100
@@ -1,6 +1,6 @@
CLI Usage
====================
-A CLI command (``pingparsing`` command) included in the packaged. The command
could do the following:
+A CLI command (``pingparsing`` command) is included in the package. The
command could do the following:
- Execute ``ping`` and parse the result
- Parse ping results from:
@@ -12,7 +12,7 @@
If you specify destination(s) to the ``pingparsing`` command as positional
arguments,
the command executes ``ping`` for each destination(s) and parses the result.
``ping`` will execute in parallel for multiple destinations.
-The parsed result outputted with JSON format.
+The parsed result is outputted in JSON format.
.. code-block:: console
:caption: Execute with a single destination
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/docs/update_command_help.py
new/pingparsing-1.4.1/docs/update_command_help.py
--- old/pingparsing-1.4.0/docs/update_command_help.py 2021-10-24
17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/docs/update_command_help.py 2023-02-18
07:44:11.000000000 +0100
@@ -1,14 +1,20 @@
#!/usr/bin/env python3
import os
+import sys
from textwrap import indent
-from subprocrunner import SubprocessRunner
+from subprocrunner import CalledProcessError, SubprocessRunner
def main():
proc = SubprocessRunner(["pingparsing", "-h"])
- proc.run(env=dict(os.environ, LC_ALL="C.UTF-8"))
+ try:
+ proc.run(env=dict(os.environ, LC_ALL="C.UTF-8"), check=True)
+ except CalledProcessError as e:
+ print(f"[ERROR] {e}\n{e.stderr}", file=sys.stderr)
+ sys.exit(1)
+
help_file_path = "pages/usage/cli_help.txt"
print(help_file_path)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/invoke_pytest.py
new/pingparsing-1.4.1/invoke_pytest.py
--- old/pingparsing-1.4.0/invoke_pytest.py 2021-10-24 17:08:57.000000000
+0200
+++ new/pingparsing-1.4.1/invoke_pytest.py 1970-01-01 01:00:00.000000000
+0100
@@ -1,17 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Unit tests at Windows environments required to invoke from py module,
-because of multiprocessing:
-https://py.rtfd.io/en/latest/faq.html?highlight=cmdline#issues-with-py-test-multiprocess-and-setuptools
-"""
-
-import os
-import sys
-
-import py
-
-
-if __name__ == "__main__":
- os.environ["PYTEST_MD_REPORT_COLOR"] = "text"
- sys.exit(py.test.cmdline.main())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/pingparsing/__main__.py
new/pingparsing-1.4.1/pingparsing/__main__.py
--- old/pingparsing-1.4.0/pingparsing/__main__.py 2021-10-24
17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/pingparsing/__main__.py 2023-02-18
07:44:11.000000000 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
"""
.. codeauthor:: Tsuyoshi Hombashi <tsuyoshi.homba...@gmail.com>
"""
@@ -67,14 +65,14 @@
parser.add_argument(
"destination_or_file",
nargs="+",
- help="Destinations to send ping, or files to parse. '-' for parse
the standard input.",
+ help="Destinations to send ping or files to parse. '-' for parsing
the standard input.",
)
parser.add_argument(
"--max-workers",
type=int,
- help="""Number of threads for when multiple destination/file
- specified. defaults to equals to two times number of cores.
+ help="""Number of threads for when multiple destinations/files are
specified.
+ Defaults to equal two times the number of cores.
""",
)
@@ -119,7 +117,7 @@
the time unit.
see also ping(8) [-w deadline] option description.
- note: meaning of the 'deadline' may differ system to system.
+ note: meaning of the 'deadline' may differ system from to system.
""".format(
units=_get_unit_help_msg()
),
@@ -128,15 +126,15 @@
"--timeout",
type=str,
help="""Time to wait for a response per packet.
- Valid time units are: {units}. if no unit string found, considered
milliseconds as
- the time unit.
+ Valid time units are: {units}.
+ If no unit string is found, consider milliseconds as the time unit.
Attempt to send packets with milliseconds granularity in default.
If the system does not support timeout in milliseconds, round up as
seconds.
Use system default if not specified.
This option will be ignored if the system does not support timeout
itself.
See also ping(8) [-W timeout] option description.
- note: meaning of the 'timeout' may differ system to system.
+ note: meaning of the 'timeout' may differ from system to system.
""".format(
units=_get_unit_help_msg()
),
@@ -217,7 +215,7 @@
else:
log_format = "<level>[{level}]</level> {message}"
- logger.add(sys.stdout, colorize=True, format=log_format, level=log_level,
enqueue=True)
+ logger.add(sys.stderr, colorize=True, format=log_format, level=log_level,
enqueue=True)
set_logger(is_enable=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/pingparsing/__version__.py
new/pingparsing-1.4.1/pingparsing/__version__.py
--- old/pingparsing-1.4.0/pingparsing/__version__.py 2021-10-24
17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/pingparsing/__version__.py 2023-02-18
07:44:11.000000000 +0100
@@ -1,6 +1,6 @@
__author__ = "Tsuyoshi Hombashi"
__copyright__ = f"Copyright 2016, {__author__}"
__license__ = "MIT License"
-__version__ = "1.4.0"
+__version__ = "1.4.1"
__maintainer__ = __author__
__email__ = "tsuyoshi.homba...@gmail.com"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/pingparsing/_parser.py
new/pingparsing-1.4.1/pingparsing/_parser.py
--- old/pingparsing-1.4.0/pingparsing/_parser.py 2021-10-24
17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/pingparsing/_parser.py 2023-02-18
07:44:11.000000000 +0100
@@ -31,15 +31,14 @@
class PingParser(PingParserInterface):
-
- _BYTES_PATTERN = fr"\s*(?P<{IcmpReplyKey.BYTES}>[0-9]+) bytes"
+ _BYTES_PATTERN = rf"\s*(?P<{IcmpReplyKey.BYTES}>[0-9]+) bytes"
_DEST_PATTERN = r"(?P<{key}>[a-zA-Z0-9:\-\.\(\)% ]+)".format(
key=IcmpReplyKey.DESTINATION
) # host or ipv4/ipv6 addr
_IPADDR_PATTERN = r"(\d{1,3}\.){3}\d{1,3}"
- _ICMP_SEQ_PATTERN = fr"\s*icmp_seq=(?P<{IcmpReplyKey.SEQUENCE_NO}>\d+)"
- _TTL_PATTERN = fr"\s*ttl=(?P<{IcmpReplyKey.TTL}>\d+)"
- _TIME_PATTERN = fr"\s*time[=<](?P<{IcmpReplyKey.TIME}>[0-9\.]+)"
+ _ICMP_SEQ_PATTERN = rf"\s*icmp_seq=(?P<{IcmpReplyKey.SEQUENCE_NO}>\d+)"
+ _TTL_PATTERN = rf"\s*ttl=(?P<{IcmpReplyKey.TTL}>\d+)"
+ _TIME_PATTERN = rf"\s*time[=<](?P<{IcmpReplyKey.TIME}>[0-9\.]+)"
def __init__(self, timezone: Optional[tzinfo] = None) -> None:
self.__timezone = timezone
@@ -202,8 +201,8 @@
def _parser_name(self) -> str:
return "Linux"
- _TIMESTAMP_PATTERN = fr"(?P<{IcmpReplyKey.TIMESTAMP}>\[[0-9\.]+\])"
- _NO_ANS_TIMESTAMP_PATTERN =
fr"(?P<{IcmpReplyKey.TIMESTAMP_NO_ANS}>\[[0-9\.]+\])"
+ _TIMESTAMP_PATTERN = rf"(?P<{IcmpReplyKey.TIMESTAMP}>\[[0-9\.]+\])"
+ _NO_ANS_TIMESTAMP_PATTERN =
rf"(?P<{IcmpReplyKey.TIMESTAMP_NO_ANS}>\[[0-9\.]+\])"
@property
def _icmp_no_ans_pattern(self) -> str:
@@ -225,7 +224,7 @@
@property
def _stats_headline_pattern(self) -> str:
- return fr"--- {self._DEST_PATTERN} ping statistics ---"
+ return rf"--- {self._DEST_PATTERN} ping statistics ---"
@property
def _is_support_packet_duplicate(self) -> bool:
@@ -313,7 +312,7 @@
return (
" from "
+ self._DEST_PATTERN
- + fr":\s*bytes=(?P<{IcmpReplyKey.BYTES}>[0-9]+)"
+ + rf":\s*bytes=(?P<{IcmpReplyKey.BYTES}>[0-9]+)"
+ self._TIME_PATTERN
+ "ms"
+ self._TTL_PATTERN
@@ -321,7 +320,7 @@
@property
def _stats_headline_pattern(self) -> str:
- return fr"^Ping statistics for {self._DEST_PATTERN}"
+ return rf"^Ping statistics for {self._DEST_PATTERN}"
@property
def _is_support_packet_duplicate(self) -> bool:
@@ -402,7 +401,7 @@
@property
def _stats_headline_pattern(self) -> str:
- return fr"--- {self._DEST_PATTERN} ping statistics ---"
+ return rf"--- {self._DEST_PATTERN} ping statistics ---"
@property
def _is_support_packet_duplicate(self) -> bool:
@@ -480,7 +479,7 @@
+ r"\s+from "
+ self._DEST_PATTERN
+ ": "
- + fr"seq=(?P<{IcmpReplyKey.SEQUENCE_NO}>\d+) "
+ + rf"seq=(?P<{IcmpReplyKey.SEQUENCE_NO}>\d+) "
+ self._TTL_PATTERN
+ self._TIME_PATTERN
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/pylama.ini
new/pingparsing-1.4.1/pylama.ini
--- old/pingparsing-1.4.0/pylama.ini 2021-10-24 17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/pylama.ini 2023-02-18 07:44:11.000000000 +0100
@@ -2,7 +2,7 @@
skip = .eggs/*,.tox/*,*/.env/*,_sandbox/*,build/*,docs/conf.py
[pylama:mccabe]
-complexity=15
+max-complexity = 15
[pylama:pycodestyle]
max_line_length = 100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/pyproject.toml
new/pingparsing-1.4.1/pyproject.toml
--- old/pingparsing-1.4.0/pyproject.toml 2021-10-24 17:08:57.000000000
+0200
+++ new/pingparsing-1.4.1/pyproject.toml 2023-02-18 07:44:11.000000000
+0100
@@ -18,6 +18,7 @@
)/
| docs/conf.py
'''
+target-version = ['py36', 'py37', 'py38', 'py39', 'py310', 'py311']
[tool.isort]
known_third_party= [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/requirements/requirements.txt
new/pingparsing-1.4.1/requirements/requirements.txt
--- old/pingparsing-1.4.0/requirements/requirements.txt 2021-10-24
17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/requirements/requirements.txt 2023-02-18
07:44:11.000000000 +0100
@@ -1,4 +1,4 @@
-humanreadable>=0.1.0,<1
+humanreadable>=0.2,<1
pyparsing>=2.0.3,<4
-subprocrunner>=1.2.2,<2
+subprocrunner>=1.2.2,<3
typepy[datetime]>=1.1.0,<2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/requirements/test_requirements.txt
new/pingparsing-1.4.1/requirements/test_requirements.txt
--- old/pingparsing-1.4.0/requirements/test_requirements.txt 2021-10-24
17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/requirements/test_requirements.txt 2023-02-18
07:44:11.000000000 +0100
@@ -1,3 +1,3 @@
pytest>=6.0.1
-pytest-discord>=0.0.6
-pytest-md-report>=0.0.12
+pytest-discord>=0.1.1
+pytest-md-report>=0.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/setup.py
new/pingparsing-1.4.1/setup.py
--- old/pingparsing-1.4.0/setup.py 2021-10-24 17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/setup.py 2023-02-18 07:44:11.000000000 +0100
@@ -40,7 +40,10 @@
with open(os.path.join(REQUIREMENT_DIR, "test_requirements.txt")) as f:
tests_requires = [line.strip() for line in f if line.strip()]
-CLI_OPT_REQUIRES = ["loguru>=0.4.1,<1", "Pygments>=2.1<3"]
+CLI_OPT_REQUIRES = [
+ "loguru>=0.4.1,<1",
+ "Pygments>=2.1,<3",
+]
setuptools.setup(
name=MODULE_NAME,
@@ -50,7 +53,7 @@
author_email=pkg_info["__email__"],
description=summary,
include_package_data=True,
- keywords=["cli", "network", "ping", "parser", "transmitter"],
+ keywords=["cli", "library", "network", "ping", "parser", "transmitter"],
license=pkg_info["__license__"],
long_description=long_description,
long_description_content_type="text/x-rst",
@@ -81,6 +84,7 @@
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
+ "Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.4.0/tox.ini
new/pingparsing-1.4.1/tox.ini
--- old/pingparsing-1.4.0/tox.ini 2021-10-24 17:08:57.000000000 +0200
+++ new/pingparsing-1.4.1/tox.ini 2023-02-18 07:44:11.000000000 +0100
@@ -1,22 +1,20 @@
[tox]
envlist =
- py{36,37,38,39,310}
+ py{36,37,38,39,310,311}
pypy3
build
- clean
cov
docs
fmt
readme
[testenv]
-deps =
- .[test]
+extras =
+ test
commands =
pytest {posargs}
[testenv:build]
-basepython = python3.8
deps =
twine
wheel
@@ -28,44 +26,42 @@
[testenv:clean]
skip_install = true
deps =
- cleanpy>=0.3.1
+ cleanpy>=0.4
commands =
cleanpy --all --exclude-envs .
[testenv:cov]
+extras =
+ test
deps =
- .[test]
coverage[toml]>=5
commands =
coverage run -m pytest {posargs:-vv}
coverage report -m
[testenv:docs]
-basepython = python3.8
deps =
-r{toxinidir}/requirements/docs_requirements.txt
commands =
python setup.py build_sphinx --source-dir=docs/ --build-dir=docs/_build
--all-files
[testenv:fmt]
-basepython = python3.8
skip_install = true
deps =
- autoflake
- black
+ autoflake>=2
+ black>=23.1
isort>=5
commands =
autoflake --in-place --recursive --remove-all-unused-imports
--ignore-init-module-imports .
isort .
- black invoke_pytest.py setup.py test pingparsing examples
+ black setup.py test pingparsing examples
[testenv:lint]
-basepython = python3.8
skip_install = true
deps =
codespell
- mypy>=0.910
- pylama
+ mypy>=1
+ pylama>=8.4.1
types-pytz
types-simplejson
commands =
@@ -76,9 +72,10 @@
[testenv:readme]
changedir = docs
+extras =
+ cli
deps =
- .[cli]
path
- readmemaker>=1.0.0
+ readmemaker>=1.1.0
commands =
python make_readme.py
