Hello community,
here is the log from the commit of package python-pingparsing for
openSUSE:Factory checked in at 2020-04-27 23:36:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pingparsing (Old)
and /work/SRC/openSUSE:Factory/.python-pingparsing.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pingparsing"
Mon Apr 27 23:36:57 2020 rev:5 rq:798101 version:1.0.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pingparsing/python-pingparsing.changes
2020-04-08 19:55:16.925061960 +0200
+++
/work/SRC/openSUSE:Factory/.python-pingparsing.new.2738/python-pingparsing.changes
2020-04-27 23:37:03.587368842 +0200
@@ -1,0 +2,6 @@
+Sun Apr 26 09:26:51 UTC 2020 - Martin Hauke <mar...@gmx.de>
+
+- Update to version 1.0.3
+ * Fix type annotations
+
+-------------------------------------------------------------------
Old:
----
pingparsing-1.0.2.tar.gz
New:
----
pingparsing-1.0.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pingparsing.spec ++++++
--- /var/tmp/diff_new_pack.ySJfSc/_old 2020-04-27 23:37:04.627370872 +0200
+++ /var/tmp/diff_new_pack.ySJfSc/_new 2020-04-27 23:37:04.631370879 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-pingparsing
-Version: 1.0.2
+Version: 1.0.3
Release: 0
Summary: CLI-tool/Python-library for parsing ping command output
License: MIT
@@ -30,13 +30,12 @@
BuildRequires: fdupes
BuildRequires: python-rpm-macros
# SECTION test requirements
-BuildRequires: %{python_module Logbook >= 0.12.3}
BuildRequires: %{python_module humanreadable >= 0.1.0}
BuildRequires: %{python_module pyparsing >= 2.0.3}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module simplejson}
BuildRequires: %{python_module subprocrunner >= 1.2.1}
-BuildRequires: %{python_module typepy >= 1.0.0}
+BuildRequires: %{python_module typepy >= 1.1.0}
# /SECTION
Requires: python-humanreadable >= 0.1.0
Requires: python-loguru >= 0.4.1
@@ -44,7 +43,7 @@
Requires: python-setuptools >= 38.3.0
Requires: python-simplejson
Requires: python-subprocrunner >= 1.2.1
-Requires: python-typepy >= 1.0.0
+Requires: python-typepy >= 1.1.0
BuildArch: noarch
%python_subpackages
++++++ pingparsing-1.0.2.tar.gz -> pingparsing-1.0.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.0.2/Makefile
new/pingparsing-1.0.3/Makefile
--- old/pingparsing-1.0.2/Makefile 2020-04-04 12:15:05.000000000 +0200
+++ new/pingparsing-1.0.3/Makefile 2020-04-26 04:02:28.000000000 +0200
@@ -35,10 +35,10 @@
.PHONY: release
release:
- @tox -e release
+ @python setup.py release --sign
@make clean
.PHONY: setup
setup:
- @pip install --upgrade -e .[test] tox
+ @pip install --upgrade -e .[test] releasecmd tox
pip check
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.0.2/README.rst
new/pingparsing-1.0.3/README.rst
--- old/pingparsing-1.0.2/README.rst 2020-04-04 12:15:05.000000000 +0200
+++ new/pingparsing-1.0.3/README.rst 2020-04-26 04:02:28.000000000 +0200
@@ -32,7 +32,7 @@
CLI Usage
====================
-A CLI tool (``pingparsing`` command) included in the packaged. The command
could do the following:
+A CLI command (``pingparsing`` command) included in the packaged. The command
could do the following:
- Execute ``ping`` and parse the result
- Parse ping results from:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.0.2/docs/pages/usage/cli_usage.txt
new/pingparsing-1.0.3/docs/pages/usage/cli_usage.txt
--- old/pingparsing-1.0.2/docs/pages/usage/cli_usage.txt 2020-04-04
12:15:05.000000000 +0200
+++ new/pingparsing-1.0.3/docs/pages/usage/cli_usage.txt 2020-04-26
04:02:28.000000000 +0200
@@ -1,6 +1,6 @@
CLI Usage
====================
-A CLI tool (``pingparsing`` command) included in the packaged. The command
could do the following:
+A CLI command (``pingparsing`` command) included in the packaged. The command
could do the following:
- Execute ``ping`` and parse the result
- Parse ping results from:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.0.2/docs/update_command_help.py
new/pingparsing-1.0.3/docs/update_command_help.py
--- old/pingparsing-1.0.2/docs/update_command_help.py 2020-04-04
12:15:05.000000000 +0200
+++ new/pingparsing-1.0.3/docs/update_command_help.py 2020-04-26
04:02:28.000000000 +0200
@@ -1,14 +1,13 @@
#!/usr/bin/env python3
import os
-import sys
from textwrap import indent
from subprocrunner import SubprocessRunner
def main():
- proc = SubprocessRunner([sys.executable, "-m", "pingparsing", "-h"])
+ proc = SubprocessRunner(["pingparsing", "-h"])
proc.run(env=dict(os.environ, LC_ALL="C.UTF-8"))
help_file_path = "pages/usage/cli_help.txt"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.0.2/pingparsing/__main__.py
new/pingparsing-1.0.3/pingparsing/__main__.py
--- old/pingparsing-1.0.2/pingparsing/__main__.py 2020-04-04
12:15:05.000000000 +0200
+++ new/pingparsing-1.0.3/pingparsing/__main__.py 2020-04-26
04:02:28.000000000 +0200
@@ -15,9 +15,8 @@
import humanreadable as hr
from subprocrunner import CommandError
-from pingparsing._logger import logger, set_logger
-
from .__version__ import __version__
+from ._logger import logger, set_logger
from ._pingparsing import PingParsing
from ._pingtransmitter import PingTransmitter
from ._typing import TimeArg
@@ -30,7 +29,6 @@
DEFAULT_COUNT = 10
-QUIET_LOG_LEVEL = "QUIET"
TIMESTAMP_TYPES = (int, float, str)
@@ -44,6 +42,7 @@
class LogLevel:
DEBUG = "DEBUG"
INFO = "INFO"
+ QUIET = "QUIET"
def _get_unit_help_msg() -> str:
@@ -174,7 +173,7 @@
"--quiet",
dest=loglevel_dest,
action="store_const",
- const=QUIET_LOG_LEVEL,
+ const=LogLevel.QUIET,
default=LogLevel.INFO,
help="suppress execution log messages.",
)
@@ -185,11 +184,11 @@
def initialize_logger(log_level: str) -> None:
logger.remove()
- if log_level == QUIET_LOG_LEVEL:
+ if log_level == LogLevel.QUIET:
set_logger(is_enable=False)
return
- if log_level == "DEBUG":
+ if log_level == LogLevel.DEBUG:
log_format = (
"<level>{level: <8}</level> | "
"<cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> -
<level>{message}</level>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.0.2/pingparsing/__version__.py
new/pingparsing-1.0.3/pingparsing/__version__.py
--- old/pingparsing-1.0.2/pingparsing/__version__.py 2020-04-04
12:15:05.000000000 +0200
+++ new/pingparsing-1.0.3/pingparsing/__version__.py 2020-04-26
04:02:28.000000000 +0200
@@ -1,6 +1,6 @@
__author__ = "Tsuyoshi Hombashi"
__copyright__ = "Copyright 2016, {}".format(__author__)
__license__ = "MIT License"
-__version__ = "1.0.2"
+__version__ = "1.0.3"
__maintainer__ = __author__
__email__ = "tsuyoshi.homba...@gmail.com"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.0.2/pingparsing/_cmd_maker.py
new/pingparsing-1.0.3/pingparsing/_cmd_maker.py
--- old/pingparsing-1.0.2/pingparsing/_cmd_maker.py 2020-04-04
12:15:05.000000000 +0200
+++ new/pingparsing-1.0.3/pingparsing/_cmd_maker.py 2020-04-26
04:02:28.000000000 +0200
@@ -1,11 +1,10 @@
import abc
import math
import re
-from typing import Optional
+from typing import List, Optional
import humanreadable as hr
-import typepy
-from typepy import Integer, List, TypeConversionError
+from typepy import Integer, TypeConversionError
DEFAULT_DEADLINE = 3
@@ -56,14 +55,14 @@
if self._timestamp:
command_items.append(self._get_timestamp_option())
- if typepy.is_not_null_string(self.ping_option):
+ if self.ping_option:
command_items.append(self.ping_option)
command_items.append(self._get_destination_host(destination))
return re.sub(r"[\s]{2,}", " ", " ".join(command_items))
- def _get_initial_options(self) -> List:
+ def _get_initial_options(self) -> List[str]:
return []
@abc.abstractmethod
@@ -95,11 +94,11 @@
raise NotImplementedError()
@abc.abstractmethod
- def _get_packet_size_option(self) -> List:
+ def _get_packet_size_option(self) -> List[str]:
raise NotImplementedError()
@abc.abstractmethod
- def _get_ttl_option(self) -> List:
+ def _get_ttl_option(self) -> List[str]:
raise NotImplementedError()
@@ -127,12 +126,12 @@
return "-c {:d}".format(count)
- def _get_packet_size_option(self) -> List:
+ def _get_packet_size_option(self) -> List[str]:
return ["-s", str(self._packet_size)]
class MacosPingCmdMaker(PosixPingCmdMaker):
- def _get_ttl_option(self) -> List:
+ def _get_ttl_option(self) -> List[str]:
return ["-T", str(self._ttl)]
def _get_deadline_option(self) -> str:
@@ -156,7 +155,7 @@
class LinuxPingCmdMaker(PosixPingCmdMaker):
- def _get_ttl_option(self) -> List:
+ def _get_ttl_option(self) -> List[str]:
return ["-t", str(self._ttl)]
def _get_deadline_option(self) -> str:
@@ -178,7 +177,7 @@
class WindowsPingCmdMaker(PingCmdMaker):
- def _get_initial_options(self) -> List:
+ def _get_initial_options(self) -> List[str]:
if self.auto_codepage:
return ["chcp 437 &"]
@@ -225,8 +224,8 @@
return "-n {:d}".format(count)
- def _get_packet_size_option(self) -> List:
+ def _get_packet_size_option(self) -> List[str]:
return ["-l", str(self._packet_size)]
- def _get_ttl_option(self) -> List:
+ def _get_ttl_option(self) -> List[str]:
return ["-i", str(self._ttl)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.0.2/pingparsing/_parser.py
new/pingparsing-1.0.3/pingparsing/_parser.py
--- old/pingparsing-1.0.2/pingparsing/_parser.py 2020-04-04
12:15:05.000000000 +0200
+++ new/pingparsing-1.0.3/pingparsing/_parser.py 2020-04-26
04:02:28.000000000 +0200
@@ -4,7 +4,8 @@
import abc
import re
-from typing import Dict, List, Optional, Pattern, Sequence, Tuple, Union
+from datetime import datetime # noqa
+from typing import Dict, List, Optional, Pattern, Sequence, Tuple, Union #
noqa
import pyparsing as pp
import typepy
@@ -14,6 +15,7 @@
from ._interface import PingParserInterface
from ._logger import logger
from ._stats import PingStats
+from ._typing import IcmpReplies
from .error import ParseError, ParseErrorReason
@@ -52,9 +54,7 @@
def _is_support_packet_duplicate(self) -> bool: # pragma: no cover
pass
- def _parse_icmp_reply(
- self, ping_lines: Sequence[str]
- ) -> Sequence[Dict[str, Union[bool, float, int, DateTime]]]:
+ def _parse_icmp_reply(self, ping_lines: Sequence[str]) -> IcmpReplies:
icmp_reply_regexp = re.compile(self._icmp_reply_pattern, re.IGNORECASE)
duplicate_packet_regexp = re.compile(self._duplicate_packet_pattern)
icmp_reply_list = []
@@ -65,7 +65,7 @@
continue
results = match.groupdict()
- reply = {} # type: Dict[str, Union[bool, float, int, DateTime]]
+ reply = {} # type: Dict[str, Union[bool, float, int, datetime]]
if results.get(IcmpReplyKey.TIMESTAMP):
reply[IcmpReplyKey.TIMESTAMP] = DateTime(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.0.2/pingparsing/_stats.py
new/pingparsing-1.0.3/pingparsing/_stats.py
--- old/pingparsing-1.0.2/pingparsing/_stats.py 2020-04-04 12:15:05.000000000
+0200
+++ new/pingparsing-1.0.3/pingparsing/_stats.py 2020-04-26 04:02:28.000000000
+0200
@@ -2,8 +2,9 @@
.. codeauthor:: Tsuyoshi Hombashi <tsuyoshi.homba...@gmail.com>
"""
+from typing import Dict, Optional, Tuple, Union, cast
-from typing import Dict, List, Optional, Tuple, Union, cast
+from ._typing import IcmpReplies
class PingStats:
@@ -150,7 +151,7 @@
return None
@property
- def icmp_replies(self) -> List[Dict]:
+ def icmp_replies(self) -> IcmpReplies:
"""
ICMP packet reply information.
@@ -180,7 +181,7 @@
def as_dict(
self, include_icmp_replies: bool = False
- ) -> Dict[str, Union[str, int, float, List[Dict], None]]:
+ ) -> Dict[str, Union[str, int, float, IcmpReplies, None]]:
"""
ping statistics.
@@ -219,7 +220,7 @@
"rtt_mdev": self.rtt_mdev,
"packet_duplicate_count": self.packet_duplicate_count,
"packet_duplicate_rate": self.packet_duplicate_rate,
- } # type: Dict[str, Union[str, int, float, List[Dict], None]]
+ } # type: Dict[str, Union[str, int, float, IcmpReplies, None]]
if include_icmp_replies:
d["icmp_replies"] = self.icmp_replies
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.0.2/pingparsing/_typing.py
new/pingparsing-1.0.3/pingparsing/_typing.py
--- old/pingparsing-1.0.2/pingparsing/_typing.py 2020-04-04
12:15:05.000000000 +0200
+++ new/pingparsing-1.0.3/pingparsing/_typing.py 2020-04-26
04:02:28.000000000 +0200
@@ -1,6 +1,8 @@
-from typing import Union
+from datetime import datetime
+from typing import Dict, Sequence, Union
import humanreadable as hr
TimeArg = Union[hr.Time, int, str, None]
+IcmpReplies = Sequence[Dict[str, Union[bool, float, int, datetime]]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.0.2/requirements/requirements.txt
new/pingparsing-1.0.3/requirements/requirements.txt
--- old/pingparsing-1.0.2/requirements/requirements.txt 2020-04-04
12:15:05.000000000 +0200
+++ new/pingparsing-1.0.3/requirements/requirements.txt 2020-04-26
04:02:28.000000000 +0200
@@ -1,4 +1,4 @@
humanreadable>=0.1.0,<1
pyparsing>=2.0.3,<3
subprocrunner>=1.2.1,<2
-typepy>=1.0.0,<2
+typepy>=1.1.0,<2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pingparsing-1.0.2/tox.ini
new/pingparsing-1.0.3/tox.ini
--- old/pingparsing-1.0.2/tox.ini 2020-04-04 12:15:05.000000000 +0200
+++ new/pingparsing-1.0.3/tox.ini 2020-04-26 04:02:28.000000000 +0200
@@ -23,7 +23,7 @@
wheel
commands =
python setup.py sdist bdist_wheel
- twine check dist/*
+ twine check dist/*.whl dist/*.tar.gz
python setup.py clean --all
[testenv:clean]
@@ -67,13 +67,12 @@
pytype
commands =
python setup.py check
- codespell pingparsing docs examples test -q 2 --check-filenames
+ codespell pingparsing docs/pages examples test -q 2 --check-filenames
pytype --keep-going --jobs 2 --disable import-error pingparsing
mypy pingparsing setup.py --ignore-missing-imports --show-error-context
--show-error-codes --python-version 3.5
pylama
[testenv:readme]
-basepython = python3.8
changedir = docs
deps =
path
@@ -82,7 +81,6 @@
python make_readme.py
[testenv:release]
-basepython = python3.8
deps =
releasecmd>=0.3.1,<1
commands =
