openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
March 2019
- 1 participants
- 2391 discussions
Hello community,
here is the log from the commit of package python-websocket-client for openSUSE:Factory checked in at 2019-03-29 20:37:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-websocket-client (Old)
and /work/SRC/openSUSE:Factory/.python-websocket-client.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-websocket-client"
Fri Mar 29 20:37:12 2019 rev:11 rq:687637 version:0.54.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-websocket-client/python-websocket-client.changes 2018-12-24 11:46:09.525198797 +0100
+++ /work/SRC/openSUSE:Factory/.python-websocket-client.new.25356/python-websocket-client.changes 2019-03-29 20:37:14.454632498 +0100
@@ -1,0 +2,7 @@
+Wed Mar 6 19:47:18 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update to 0.54.0:
+ * many fixes all around, see ChangeLog file
+- Drop merged use_system_cabundle.patch
+
+-------------------------------------------------------------------
Old:
----
use_system_cabundle.patch
websocket_client-0.46.0.tar.gz
New:
----
websocket_client-0.54.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-websocket-client.spec ++++++
--- /var/tmp/diff_new_pack.nmj4lc/_old 2019-03-29 20:37:15.738633214 +0100
+++ /var/tmp/diff_new_pack.nmj4lc/_new 2019-03-29 20:37:15.738633214 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-websocket-client
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,17 +23,14 @@
%else
%define ssl_match_hostname python-backports.ssl_match_hostname
%endif
-%bcond_without test
Name: python-websocket-client
-Version: 0.46.0
+Version: 0.54.0
Release: 0
Summary: WebSocket client implementation
License: LGPL-2.1-only
Group: Development/Languages/Python
URL: https://github.com/liris/websocket-client/releases
Source0: https://files.pythonhosted.org/packages/source/w/websocket_client/websocket…
-# PATCH-FIX-OPENSUSE use_system_cabundle.patch bnc#1076519
-Patch0: use_system_cabundle.patch
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six}
BuildRequires: %{ssl_match_hostname}
@@ -58,21 +55,17 @@
%prep
%setup -q -n websocket_client-%{version}
-%patch0 -p1
%build
%python_build
%install
%python_install
-%python_clone -a %{buildroot}%{_bindir}/wsdump.py
-
%python_expand %fdupes %{buildroot}/%{$python_sitelib}
+%python_clone -a %{buildroot}%{_bindir}/wsdump.py
-%if %{with test}
%check
%python_exec websocket/tests/test_websocket.py
-%endif
%post
%python_install_alternative wsdump.py
@@ -82,7 +75,7 @@
%files %{python_files}
%license LICENSE
-%doc README.rst
+%doc README.rst ChangeLog
%python_alternative %{_bindir}/wsdump.py
%{python_sitelib}/websocket/
%{python_sitelib}/websocket_client-%{version}-py*.egg-info
++++++ websocket_client-0.46.0.tar.gz -> websocket_client-0.54.0.tar.gz ++++++
++++ 6831 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python-astroid for openSUSE:Factory checked in at 2019-03-29 20:37:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-astroid (Old)
and /work/SRC/openSUSE:Factory/.python-astroid.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-astroid"
Fri Mar 29 20:37:03 2019 rev:19 rq:687619 version:2.2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-astroid/python-astroid.changes 2019-03-08 11:01:23.744540859 +0100
+++ /work/SRC/openSUSE:Factory/.python-astroid.new.25356/python-astroid.changes 2019-03-29 20:37:04.798627118 +0100
@@ -1,0 +2,6 @@
+Mon Mar 11 09:46:52 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update to 2.2.5:
+ * The last except handler wins when inferring variables bound in an except handler.
+
+-------------------------------------------------------------------
@@ -4 +10 @@
-- Update to 2.2.1:
+- Update to 2.2.4:
Old:
----
astroid-2.2.4.tar.gz
New:
----
astroid-2.2.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-astroid.spec ++++++
--- /var/tmp/diff_new_pack.qakI7X/_old 2019-03-29 20:37:05.334627416 +0100
+++ /var/tmp/diff_new_pack.qakI7X/_new 2019-03-29 20:37:05.342627420 +0100
@@ -19,7 +19,7 @@
%define skip_python2 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-astroid
-Version: 2.2.4
+Version: 2.2.5
Release: 0
Summary: Representation of Python source as an AST for pylint
License: LGPL-2.1-or-later
++++++ astroid-2.2.4.tar.gz -> astroid-2.2.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-2.2.4/ChangeLog new/astroid-2.2.5/ChangeLog
--- old/astroid-2.2.4/ChangeLog 2019-03-05 10:54:36.000000000 +0100
+++ new/astroid-2.2.5/ChangeLog 2019-03-08 17:57:47.000000000 +0100
@@ -2,6 +2,14 @@
astroid's ChangeLog
===================
+What's New in astroid 2.2.5?
+============================
+Release Date: 2019-03-08
+
+* The last except handler wins when inferring variables bound in an except handler.
+
+ Close PyCQA/pylint#2777, PyCQA/pylint#2802
+
What's New in astroid 2.2.4?
============================
Release Date: 2019-03-05
@@ -42,6 +50,10 @@
Close PyCQA/pylint#2776
+* The last except handler wins when inferring variables bound in an except handler.
+
+ Close PyCQA/pylint#2777
+
What's New in astroid 2.2.0?
============================
Release Date: 2019-02-27
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-2.2.4/PKG-INFO new/astroid-2.2.5/PKG-INFO
--- old/astroid-2.2.4/PKG-INFO 2019-03-05 10:56:04.000000000 +0100
+++ new/astroid-2.2.5/PKG-INFO 2019-03-08 17:59:17.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: astroid
-Version: 2.2.4
+Version: 2.2.5
Summary: An abstract syntax tree for Python with inference support.
Home-page: https://github.com/PyCQA/astroid
Author: Python Code Quality Authority
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-2.2.4/astroid/__pkginfo__.py new/astroid-2.2.5/astroid/__pkginfo__.py
--- old/astroid-2.2.4/astroid/__pkginfo__.py 2019-03-05 10:54:36.000000000 +0100
+++ new/astroid-2.2.5/astroid/__pkginfo__.py 2019-03-08 17:57:47.000000000 +0100
@@ -21,7 +21,7 @@
modname = "astroid"
-version = "2.2.4"
+version = "2.2.5"
numversion = tuple(int(elem) for elem in version.split(".") if elem.isdigit())
extras_require = {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-2.2.4/astroid/node_classes.py new/astroid-2.2.5/astroid/node_classes.py
--- old/astroid-2.2.4/astroid/node_classes.py 2019-03-05 10:54:36.000000000 +0100
+++ new/astroid-2.2.5/astroid/node_classes.py 2019-03-08 17:57:47.000000000 +0100
@@ -1096,6 +1096,18 @@
context = contextmod.InferenceContext()
return bases._infer_stmts(stmts, context, frame)
+ def _get_filtered_node_statements(self, nodes):
+ statements = [(node, node.statement()) for node in nodes]
+ # Next we check if we have ExceptHandlers that are parent
+ # of the underlying variable, in which case the last one survives
+ if len(statements) > 1 and all(
+ isinstance(stmt, ExceptHandler) for _, stmt in statements
+ ):
+ statements = [
+ (node, stmt) for node, stmt in statements if stmt.parent_of(self)
+ ]
+ return statements
+
def _filter_stmts(self, stmts, frame, offset):
"""Filter the given list of statements to remove ignorable statements.
@@ -1149,10 +1161,12 @@
else:
# disabling lineno filtering
mylineno = 0
+
_stmts = []
_stmt_parents = []
- for node in stmts:
- stmt = node.statement()
+ statements = self._get_filtered_node_statements(stmts)
+
+ for node, stmt in statements:
# line filtering is on and we have reached our location, break
if stmt.fromlineno > mylineno > 0:
break
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-2.2.4/astroid/tests/unittest_inference.py new/astroid-2.2.5/astroid/tests/unittest_inference.py
--- old/astroid-2.2.4/astroid/tests/unittest_inference.py 2019-03-05 10:54:36.000000000 +0100
+++ new/astroid-2.2.5/astroid/tests/unittest_inference.py 2019-03-08 17:57:47.000000000 +0100
@@ -5090,5 +5090,64 @@
assert isinstance(inferred, Slice)
+def test_exception_lookup_last_except_handler_wins():
+ node = extract_node(
+ """
+ try:
+ 1/0
+ except ValueError as exc:
+ pass
+ try:
+ 1/0
+ except OSError as exc:
+ exc #@
+ """
+ )
+ inferred = node.inferred()
+ assert len(inferred) == 1
+ inferred_exc = inferred[0]
+ assert isinstance(inferred_exc, Instance)
+ assert inferred_exc.name == "OSError"
+
+ # Check that two except handlers on the same TryExcept works the same as separate
+ # TryExcepts
+ node = extract_node(
+ """
+ try:
+ 1/0
+ except ZeroDivisionError as exc:
+ pass
+ except ValueError as exc:
+ exc #@
+ """
+ )
+ inferred = node.inferred()
+ assert len(inferred) == 1
+ inferred_exc = inferred[0]
+ assert isinstance(inferred_exc, Instance)
+ assert inferred_exc.name == "ValueError"
+
+
+def test_exception_lookup_name_bound_in_except_handler():
+ node = extract_node(
+ """
+ try:
+ 1/0
+ except ValueError:
+ name = 1
+ try:
+ 1/0
+ except OSError:
+ name = 2
+ name #@
+ """
+ )
+ inferred = node.inferred()
+ assert len(inferred) == 1
+ inferred_exc = inferred[0]
+ assert isinstance(inferred_exc, nodes.Const)
+ assert inferred_exc.value == 2
+
+
if __name__ == "__main__":
unittest.main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-2.2.4/astroid.egg-info/PKG-INFO new/astroid-2.2.5/astroid.egg-info/PKG-INFO
--- old/astroid-2.2.4/astroid.egg-info/PKG-INFO 2019-03-05 10:56:04.000000000 +0100
+++ new/astroid-2.2.5/astroid.egg-info/PKG-INFO 2019-03-08 17:59:16.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: astroid
-Version: 2.2.4
+Version: 2.2.5
Summary: An abstract syntax tree for Python with inference support.
Home-page: https://github.com/PyCQA/astroid
Author: Python Code Quality Authority
1
0
Hello community,
here is the log from the commit of package python-coverage for openSUSE:Factory checked in at 2019-03-29 20:36:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-coverage (Old)
and /work/SRC/openSUSE:Factory/.python-coverage.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-coverage"
Fri Mar 29 20:36:55 2019 rev:37 rq:687617 version:4.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-coverage/python-coverage.changes 2019-01-08 12:16:31.837035353 +0100
+++ /work/SRC/openSUSE:Factory/.python-coverage.new.25356/python-coverage.changes 2019-03-29 20:36:57.794622694 +0100
@@ -1,0 +2,7 @@
+Mon Mar 11 10:03:32 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update to 4.5.3:
+ * Only packaging metadata changes.
+- Run fdupes
+
+-------------------------------------------------------------------
Old:
----
coverage-4.5.2.tar.gz
New:
----
coverage-4.5.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-coverage.spec ++++++
--- /var/tmp/diff_new_pack.xG2u2q/_old 2019-03-29 20:36:59.418624119 +0100
+++ /var/tmp/diff_new_pack.xG2u2q/_new 2019-03-29 20:36:59.422624121 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-coverage
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,13 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-coverage
-Version: 4.5.2
+Version: 4.5.3
Release: 0
Summary: Code coverage measurement for Python
License: Apache-2.0
@@ -26,16 +26,19 @@
URL: https://github.com/nedbat/coveragepy
Source: https://files.pythonhosted.org/packages/source/c/coverage/coverage-%{versio…
BuildRequires: %{python_module devel}
+BuildRequires: %{python_module flaky}
+BuildRequires: %{python_module mock}
+BuildRequires: %{python_module pytest-xdist}
+BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module unittest-mixins}
+BuildRequires: %{python_module xml}
+BuildRequires: fdupes
BuildRequires: python-rpm-macros
-# Test requirements:
-#BuildRequires: python-mock
-#BuildRequires: python-nose
Requires: python-setuptools
Requires: python-xml
Requires(post): update-alternatives
Requires(postun): update-alternatives
-Requires(pre): coreutils
%python_subpackages
%description
@@ -45,6 +48,14 @@
%prep
%setup -q -n coverage-%{version}
+# do not require xdist
+sed -i -e '/addopts/d' setup.cfg
+# writes in /usr/
+rm tests/test_process.py
+# summary differs trivialy
+rm tests/test_summary.py
+# requires additional plugins
+rm tests/test_plugins.py
%build
%python_build
@@ -52,6 +63,7 @@
%install
%python_install
%python_clone -a %{buildroot}%{_bindir}/coverage
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
%if 0%{?have_python2} && ! 0%{?skip_python2}
ln -sf coverage-%{python2_version} %{buildroot}%{_bindir}/coverage2
%endif
@@ -59,14 +71,30 @@
ln -sf coverage-%{python3_version} %{buildroot}%{_bindir}/coverage3
%endif
-#NOTE(saschpe): The following seems to mess with the install dir, which is odd:
-#%%check
-# Taken straight from tox.ini:
-#python setup.py develop
-#python igor.py zip_mods install_egg remove_extension
-#python igor.py test_with_tracer py
-#python setup.py --quiet build_ext --inplace
-#python igor.py test_with_tracer c
+%check
+# GetZipBytesTest.test_get_encoded_zip_files - needs zip command
+# test_egg - needs generated egg file
+# test_doctest - weird doctest importing
+# test_unicode - differs between py2/py3
+# test_version - checks for non-compiled variant, we ship only compiled one
+# test_multiprocessing_with_branching - whitespace issue in regexp
+# test_farm - tries to write in /usr
+# test_dothtml_not_python - no idea
+# test_bytes
+# test_one_of
+export LANG=en_US.UTF8
+# Copy executables to py2/3 build areas, to be used for testing
+%{python_expand mkdir build/bin
+for filepath in %{buildroot}/%{_bindir}/coverage*-%{$python_bin_suffix}; do
+ filename=$(basename $filepath)
+ unsuffixed=${filename/-%{$python_bin_suffix}/}
+ cp $filepath build/bin/$unsuffixed
+done
+export PATH="$(pwd)/build/bin:$PATH"
+export PYTHONPATH=%{buildroot}%{$python_sitearch}
+py.test-%{$python_bin_suffix} -v -k 'not (test_get_encoded_zip_files or test_egg or test_doctest or test_unicode or test_version or test_multiprocessing_with_branching or test_farm or test_dothtml_not_python or test_one_of or test_bytes)'
+rm -r build/bin
+}
%post
%python_install_alternative coverage
++++++ coverage-4.5.2.tar.gz -> coverage-4.5.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coverage-4.5.2/CHANGES.rst new/coverage-4.5.3/CHANGES.rst
--- old/coverage-4.5.2/CHANGES.rst 2018-11-12 14:59:11.000000000 +0100
+++ new/coverage-4.5.3/CHANGES.rst 2019-03-09 14:05:19.000000000 +0100
@@ -16,6 +16,14 @@
.. ----------------------------
+.. _changes_453:
+
+Version 4.5.3 -- 2019-03-09
+---------------------------
+
+- Only packaging metadata changes.
+
+
.. _changes_452:
Version 4.5.2 --- 2018-11-12
@@ -24,7 +32,7 @@
- Namespace packages are supported on Python 3.7, where they used to cause
TypeErrors about path being None. Fixes `issue 700`_.
-- Python 3.8 (as of today!) passes all tests. Fixes `issue 707` and
+- Python 3.8 (as of today!) passes all tests. Fixes `issue 707`_ and
`issue 714`_.
- Development moved from `Bitbucket`_ to `GitHub`_.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coverage-4.5.2/NOTICE.txt new/coverage-4.5.3/NOTICE.txt
--- old/coverage-4.5.2/NOTICE.txt 2018-11-03 14:30:32.000000000 +0100
+++ new/coverage-4.5.3/NOTICE.txt 2019-03-09 14:25:01.000000000 +0100
@@ -1,5 +1,5 @@
Copyright 2001 Gareth Rees. All rights reserved.
-Copyright 2004-2018 Ned Batchelder. All rights reserved.
+Copyright 2004-2019 Ned Batchelder. All rights reserved.
Except where noted otherwise, this software is licensed under the Apache
License, Version 2.0 (the "License"); you may not use this work except in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coverage-4.5.2/PKG-INFO new/coverage-4.5.3/PKG-INFO
--- old/coverage-4.5.2/PKG-INFO 2018-11-12 15:23:07.000000000 +0100
+++ new/coverage-4.5.3/PKG-INFO 2019-03-10 13:28:37.000000000 +0100
@@ -1,8 +1,8 @@
Metadata-Version: 1.2
Name: coverage
-Version: 4.5.2
+Version: 4.5.3
Summary: Code coverage measurement for Python
-Home-page: https://bitbucket.org/ned/coveragepy
+Home-page: https://github.com/nedbat/coveragepy
Author: Ned Batchelder and 100 others
Author-email: ned(a)nedbatchelder.com
License: Apache 2.0
@@ -26,7 +26,7 @@
the code analysis tools and tracing hooks provided in the Python standard
library to determine which lines are executable, and which have been executed.
- .. |tideliftlogo| image:: doc/media/Tidelift_Logos_RGB_Tidelift_Shorthand_On-White_small.png
+ .. |tideliftlogo| image:: https://nedbatchelder.com/pix/Tidelift_Logos_RGB_Tidelift_Shorthand_On-Whit…
:width: 75
:alt: Tidelift
@@ -44,16 +44,15 @@
Coverage.py runs on many versions of Python:
- * CPython 2.6, 2.7 and 3.3 through pre-alpha 3.8.
- * PyPy2 5.10 and PyPy3 5.10.
+ * CPython 2.6, 2.7 and 3.3 through alpha 3.8.
+ * PyPy2 6.0 and PyPy3 6.0.
* Jython 2.7.1, though not for reporting.
* IronPython 2.7.7, though not for reporting.
Documentation is on `Read the Docs`_. Code repository and issue tracker are on
- `Bitbucket`_, with a mirrored repository on `GitHub`_.
+ `GitHub`_.
.. _Read the Docs: https://coverage.readthedocs.io/
- .. _Bitbucket: https://bitbucket.org/ned/coveragepy
.. _GitHub: https://github.com/nedbat/coveragepy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coverage-4.5.2/README.rst new/coverage-4.5.3/README.rst
--- old/coverage-4.5.2/README.rst 2018-11-12 13:37:01.000000000 +0100
+++ new/coverage-4.5.3/README.rst 2019-03-09 14:04:03.000000000 +0100
@@ -18,7 +18,7 @@
the code analysis tools and tracing hooks provided in the Python standard
library to determine which lines are executable, and which have been executed.
-.. |tideliftlogo| image:: doc/media/Tidelift_Logos_RGB_Tidelift_Shorthand_On-White_small.png
+.. |tideliftlogo| image:: https://nedbatchelder.com/pix/Tidelift_Logos_RGB_Tidelift_Shorthand_On-Whit…
:width: 75
:alt: Tidelift
@@ -36,16 +36,15 @@
Coverage.py runs on many versions of Python:
-* CPython 2.6, 2.7 and 3.3 through pre-alpha 3.8.
-* PyPy2 5.10 and PyPy3 5.10.
+* CPython 2.6, 2.7 and 3.3 through alpha 3.8.
+* PyPy2 6.0 and PyPy3 6.0.
* Jython 2.7.1, though not for reporting.
* IronPython 2.7.7, though not for reporting.
Documentation is on `Read the Docs`_. Code repository and issue tracker are on
-`Bitbucket`_, with a mirrored repository on `GitHub`_.
+`GitHub`_.
.. _Read the Docs: https://coverage.readthedocs.io/
-.. _Bitbucket: https://bitbucket.org/ned/coveragepy
.. _GitHub: https://github.com/nedbat/coveragepy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coverage-4.5.2/coverage/version.py new/coverage-4.5.3/coverage/version.py
--- old/coverage-4.5.2/coverage/version.py 2018-11-12 14:57:44.000000000 +0100
+++ new/coverage-4.5.3/coverage/version.py 2019-03-09 14:24:30.000000000 +0100
@@ -5,7 +5,7 @@
# This file is exec'ed in setup.py, don't import anything!
# Same semantics as sys.version_info.
-version_info = (4, 5, 2, 'final', 0)
+version_info = (4, 5, 3, 'final', 0)
def _make_version(major, minor, micro, releaselevel, serial):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coverage-4.5.2/coverage.egg-info/PKG-INFO new/coverage-4.5.3/coverage.egg-info/PKG-INFO
--- old/coverage-4.5.2/coverage.egg-info/PKG-INFO 2018-11-12 15:23:05.000000000 +0100
+++ new/coverage-4.5.3/coverage.egg-info/PKG-INFO 2019-03-10 13:28:36.000000000 +0100
@@ -1,8 +1,8 @@
Metadata-Version: 1.2
Name: coverage
-Version: 4.5.2
+Version: 4.5.3
Summary: Code coverage measurement for Python
-Home-page: https://bitbucket.org/ned/coveragepy
+Home-page: https://github.com/nedbat/coveragepy
Author: Ned Batchelder and 100 others
Author-email: ned(a)nedbatchelder.com
License: Apache 2.0
@@ -26,7 +26,7 @@
the code analysis tools and tracing hooks provided in the Python standard
library to determine which lines are executable, and which have been executed.
- .. |tideliftlogo| image:: doc/media/Tidelift_Logos_RGB_Tidelift_Shorthand_On-White_small.png
+ .. |tideliftlogo| image:: https://nedbatchelder.com/pix/Tidelift_Logos_RGB_Tidelift_Shorthand_On-Whit…
:width: 75
:alt: Tidelift
@@ -44,16 +44,15 @@
Coverage.py runs on many versions of Python:
- * CPython 2.6, 2.7 and 3.3 through pre-alpha 3.8.
- * PyPy2 5.10 and PyPy3 5.10.
+ * CPython 2.6, 2.7 and 3.3 through alpha 3.8.
+ * PyPy2 6.0 and PyPy3 6.0.
* Jython 2.7.1, though not for reporting.
* IronPython 2.7.7, though not for reporting.
Documentation is on `Read the Docs`_. Code repository and issue tracker are on
- `Bitbucket`_, with a mirrored repository on `GitHub`_.
+ `GitHub`_.
.. _Read the Docs: https://coverage.readthedocs.io/
- .. _Bitbucket: https://bitbucket.org/ned/coveragepy
.. _GitHub: https://github.com/nedbat/coveragepy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coverage-4.5.2/doc/conf.py new/coverage-4.5.3/doc/conf.py
--- old/coverage-4.5.2/doc/conf.py 2018-11-12 15:01:05.000000000 +0100
+++ new/coverage-4.5.3/doc/conf.py 2019-03-09 14:27:51.000000000 +0100
@@ -49,7 +49,7 @@
# General information about the project.
project = u'Coverage.py'
-copyright = u'2009\N{EN DASH}2018, Ned Batchelder' # CHANGEME
+copyright = u'2009\N{EN DASH}2019, Ned Batchelder' # CHANGEME
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -58,7 +58,7 @@
# The short X.Y version.
version = '4.5' # CHANGEME
# The full version, including alpha/beta/rc tags.
-release = '4.5.2' # CHANGEME
+release = '4.5.3' # CHANGEME
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coverage-4.5.2/doc/index.rst new/coverage-4.5.3/doc/index.rst
--- old/coverage-4.5.2/doc/index.rst 2018-11-12 15:00:32.000000000 +0100
+++ new/coverage-4.5.3/doc/index.rst 2019-03-09 14:27:02.000000000 +0100
@@ -64,10 +64,10 @@
.. ifconfig:: not prerelease
- The latest version is coverage.py 4.5.2, released November 12th 2018. It
+ The latest version is coverage.py 4.5.3, released March 9, 2019. It
is supported on:
- * Python versions 2.6, 2.7, 3.3, 3.4, 3.5, 3.6, 3.7, and pre-alpha 3.8.
+ * Python versions 2.6, 2.7, 3.3, 3.4, 3.5, 3.6, 3.7, and alpha 3.8.
* PyPy2 6.0 and PyPy3 6.0.
@@ -107,11 +107,6 @@
.. _Tidelift Subscription: https://tidelift.com/subscription/pkg/pypi-coverage?utm_source=pypi-coverag…
-Professional support for coverage.py is available as part of the `Tidelift
-Subscription`_.
-
-.. _Tidelift Subscription: https://tidelift.com/subscription/pkg/pypi-coverage?utm_source=pypi-coverag…
-
Quick start
-----------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coverage-4.5.2/doc/requirements.pip new/coverage-4.5.3/doc/requirements.pip
--- old/coverage-4.5.2/doc/requirements.pip 2018-11-12 13:37:01.000000000 +0100
+++ new/coverage-4.5.3/doc/requirements.pip 2019-03-09 13:56:44.000000000 +0100
@@ -2,10 +2,8 @@
# https://requires.io/github/nedbat/coveragepy/requirements/
+doc8==0.8.0
pyenchant==2.0.0
sphinx==1.6.6
sphinxcontrib-spelling==4.0.1
sphinx_rtd_theme==0.2.4
-
-# A version of doc8 with a -q flag.
-git+https://github.com/nedbat/doc8.git#egg=doc8==0.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coverage-4.5.2/howto.txt new/coverage-4.5.3/howto.txt
--- old/coverage-4.5.2/howto.txt 2018-11-12 15:09:43.000000000 +0100
+++ new/coverage-4.5.3/howto.txt 2019-03-10 13:27:20.000000000 +0100
@@ -1,5 +1,6 @@
* Release checklist
+- Check that the current virtualenv matches the currnet coverage branch.
- Version number in coverage/version.py
version_info = (4, 0, 2, 'alpha', 1)
version_info = (4, 0, 2, 'beta', 1)
@@ -43,7 +44,7 @@
$ make publish
- Kits:
- Start fresh:
- - $ make clean
+ - $ make sterile
- Source kit and wheels:
- $ make kit wheel
- Linux wheels:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coverage-4.5.2/setup.py new/coverage-4.5.3/setup.py
--- old/coverage-4.5.2/setup.py 2018-11-12 14:58:25.000000000 +0100
+++ new/coverage-4.5.3/setup.py 2019-03-09 13:56:17.000000000 +0100
@@ -106,7 +106,7 @@
keywords='code coverage testing',
license='Apache 2.0',
classifiers=classifier_list,
- url="https://bitbucket.org/ned/coveragepy",
+ url="https://github.com/nedbat/coveragepy",
python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, <4",
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coverage-4.5.2/tests/test_setup.py new/coverage-4.5.3/tests/test_setup.py
--- old/coverage-4.5.2/tests/test_setup.py 2018-11-12 13:37:02.000000000 +0100
+++ new/coverage-4.5.3/tests/test_setup.py 2019-03-09 13:56:17.000000000 +0100
@@ -28,7 +28,7 @@
out = output.splitlines()
self.assertIn("measurement", out[0])
self.assertEqual(coverage.__version__, out[1])
- self.assertIn("bitbucket.org/ned/coveragepy", out[2])
+ self.assertIn("github.com/nedbat/coveragepy", out[2])
self.assertIn("Ned Batchelder", out[3])
def test_more_metadata(self):
1
0
Hello community,
here is the log from the commit of package python-singledispatch for openSUSE:Factory checked in at 2019-03-29 20:36:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-singledispatch (Old)
and /work/SRC/openSUSE:Factory/.python-singledispatch.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-singledispatch"
Fri Mar 29 20:36:50 2019 rev:5 rq:687604 version:3.4.0.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-singledispatch/python-singledispatch.changes 2017-03-12 20:02:13.436835769 +0100
+++ /work/SRC/openSUSE:Factory/.python-singledispatch.new.25356/python-singledispatch.changes 2019-03-29 20:36:51.710613917 +0100
@@ -1,0 +2,15 @@
+Sun Mar 10 16:28:24 UTC 2019 - Dirk Mueller <dmueller(a)suse.com>
+
+- update license
+
+-------------------------------------------------------------------
+Mon Feb 11 16:21:10 UTC 2019 - John Vandenberg <jayvdb(a)gmail.com>
+
+- Change license to safer Python-2.0, and include as %license
+ See https://bitbucket.org/ambv/singledispatch/issues/9
+- Add missing test module
+- Remove superfluous build dependency on python-devel
+- Remove unnecessary dependency on six
+- Set URL to repository of this backport
+
+-------------------------------------------------------------------
New:
----
LICENSE
test_singledispatch.py
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-singledispatch.spec ++++++
--- /var/tmp/diff_new_pack.gvDuGa/_old 2019-03-29 20:36:52.494615048 +0100
+++ /var/tmp/diff_new_pack.gvDuGa/_new 2019-03-29 20:36:52.494615048 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-singledispatch
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -20,14 +20,13 @@
Version: 3.4.0.3
Release: 0
Summary: Provides functools.singledispatch for Python 2.x
-License: MIT
+License: Python-2.0 AND MIT
Group: Development/Languages/Python
-Url: http://docs.python.org/3/library/functools.html#functools.singledispatch
+URL: https://bitbucket.org/ambv/singledispatch
Source: https://pypi.python.org/packages/source/s/singledispatch/singledispatch-%{v…
-BuildRequires: python-devel
+Source1: https://bitbucket.org/ambv/singledispatch/raw/default/test_singledispatch.py
+Source2: https://raw.githubusercontent.com/python/cpython/master/LICENSE
BuildRequires: python-setuptools
-BuildRequires: python-six
-Requires: python-six
Provides: python2-singledispatch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
@@ -47,6 +46,8 @@
%prep
%setup -q -n singledispatch-%{version}
+cp %{SOURCE1} %{SOURCE2} .
+sed -i "s/'six'//" setup.py
# remove unwanted shebang
sed -i '1 { /^#!/ d }' singledispatch_helpers.py singledispatch.py
@@ -57,10 +58,11 @@
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
%check
-python setup.py test
+python test_singledispatch.py
%files
-%defattr(-,root,root,-)
+# https://bitbucket.org/ambv/singledispatch/issues/9/mit-license
+%license LICENSE
%doc README.rst
%{python_sitelib}/*
++++++ LICENSE ++++++
A. HISTORY OF THE SOFTWARE
==========================
Python was created in the early 1990s by Guido van Rossum at Stichting
Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
as a successor of a language called ABC. Guido remains Python's
principal author, although it includes many contributions from others.
In 1995, Guido continued his work on Python at the Corporation for
National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
in Reston, Virginia where he released several versions of the
software.
In May 2000, Guido and the Python core development team moved to
BeOpen.com to form the BeOpen PythonLabs team. In October of the same
year, the PythonLabs team moved to Digital Creations, which became
Zope Corporation. In 2001, the Python Software Foundation (PSF, see
https://www.python.org/psf/) was formed, a non-profit organization
created specifically to own Python-related Intellectual Property.
Zope Corporation was a sponsoring member of the PSF.
All Python releases are Open Source (see http://www.opensource.org for
the Open Source Definition). Historically, most, but not all, Python
releases have also been GPL-compatible; the table below summarizes
the various releases.
Release Derived Year Owner GPL-
from compatible? (1)
0.9.0 thru 1.2 1991-1995 CWI yes
1.3 thru 1.5.2 1.2 1995-1999 CNRI yes
1.6 1.5.2 2000 CNRI no
2.0 1.6 2000 BeOpen.com no
1.6.1 1.6 2001 CNRI yes (2)
2.1 2.0+1.6.1 2001 PSF no
2.0.1 2.0+1.6.1 2001 PSF yes
2.1.1 2.1+2.0.1 2001 PSF yes
2.1.2 2.1.1 2002 PSF yes
2.1.3 2.1.2 2002 PSF yes
2.2 and above 2.1.1 2001-now PSF yes
Footnotes:
(1) GPL-compatible doesn't mean that we're distributing Python under
the GPL. All Python licenses, unlike the GPL, let you distribute
a modified version without making your changes open source. The
GPL-compatible licenses make it possible to combine Python with
other software that is released under the GPL; the others don't.
(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
because its license has a choice of law clause. According to
CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
is "not incompatible" with the GPL.
Thanks to the many outside volunteers who have worked under Guido's
direction to make these releases possible.
B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
===============================================================
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
--------------------------------------------
1. This LICENSE AGREEMENT is between the Python Software Foundation
("PSF"), and the Individual or Organization ("Licensee") accessing and
otherwise using this software ("Python") in source or binary form and
its associated documentation.
2. Subject to the terms and conditions of this License Agreement, PSF hereby
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python alone or in any derivative version,
provided, however, that PSF's License Agreement and PSF's notice of copyright,
i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Python Software Foundation;
All Rights Reserved" are retained in Python alone or in any derivative version
prepared by Licensee.
3. In the event Licensee prepares a derivative work that is based on
or incorporates Python or any part thereof, and wants to make
the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
the changes made to Python.
4. PSF is making Python available to Licensee on an "AS IS"
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
6. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
7. Nothing in this License Agreement shall be deemed to create any
relationship of agency, partnership, or joint venture between PSF and
Licensee. This License Agreement does not grant permission to use PSF
trademarks or trade name in a trademark sense to endorse or promote
products or services of Licensee, or any third party.
8. By copying, installing or otherwise using Python, Licensee
agrees to be bound by the terms and conditions of this License
Agreement.
BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
-------------------------------------------
BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
Individual or Organization ("Licensee") accessing and otherwise using
this software in source or binary form and its associated
documentation ("the Software").
2. Subject to the terms and conditions of this BeOpen Python License
Agreement, BeOpen hereby grants Licensee a non-exclusive,
royalty-free, world-wide license to reproduce, analyze, test, perform
and/or display publicly, prepare derivative works, distribute, and
otherwise use the Software alone or in any derivative version,
provided, however, that the BeOpen Python License is retained in the
Software, alone or in any derivative version prepared by Licensee.
3. BeOpen is making the Software available to Licensee on an "AS IS"
basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
5. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
6. This License Agreement shall be governed by and interpreted in all
respects by the law of the State of California, excluding conflict of
law provisions. Nothing in this License Agreement shall be deemed to
create any relationship of agency, partnership, or joint venture
between BeOpen and Licensee. This License Agreement does not grant
permission to use BeOpen trademarks or trade names in a trademark
sense to endorse or promote products or services of Licensee, or any
third party. As an exception, the "BeOpen Python" logos available at
http://www.pythonlabs.com/logos.html may be used according to the
permissions granted on that web page.
7. By copying, installing or otherwise using the software, Licensee
agrees to be bound by the terms and conditions of this License
Agreement.
CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
---------------------------------------
1. This LICENSE AGREEMENT is between the Corporation for National
Research Initiatives, having an office at 1895 Preston White Drive,
Reston, VA 20191 ("CNRI"), and the Individual or Organization
("Licensee") accessing and otherwise using Python 1.6.1 software in
source or binary form and its associated documentation.
2. Subject to the terms and conditions of this License Agreement, CNRI
hereby grants Licensee a nonexclusive, royalty-free, world-wide
license to reproduce, analyze, test, perform and/or display publicly,
prepare derivative works, distribute, and otherwise use Python 1.6.1
alone or in any derivative version, provided, however, that CNRI's
License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
1995-2001 Corporation for National Research Initiatives; All Rights
Reserved" are retained in Python 1.6.1 alone or in any derivative
version prepared by Licensee. Alternately, in lieu of CNRI's License
Agreement, Licensee may substitute the following text (omitting the
quotes): "Python 1.6.1 is made available subject to the terms and
conditions in CNRI's License Agreement. This Agreement together with
Python 1.6.1 may be located on the Internet using the following
unique, persistent identifier (known as a handle): 1895.22/1013. This
Agreement may also be obtained from a proxy server on the Internet
using the following URL: http://hdl.handle.net/1895.22/1013".
3. In the event Licensee prepares a derivative work that is based on
or incorporates Python 1.6.1 or any part thereof, and wants to make
the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
the changes made to Python 1.6.1.
4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
6. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
7. This License Agreement shall be governed by the federal
intellectual property law of the United States, including without
limitation the federal copyright law, and, to the extent such
U.S. federal law does not apply, by the law of the Commonwealth of
Virginia, excluding Virginia's conflict of law provisions.
Notwithstanding the foregoing, with regard to derivative works based
on Python 1.6.1 that incorporate non-separable material that was
previously distributed under the GNU General Public License (GPL), the
law of the Commonwealth of Virginia shall govern this License
Agreement only as to issues arising under or with respect to
Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
License Agreement shall be deemed to create any relationship of
agency, partnership, or joint venture between CNRI and Licensee. This
License Agreement does not grant permission to use CNRI trademarks or
trade name in a trademark sense to endorse or promote products or
services of Licensee, or any third party.
8. By clicking on the "ACCEPT" button where indicated, or by copying,
installing or otherwise using Python 1.6.1, Licensee agrees to be
bound by the terms and conditions of this License Agreement.
ACCEPT
CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
--------------------------------------------------
Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
The Netherlands. All rights reserved.
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Stichting Mathematisch
Centrum or CWI not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior
permission.
STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++++++ test_singledispatch.py ++++++
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import collections
import decimal
from itertools import permutations
import singledispatch as functools
from singledispatch_helpers import Support
try:
from collections import ChainMap
except ImportError:
from singledispatch_helpers import ChainMap
collections.ChainMap = ChainMap
try:
from collections import OrderedDict
except ImportError:
from singledispatch_helpers import OrderedDict
collections.OrderedDict = OrderedDict
try:
import unittest2 as unittest
except ImportError:
import unittest
support = Support()
for _prefix in ('collections.abc', '_abcoll'):
if _prefix in repr(collections.Container):
abcoll_prefix = _prefix
break
else:
abcoll_prefix = '?'
del _prefix
class TestSingleDispatch(unittest.TestCase):
def test_simple_overloads(self):
@functools.singledispatch
def g(obj):
return "base"
def g_int(i):
return "integer"
g.register(int, g_int)
self.assertEqual(g("str"), "base")
self.assertEqual(g(1), "integer")
self.assertEqual(g([1,2,3]), "base")
def test_mro(self):
@functools.singledispatch
def g(obj):
return "base"
class A(object):
pass
class C(A):
pass
class B(A):
pass
class D(C, B):
pass
def g_A(a):
return "A"
def g_B(b):
return "B"
g.register(A, g_A)
g.register(B, g_B)
self.assertEqual(g(A()), "A")
self.assertEqual(g(B()), "B")
self.assertEqual(g(C()), "A")
self.assertEqual(g(D()), "B")
def test_register_decorator(self):
@functools.singledispatch
def g(obj):
return "base"
@g.register(int)
def g_int(i):
return "int %s" % (i,)
self.assertEqual(g(""), "base")
self.assertEqual(g(12), "int 12")
self.assertIs(g.dispatch(int), g_int)
self.assertIs(g.dispatch(object), g.dispatch(str))
# Note: in the assert above this is not g.
# @singledispatch returns the wrapper.
def test_wrapping_attributes(self):
@functools.singledispatch
def g(obj):
"Simple test"
return "Test"
self.assertEqual(g.__name__, "g")
self.assertEqual(g.__doc__, "Simple test")
@unittest.skipUnless(decimal, 'requires _decimal')
@support.cpython_only
def test_c_classes(self):
@functools.singledispatch
def g(obj):
return "base"
@g.register(decimal.DecimalException)
def _(obj):
return obj.args
subn = decimal.Subnormal("Exponent < Emin")
rnd = decimal.Rounded("Number got rounded")
self.assertEqual(g(subn), ("Exponent < Emin",))
self.assertEqual(g(rnd), ("Number got rounded",))
@g.register(decimal.Subnormal)
def _(obj):
return "Too small to care."
self.assertEqual(g(subn), "Too small to care.")
self.assertEqual(g(rnd), ("Number got rounded",))
def test_compose_mro(self):
# None of the examples in this test depend on haystack ordering.
c = collections
mro = functools._compose_mro
bases = [c.Sequence, c.MutableMapping, c.Mapping, c.Set]
for haystack in permutations(bases):
m = mro(dict, haystack)
self.assertEqual(m, [dict, c.MutableMapping, c.Mapping, c.Sized,
c.Iterable, c.Container, object])
bases = [c.Container, c.Mapping, c.MutableMapping, c.OrderedDict]
for haystack in permutations(bases):
m = mro(c.ChainMap, haystack)
self.assertEqual(m, [c.ChainMap, c.MutableMapping, c.Mapping,
c.Sized, c.Iterable, c.Container, object])
# If there's a generic function with implementations registered for
# both Sized and Container, passing a defaultdict to it results in an
# ambiguous dispatch which will cause a RuntimeError (see
# test_mro_conflicts).
bases = [c.Container, c.Sized, str]
for haystack in permutations(bases):
m = mro(c.defaultdict, [c.Sized, c.Container, str])
self.assertEqual(m, [c.defaultdict, dict, c.Sized, c.Container,
object])
# MutableSequence below is registered directly on D. In other words, it
# preceeds MutableMapping which means single dispatch will always
# choose MutableSequence here.
class D(c.defaultdict):
pass
c.MutableSequence.register(D)
bases = [c.MutableSequence, c.MutableMapping]
for haystack in permutations(bases):
m = mro(D, bases)
self.assertEqual(m, [D, c.MutableSequence, c.Sequence,
c.defaultdict, dict, c.MutableMapping,
c.Mapping, c.Sized, c.Iterable, c.Container,
object])
# Container and Callable are registered on different base classes and
# a generic function supporting both should always pick the Callable
# implementation if a C instance is passed.
class C(c.defaultdict):
def __call__(self):
pass
bases = [c.Sized, c.Callable, c.Container, c.Mapping]
for haystack in permutations(bases):
m = mro(C, haystack)
self.assertEqual(m, [C, c.Callable, c.defaultdict, dict, c.Mapping,
c.Sized, c.Iterable, c.Container, object])
def test_register_abc(self):
c = collections
d = {"a": "b"}
l = [1, 2, 3]
s = set([object(), None])
f = frozenset(s)
t = (1, 2, 3)
@functools.singledispatch
def g(obj):
return "base"
self.assertEqual(g(d), "base")
self.assertEqual(g(l), "base")
self.assertEqual(g(s), "base")
self.assertEqual(g(f), "base")
self.assertEqual(g(t), "base")
g.register(c.Sized, lambda obj: "sized")
self.assertEqual(g(d), "sized")
self.assertEqual(g(l), "sized")
self.assertEqual(g(s), "sized")
self.assertEqual(g(f), "sized")
self.assertEqual(g(t), "sized")
g.register(c.MutableMapping, lambda obj: "mutablemapping")
self.assertEqual(g(d), "mutablemapping")
self.assertEqual(g(l), "sized")
self.assertEqual(g(s), "sized")
self.assertEqual(g(f), "sized")
self.assertEqual(g(t), "sized")
g.register(c.ChainMap, lambda obj: "chainmap")
self.assertEqual(g(d), "mutablemapping") # irrelevant ABCs registered
self.assertEqual(g(l), "sized")
self.assertEqual(g(s), "sized")
self.assertEqual(g(f), "sized")
self.assertEqual(g(t), "sized")
g.register(c.MutableSequence, lambda obj: "mutablesequence")
self.assertEqual(g(d), "mutablemapping")
self.assertEqual(g(l), "mutablesequence")
self.assertEqual(g(s), "sized")
self.assertEqual(g(f), "sized")
self.assertEqual(g(t), "sized")
g.register(c.MutableSet, lambda obj: "mutableset")
self.assertEqual(g(d), "mutablemapping")
self.assertEqual(g(l), "mutablesequence")
self.assertEqual(g(s), "mutableset")
self.assertEqual(g(f), "sized")
self.assertEqual(g(t), "sized")
g.register(c.Mapping, lambda obj: "mapping")
self.assertEqual(g(d), "mutablemapping") # not specific enough
self.assertEqual(g(l), "mutablesequence")
self.assertEqual(g(s), "mutableset")
self.assertEqual(g(f), "sized")
self.assertEqual(g(t), "sized")
g.register(c.Sequence, lambda obj: "sequence")
self.assertEqual(g(d), "mutablemapping")
self.assertEqual(g(l), "mutablesequence")
self.assertEqual(g(s), "mutableset")
self.assertEqual(g(f), "sized")
self.assertEqual(g(t), "sequence")
g.register(c.Set, lambda obj: "set")
self.assertEqual(g(d), "mutablemapping")
self.assertEqual(g(l), "mutablesequence")
self.assertEqual(g(s), "mutableset")
self.assertEqual(g(f), "set")
self.assertEqual(g(t), "sequence")
g.register(dict, lambda obj: "dict")
self.assertEqual(g(d), "dict")
self.assertEqual(g(l), "mutablesequence")
self.assertEqual(g(s), "mutableset")
self.assertEqual(g(f), "set")
self.assertEqual(g(t), "sequence")
g.register(list, lambda obj: "list")
self.assertEqual(g(d), "dict")
self.assertEqual(g(l), "list")
self.assertEqual(g(s), "mutableset")
self.assertEqual(g(f), "set")
self.assertEqual(g(t), "sequence")
g.register(set, lambda obj: "concrete-set")
self.assertEqual(g(d), "dict")
self.assertEqual(g(l), "list")
self.assertEqual(g(s), "concrete-set")
self.assertEqual(g(f), "set")
self.assertEqual(g(t), "sequence")
g.register(frozenset, lambda obj: "frozen-set")
self.assertEqual(g(d), "dict")
self.assertEqual(g(l), "list")
self.assertEqual(g(s), "concrete-set")
self.assertEqual(g(f), "frozen-set")
self.assertEqual(g(t), "sequence")
g.register(tuple, lambda obj: "tuple")
self.assertEqual(g(d), "dict")
self.assertEqual(g(l), "list")
self.assertEqual(g(s), "concrete-set")
self.assertEqual(g(f), "frozen-set")
self.assertEqual(g(t), "tuple")
def test_c3_abc(self):
c = collections
mro = functools._c3_mro
class A(object):
pass
class B(A):
def __len__(self):
return 0 # implies Sized
#(a)c.Container.register
class C(object):
pass
c.Container.register(C)
class D(object):
pass # unrelated
class X(D, C, B):
def __call__(self):
pass # implies Callable
expected = [X, c.Callable, D, C, c.Container, B, c.Sized, A, object]
for abcs in permutations([c.Sized, c.Callable, c.Container]):
self.assertEqual(mro(X, abcs=abcs), expected)
# unrelated ABCs don't appear in the resulting MRO
many_abcs = [c.Mapping, c.Sized, c.Callable, c.Container, c.Iterable]
self.assertEqual(mro(X, abcs=many_abcs), expected)
def test_mro_conflicts(self):
c = collections
@functools.singledispatch
def g(arg):
return "base"
class O(c.Sized):
def __len__(self):
return 0
o = O()
self.assertEqual(g(o), "base")
g.register(c.Iterable, lambda arg: "iterable")
g.register(c.Container, lambda arg: "container")
g.register(c.Sized, lambda arg: "sized")
g.register(c.Set, lambda arg: "set")
self.assertEqual(g(o), "sized")
c.Iterable.register(O)
self.assertEqual(g(o), "sized") # because it's explicitly in __mro__
c.Container.register(O)
self.assertEqual(g(o), "sized") # see above: Sized is in __mro__
c.Set.register(O)
self.assertEqual(g(o), "set") # because c.Set is a subclass of
# c.Sized and c.Container
class P(object):
pass
p = P()
self.assertEqual(g(p), "base")
c.Iterable.register(P)
self.assertEqual(g(p), "iterable")
c.Container.register(P)
with self.assertRaises(RuntimeError) as re_one:
g(p)
self.assertIn(
str(re_one.exception),
(("Ambiguous dispatch: <class '{prefix}.Container'> "
"or <class '{prefix}.Iterable'>").format(prefix=abcoll_prefix),
("Ambiguous dispatch: <class '{prefix}.Iterable'> "
"or <class '{prefix}.Container'>").format(prefix=abcoll_prefix)),
)
class Q(c.Sized):
def __len__(self):
return 0
q = Q()
self.assertEqual(g(q), "sized")
c.Iterable.register(Q)
self.assertEqual(g(q), "sized") # because it's explicitly in __mro__
c.Set.register(Q)
self.assertEqual(g(q), "set") # because c.Set is a subclass of
# c.Sized and c.Iterable
@functools.singledispatch
def h(arg):
return "base"
@h.register(c.Sized)
def _(arg):
return "sized"
@h.register(c.Container)
def _(arg):
return "container"
# Even though Sized and Container are explicit bases of MutableMapping,
# this ABC is implicitly registered on defaultdict which makes all of
# MutableMapping's bases implicit as well from defaultdict's
# perspective.
with self.assertRaises(RuntimeError) as re_two:
h(c.defaultdict(lambda: 0))
self.assertIn(
str(re_two.exception),
(("Ambiguous dispatch: <class '{prefix}.Container'> "
"or <class '{prefix}.Sized'>").format(prefix=abcoll_prefix),
("Ambiguous dispatch: <class '{prefix}.Sized'> "
"or <class '{prefix}.Container'>").format(prefix=abcoll_prefix)),
)
class R(c.defaultdict):
pass
c.MutableSequence.register(R)
@functools.singledispatch
def i(arg):
return "base"
@i.register(c.MutableMapping)
def _(arg):
return "mapping"
@i.register(c.MutableSequence)
def _(arg):
return "sequence"
r = R()
self.assertEqual(i(r), "sequence")
class S(object):
pass
class T(S, c.Sized):
def __len__(self):
return 0
t = T()
self.assertEqual(h(t), "sized")
c.Container.register(T)
self.assertEqual(h(t), "sized") # because it's explicitly in the MRO
class U(object):
def __len__(self):
return 0
u = U()
self.assertEqual(h(u), "sized") # implicit Sized subclass inferred
# from the existence of __len__()
c.Container.register(U)
# There is no preference for registered versus inferred ABCs.
with self.assertRaises(RuntimeError) as re_three:
h(u)
self.assertIn(
str(re_three.exception),
(("Ambiguous dispatch: <class '{prefix}.Container'> "
"or <class '{prefix}.Sized'>").format(prefix=abcoll_prefix),
("Ambiguous dispatch: <class '{prefix}.Sized'> "
"or <class '{prefix}.Container'>").format(prefix=abcoll_prefix)),
)
class V(c.Sized, S):
def __len__(self):
return 0
@functools.singledispatch
def j(arg):
return "base"
@j.register(S)
def _(arg):
return "s"
@j.register(c.Container)
def _(arg):
return "container"
v = V()
self.assertEqual(j(v), "s")
c.Container.register(V)
self.assertEqual(j(v), "container") # because it ends up right after
# Sized in the MRO
def test_cache_invalidation(self):
try:
from collections import UserDict
except ImportError:
from UserDict import UserDict
class TracingDict(UserDict):
def __init__(self, *args, **kwargs):
UserDict.__init__(self, *args, **kwargs)
self.set_ops = []
self.get_ops = []
def __getitem__(self, key):
result = self.data[key]
self.get_ops.append(key)
return result
def __setitem__(self, key, value):
self.set_ops.append(key)
self.data[key] = value
def clear(self):
self.data.clear()
_orig_wkd = functools.WeakKeyDictionary
td = TracingDict()
functools.WeakKeyDictionary = lambda: td
c = collections
@functools.singledispatch
def g(arg):
return "base"
d = {}
l = []
self.assertEqual(len(td), 0)
self.assertEqual(g(d), "base")
self.assertEqual(len(td), 1)
self.assertEqual(td.get_ops, [])
self.assertEqual(td.set_ops, [dict])
self.assertEqual(td.data[dict], g.registry[object])
self.assertEqual(g(l), "base")
self.assertEqual(len(td), 2)
self.assertEqual(td.get_ops, [])
self.assertEqual(td.set_ops, [dict, list])
self.assertEqual(td.data[dict], g.registry[object])
self.assertEqual(td.data[list], g.registry[object])
self.assertEqual(td.data[dict], td.data[list])
self.assertEqual(g(l), "base")
self.assertEqual(g(d), "base")
self.assertEqual(td.get_ops, [list, dict])
self.assertEqual(td.set_ops, [dict, list])
g.register(list, lambda arg: "list")
self.assertEqual(td.get_ops, [list, dict])
self.assertEqual(len(td), 0)
self.assertEqual(g(d), "base")
self.assertEqual(len(td), 1)
self.assertEqual(td.get_ops, [list, dict])
self.assertEqual(td.set_ops, [dict, list, dict])
self.assertEqual(td.data[dict],
functools._find_impl(dict, g.registry))
self.assertEqual(g(l), "list")
self.assertEqual(len(td), 2)
self.assertEqual(td.get_ops, [list, dict])
self.assertEqual(td.set_ops, [dict, list, dict, list])
self.assertEqual(td.data[list],
functools._find_impl(list, g.registry))
class X(object):
pass
c.MutableMapping.register(X) # Will not invalidate the cache,
# not using ABCs yet.
self.assertEqual(g(d), "base")
self.assertEqual(g(l), "list")
self.assertEqual(td.get_ops, [list, dict, dict, list])
self.assertEqual(td.set_ops, [dict, list, dict, list])
g.register(c.Sized, lambda arg: "sized")
self.assertEqual(len(td), 0)
self.assertEqual(g(d), "sized")
self.assertEqual(len(td), 1)
self.assertEqual(td.get_ops, [list, dict, dict, list])
self.assertEqual(td.set_ops, [dict, list, dict, list, dict])
self.assertEqual(g(l), "list")
self.assertEqual(len(td), 2)
self.assertEqual(td.get_ops, [list, dict, dict, list])
self.assertEqual(td.set_ops, [dict, list, dict, list, dict, list])
self.assertEqual(g(l), "list")
self.assertEqual(g(d), "sized")
self.assertEqual(td.get_ops, [list, dict, dict, list, list, dict])
self.assertEqual(td.set_ops, [dict, list, dict, list, dict, list])
g.dispatch(list)
g.dispatch(dict)
self.assertEqual(td.get_ops, [list, dict, dict, list, list, dict,
list, dict])
self.assertEqual(td.set_ops, [dict, list, dict, list, dict, list])
c.MutableSet.register(X) # Will invalidate the cache.
self.assertEqual(len(td), 2) # Stale cache.
self.assertEqual(g(l), "list")
self.assertEqual(len(td), 1)
g.register(c.MutableMapping, lambda arg: "mutablemapping")
self.assertEqual(len(td), 0)
self.assertEqual(g(d), "mutablemapping")
self.assertEqual(len(td), 1)
self.assertEqual(g(l), "list")
self.assertEqual(len(td), 2)
g.register(dict, lambda arg: "dict")
self.assertEqual(g(d), "dict")
self.assertEqual(g(l), "list")
g._clear_cache()
self.assertEqual(len(td), 0)
functools.WeakKeyDictionary = _orig_wkd
if __name__ == '__main__':
unittest.main()
1
0
Hello community,
here is the log from the commit of package python-xcffib for openSUSE:Factory checked in at 2019-03-29 20:36:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-xcffib (Old)
and /work/SRC/openSUSE:Factory/.python-xcffib.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-xcffib"
Fri Mar 29 20:36:45 2019 rev:4 rq:687601 version:0.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-xcffib/python-xcffib.changes 2019-01-25 22:45:25.711075589 +0100
+++ /work/SRC/openSUSE:Factory/.python-xcffib.new.25356/python-xcffib.changes 2019-03-29 20:36:46.646606612 +0100
@@ -1,0 +2,8 @@
+Mon Mar 4 11:54:51 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update to 0.7.0:
+ * Various updates and fixes for ghc/cabal
+ * Drop unnecessary imports
+- Enable tests
+
+-------------------------------------------------------------------
Old:
----
xcffib-0.6.0.tar.gz
New:
----
xcffib-0.7.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-xcffib.spec ++++++
--- /var/tmp/diff_new_pack.zn2IUK/_old 2019-03-29 20:36:47.374607662 +0100
+++ /var/tmp/diff_new_pack.zn2IUK/_new 2019-03-29 20:36:47.378607667 +0100
@@ -12,33 +12,31 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-# Missing files for tests
-%bcond_with tests
Name: python-xcffib
-Version: 0.6.0
+Version: 0.7.0
Release: 0
Summary: A drop in replacement for xpyb, an XCB python binding
License: Apache-2.0
Group: Development/Languages/Python
URL: http://github.com/tych0/xcffib
Source: https://files.pythonhosted.org/packages/source/x/xcffib/xcffib-%{version}.t…
-BuildRequires: %{python_module cffi}
+BuildRequires: %{python_module cffi >= 1.1.0}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six}
BuildRequires: fdupes
BuildRequires: libxcb-devel
BuildRequires: python-rpm-macros
-Requires: python-cffi
+BuildRequires: xeyes
+BuildRequires: xvfb-run
+Requires: python-cffi >= 1.1.0
Requires: python-six
BuildArch: noarch
-%if %{with tests}
BuildRequires: %{python_module nose}
-%endif
%python_subpackages
%description
@@ -47,18 +45,18 @@
%prep
%setup -q -n xcffib-%{version}
+# upstream moves files compared to git repository
+sed -i -e 's:from \.testing:from testing:g' test/*.py
%build
%python_build
%install
%python_install
-%python_expand %fdupes %{buildroot}%{$python_sitearch}
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
-%if %{with tests}
%check
-%python_expand nosetests-%{$python_bin_suffix}
-%endif
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} xvfb-run nosetests-%{$python_bin_suffix} -v
%files %{python_files}
%license LICENSE
++++++ xcffib-0.6.0.tar.gz -> xcffib-0.7.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcffib-0.6.0/PKG-INFO new/xcffib-0.7.0/PKG-INFO
--- old/xcffib-0.6.0/PKG-INFO 2018-03-07 03:32:38.000000000 +0100
+++ new/xcffib-0.7.0/PKG-INFO 2019-02-15 02:31:18.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: xcffib
-Version: 0.6.0
+Version: 0.7.0
Summary: A drop in replacement for xpyb, an XCB python binding
Home-page: http://github.com/tych0/xcffib
Author: Tycho Andersen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcffib-0.6.0/setup.cfg new/xcffib-0.7.0/setup.cfg
--- old/xcffib-0.6.0/setup.cfg 2018-03-07 03:32:38.000000000 +0100
+++ new/xcffib-0.7.0/setup.cfg 2019-02-15 02:31:18.000000000 +0100
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcffib-0.6.0/setup.py new/xcffib-0.7.0/setup.py
--- old/xcffib-0.6.0/setup.py 2018-03-07 03:32:37.000000000 +0100
+++ new/xcffib-0.7.0/setup.py 2019-02-15 02:31:17.000000000 +0100
@@ -60,7 +60,7 @@
cffi_modules=["xcffib/ffi_build.py:ffi"]
)
-version = "0.6.0"
+version = "0.7.0"
dependencies = ['six', requires_cffi]
setup(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcffib-0.6.0/xcffib/__init__.py new/xcffib-0.7.0/xcffib/__init__.py
--- old/xcffib-0.6.0/xcffib/__init__.py 2018-03-07 03:32:37.000000000 +0100
+++ new/xcffib-0.7.0/xcffib/__init__.py 2019-02-15 02:31:17.000000000 +0100
@@ -15,6 +15,7 @@
from __future__ import division, absolute_import
+import ctypes.util
import functools
import platform
import six
@@ -26,15 +27,18 @@
except ImportError:
from xcffib.ffi_build import ffi
-soname = "libxcb.so.1"
if platform.system() == "Darwin":
soname = "libxcb.dylib"
elif platform.system() == "Windows":
soname = "libxcb.dll"
+else:
+ soname = ctypes.util.find_library("xcb")
+ if soname is None:
+ soname = "libxcb.so"
lib = ffi.dlopen(soname)
__xcb_proto_version__ = "1.13"
-__version__ = "0.6.0"
+__version__ = "0.7.0"
X_PROTOCOL = lib.X_PROTOCOL
X_PROTOCOL_REVISION = lib.X_PROTOCOL_REVISION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcffib-0.6.0/xcffib.egg-info/PKG-INFO new/xcffib-0.7.0/xcffib.egg-info/PKG-INFO
--- old/xcffib-0.6.0/xcffib.egg-info/PKG-INFO 2018-03-07 03:32:38.000000000 +0100
+++ new/xcffib-0.7.0/xcffib.egg-info/PKG-INFO 2019-02-15 02:31:18.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: xcffib
-Version: 0.6.0
+Version: 0.7.0
Summary: A drop in replacement for xpyb, an XCB python binding
Home-page: http://github.com/tych0/xcffib
Author: Tycho Andersen
1
0
Hello community,
here is the log from the commit of package python-importlib_resources for openSUSE:Factory checked in at 2019-03-29 20:36:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-importlib_resources (Old)
and /work/SRC/openSUSE:Factory/.python-importlib_resources.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-importlib_resources"
Fri Mar 29 20:36:41 2019 rev:3 rq:687564 version:1.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-importlib_resources/python-importlib_resources.changes 2019-02-06 14:07:47.510645155 +0100
+++ /work/SRC/openSUSE:Factory/.python-importlib_resources.new.25356/python-importlib_resources.changes 2019-03-29 20:36:42.594600766 +0100
@@ -1,0 +2,5 @@
+Thu Mar 21 15:48:41 UTC 2019 - John Vandenberg <jayvdb(a)gmail.com>
+
+- Simplify logic for typing dependency
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-importlib_resources.spec ++++++
--- /var/tmp/diff_new_pack.Dc6jMd/_old 2019-03-29 20:36:43.106601505 +0100
+++ /var/tmp/diff_new_pack.Dc6jMd/_new 2019-03-29 20:36:43.110601511 +0100
@@ -26,19 +26,15 @@
URL: https://gitlab.com/python-devs/importlib_resources
Source: https://files.pythonhosted.org/packages/source/i/importlib_resources/import…
BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module typing}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: python2-pathlib2
-BuildRequires: python2-typing
BuildArch: noarch
-%if %{python_version_nodots} < 36
-BuildRequires: python3-typing
-Requires: python3-typing
-%endif
+Requires: python-typing
%ifpython2
Requires: python-pathlib2
-Requires: python-typing
%endif
%python_subpackages
1
0
Hello community,
here is the log from the commit of package python-Mako for openSUSE:Factory checked in at 2019-03-29 20:36:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Mako (Old)
and /work/SRC/openSUSE:Factory/.python-Mako.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Mako"
Fri Mar 29 20:36:31 2019 rev:32 rq:687333 version:1.0.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Mako/python-Mako.changes 2018-07-14 20:20:07.251399099 +0200
+++ /work/SRC/openSUSE:Factory/.python-Mako.new.25356/python-Mako.changes 2019-03-29 20:36:34.114588533 +0100
@@ -1,0 +2,6 @@
+Thu Mar 21 13:36:46 UTC 2019 - Ondřej Súkup <mimi.vx(a)gmail.com>
+
+- update to 1.0.8
+ * Added --output-encoding flag to the mako-render script
+
+-------------------------------------------------------------------
Old:
----
Mako-1.0.7.tar.gz
New:
----
Mako-1.0.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Mako.spec ++++++
--- /var/tmp/diff_new_pack.EGVSbP/_old 2019-03-29 20:36:34.750589451 +0100
+++ /var/tmp/diff_new_pack.EGVSbP/_new 2019-03-29 20:36:34.754589456 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-Mako
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,14 +12,14 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define oldpython python
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-Mako
-Version: 1.0.7
+Version: 1.0.8
Release: 0
Summary: A Python templating language
License: MIT
++++++ Mako-1.0.7.tar.gz -> Mako-1.0.8.tar.gz ++++++
++++ 39933 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python-psutil for openSUSE:Factory checked in at 2019-03-29 20:36:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-psutil (Old)
and /work/SRC/openSUSE:Factory/.python-psutil.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-psutil"
Fri Mar 29 20:36:27 2019 rev:49 rq:687163 version:5.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-psutil/python-psutil.changes 2019-03-12 09:46:01.155626513 +0100
+++ /work/SRC/openSUSE:Factory/.python-psutil.new.25356/python-psutil.changes 2019-03-29 20:36:28.702580726 +0100
@@ -1,0 +2,15 @@
+Mon Mar 18 02:29:21 UTC 2019 - John Vandenberg <jayvdb(a)gmail.com>
+
+- Active test suite, using skip-test-missing-warnings.patch to
+ explicitly skip 2 tests regarding warnings, skip-flaky-i586.patch
+ to skip a flaky i586 test, and setting TRAVIS to skip tests which
+ upstream doesnt run in their CI
+- Add upstream pr_1364.patch to fix reading /sys/blocks on Linux 4.18+
+- Remove tests from installed package
+- Use URL https://github.com/giampaolo/psutil
+- Use LANG=en_US.UTF-8 in %check to avoid failure in test_pmap
+- update to version 5.6.1
+ * No changes effecting Linux
+ * Many checks added to tests to skip tests for missing features
+
+-------------------------------------------------------------------
Old:
----
psutil-5.6.0.tar.gz
New:
----
pr_1364.patch
psutil-5.6.1.tar.gz
skip-flaky-i586.patch
skip-test-missing-warnings.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-psutil.spec ++++++
--- /var/tmp/diff_new_pack.iNPsY3/_old 2019-03-29 20:36:29.654582099 +0100
+++ /var/tmp/diff_new_pack.iNPsY3/_new 2019-03-29 20:36:29.658582105 +0100
@@ -16,27 +16,35 @@
#
+%ifarch x86_64 %{ix86}
+%bcond_without test
+%else
+%bcond_with test
+%endif
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-psutil
-Version: 5.6.0
+Version: 5.6.1
Release: 0
Summary: A process utilities module for Python
License: BSD-3-Clause
Group: Development/Languages/Python
-URL: https://pypi.python.org/pypi/psutil/
+URL: https://github.com/giampaolo/psutil
Source: https://files.pythonhosted.org/packages/source/p/psutil/psutil-%{version}.t…
+Patch0: pr_1364.patch
+Patch1: skip-test-missing-warnings.patch
+Patch2: skip-flaky-i586.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: net-tools
Requires: procps
-# SECTION test requirements
+%if %{with test}
BuildRequires: net-tools
BuildRequires: procps
BuildRequires: python-ipaddress
BuildRequires: python-mock
-# /SECTION
+%endif
%ifpython2
Requires: python-ipaddress
%endif
@@ -47,6 +55,10 @@
%prep
%setup -q -n psutil-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
# Remove shebangs
sed -i "1s/#!.*//" psutil/{__init__.py,_compat.py,_psbsd.py,_pslinux.py,_psosx.py,_psposix.py,_pssunos.py,_pswindows.py}
@@ -60,14 +72,26 @@
cp -r scripts %{buildroot}%{_docdir}/%{$python_prefix}-psutil/
find %{buildroot}%{_docdir}/%{$python_prefix}-psutil/scripts/ -type f -name "*.py" -exec sed -i "s|#!%{_bindir}/env python|#!%__$python|" {} \;
find %{buildroot}%{$python_sitearch}/psutil/tests/ -type f -name "*.py" -exec sed -i "s|#!%{_bindir}/env python|#!%__$python|" {} \;
-chmod a+x %{buildroot}%{$python_sitearch}/psutil/tests/*.py
-chmod a-x %{buildroot}%{$python_sitearch}/psutil/tests/__init__.py
-$python -m compileall -d %{$python_sitearch} %{buildroot}%{$python_sitearch}/psutil/tests/
-$python -O -m compileall -d %{$python_sitearch} %{buildroot}%{$python_sitearch}/psutil/tests/
+rm -r %{buildroot}%{$python_sitearch}/psutil/tests/
%fdupes %{buildroot}%{_docdir}/%{$python_prefix}-psutil/
%fdupes %{buildroot}%{$python_sitearch}
}
+%if %{with test}
+%check
+export LANG=en_US.UTF-8
+export PSUTIL_TESTING=1
+export TRAVIS=1
+
+# Note test_fetch_all is a bit flaky, occasionally failing
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
+cp -r scripts %{buildroot}%{$python_sitearch}/
+cp -r psutil/tests %{buildroot}%{$python_sitearch}/psutil
+$python -W default %{buildroot}%{$python_sitearch}/psutil/tests/__main__.py
+rm -r %{buildroot}%{$python_sitearch}/scripts %{buildroot}%{$python_sitearch}/psutil/tests
+}
+%endif
+
%files %{python_files}
%license LICENSE
%doc CREDITS HISTORY.rst README.rst
++++++ pr_1364.patch ++++++
>From 6688d5fca0f5d19ff7741b2d1585882c4663541b Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle(a)vdwaa.nl>
Date: Sun, 18 Nov 2018 19:55:08 +0100
Subject: [PATCH] [Linux] read_sysfs() fails on Linux 4.18+
Linux kernel 4.18+ added 4 fields to /sys/block/$dev/stat, ignore them
and parse the rest as usual.
---
psutil/_pslinux.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py
index b775d39ae..12f17e861 100644
--- a/psutil/_pslinux.py
+++ b/psutil/_pslinux.py
@@ -1099,8 +1099,13 @@ def read_sysfs():
with open_text(os.path.join(root, 'stat')) as f:
fields = f.read().strip().split()
name = os.path.basename(root)
- (reads, reads_merged, rbytes, rtime, writes, writes_merged,
- wbytes, wtime, _, busy_time, _) = map(int, fields)
+ if len(fields) == 11:
+ (reads, reads_merged, rbytes, rtime, writes, writes_merged,
+ wbytes, wtime, _, busy_time, _) = map(int, fields)
+ else: # Linux 4.18+ adds for fields for discard
+ (reads, reads_merged, rbytes, rtime, writes, writes_merged,
+ wbytes, wtime, _, busy_time, _, _, _, _, _) = map(int,
+ fields)
yield (name, reads, writes, rbytes, wbytes, rtime,
wtime, reads_merged, writes_merged, busy_time)
++++++ psutil-5.6.0.tar.gz -> psutil-5.6.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/CREDITS new/psutil-5.6.1/CREDITS
--- old/psutil-5.6.0/CREDITS 2019-02-26 22:31:44.000000000 +0100
+++ new/psutil-5.6.1/CREDITS 2019-03-05 13:35:44.000000000 +0100
@@ -56,7 +56,8 @@
N: Arnon Yaari (wiggin15)
W: https://github.com/wiggin15
D: AIX implementation, expert on multiple fronts
-I: 517, 607, 610, 1131, 1123, 1130, 1154, 1164, 1174, 1177, 1210, 1214, 1408
+I: 517, 607, 610, 1131, 1123, 1130, 1154, 1164, 1174, 1177, 1210, 1214, 1408,
+ 1329.
N: Alex Manuskin
W: https://github.com/amanusk
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/HISTORY.rst new/psutil-5.6.1/HISTORY.rst
--- old/psutil-5.6.0/HISTORY.rst 2019-03-05 12:32:46.000000000 +0100
+++ new/psutil-5.6.1/HISTORY.rst 2019-03-11 15:27:41.000000000 +0100
@@ -1,5 +1,19 @@
*Bug tracker at https://github.com/giampaolo/psutil/issues*
+
+5.6.1
+=====
+
+2019-03-11
+
+**Bug fixes**
+
+- 1329_: [AIX] psutil doesn't compile on AIX 6.1. (patch by Arnon Yaari)
+- 1448_: [Windows] crash on import due to rtlIpv6AddressToStringA not available
+ on Wine.
+- 1451_: [Windows] Process.memory_full_info() segfaults. NtQueryVirtualMemory
+ is now used instead of QueryWorkingSet to calculate USS memory.
+
5.6.0
=====
@@ -17,6 +31,8 @@
call) significantly speeding up different functions and methods.
- 1426_: [Windows] PAGESIZE and number of processors is now calculated on
startup.
+- 1428_: in case of error, the traceback message now shows the underlying C
+ function called which failed.
- 1433_: new Process.parents() method. (idea by Ghislain Le Meur)
- 1437_: pids() are returned in sorted order.
- 1442_: python3 is now the default interpreter used by Makefile.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/INSTALL.rst new/psutil-5.6.1/INSTALL.rst
--- old/psutil-5.6.0/INSTALL.rst 2019-03-05 12:31:18.000000000 +0100
+++ new/psutil-5.6.1/INSTALL.rst 2019-03-06 17:18:02.000000000 +0100
@@ -87,7 +87,6 @@
pkg install python3 gcc
python -m pip3 install psutil
-
OpenBSD
=======
@@ -97,7 +96,6 @@
pkg_add -v python3 gcc
python3 -m pip install psutil
-
NetBSD
======
@@ -108,7 +106,6 @@
pkgin install python3 gcc
python3 -m pip install psutil
-
Solaris
=======
@@ -121,7 +118,6 @@
pkg install gcc
python3 -m pip install psutil
-
Install from sources
====================
@@ -131,6 +127,12 @@
cd psutil
python3 setup.py install
+Testing installation
+====================
+
+::
+
+ python3 -m psutil.tests
Dev Guide
=========
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/PKG-INFO new/psutil-5.6.1/PKG-INFO
--- old/psutil-5.6.0/PKG-INFO 2019-03-05 13:00:57.000000000 +0100
+++ new/psutil-5.6.1/PKG-INFO 2019-03-11 18:24:46.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: psutil
-Version: 5.6.0
+Version: 5.6.1
Summary: Cross-platform lib for process and system monitoring in Python.
Home-page: https://github.com/giampaolo/psutil
Author: Giampaolo Rodola
@@ -73,7 +73,7 @@
- **Sun Solaris**
- **AIX**
- ...both **32-bit** and **64-bit** architectures. Supported Python versions are **2.6**, **2.7** and 3.4+**. `PyPy <http://pypy.org/>`__ is also known to work.
+ ...both **32-bit** and **64-bit** architectures. Supported Python versions are **2.6**, **2.7** and **3.4+**. `PyPy <http://pypy.org/>`__ is also known to work.
Author
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/README.rst new/psutil-5.6.1/README.rst
--- old/psutil-5.6.0/README.rst 2019-03-01 03:06:14.000000000 +0100
+++ new/psutil-5.6.1/README.rst 2019-03-11 12:16:42.000000000 +0100
@@ -65,7 +65,7 @@
- **Sun Solaris**
- **AIX**
-...both **32-bit** and **64-bit** architectures. Supported Python versions are **2.6**, **2.7** and 3.4+**. `PyPy <http://pypy.org/>`__ is also known to work.
+...both **32-bit** and **64-bit** architectures. Supported Python versions are **2.6**, **2.7** and **3.4+**. `PyPy <http://pypy.org/>`__ is also known to work.
Author
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/docs/DEVGUIDE.rst new/psutil-5.6.1/docs/DEVGUIDE.rst
--- old/psutil-5.6.0/docs/DEVGUIDE.rst 2019-03-02 21:46:28.000000000 +0100
+++ new/psutil-5.6.1/docs/DEVGUIDE.rst 2019-03-05 13:05:59.000000000 +0100
@@ -46,7 +46,7 @@
.. code-block:: bash
make install # install
- make setup-dev-env # install useful dev libs (fkale8, unittest2, etc.)
+ make setup-dev-env # install useful dev libs (flake8, unittest2, etc.)
make test # run unit tests
make test-memleaks # run memory leak tests
make test-coverage # run test coverage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/docs/index.rst new/psutil-5.6.1/docs/index.rst
--- old/psutil-5.6.0/docs/index.rst 2019-03-05 12:32:05.000000000 +0100
+++ new/psutil-5.6.1/docs/index.rst 2019-03-11 15:27:31.000000000 +0100
@@ -37,7 +37,7 @@
- **Sun Solaris**
- **AIX**
-...both **32-bit** and **64-bit** architectures. Supported Python versions are **2.6**, **2.7** and 3.4+**. `PyPy <http://pypy.org/>`__ is also known to work.
+...both **32-bit** and **64-bit** architectures. Supported Python versions are **2.6**, **2.7** and **3.4+**. `PyPy <http://pypy.org/>`__ is also known to work.
The psutil documentation you're reading is distributed as a single HTML page.
@@ -2630,14 +2630,18 @@
Timeline
========
+- 2019-03-11:
+ `5.6.1 <https://pypi.org/project/psutil/5.6.1/#files>`__ -
+ `what's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst#561>`__ -
+ `diff <https://github.com/giampaolo/psutil/compare/release-5.6.0...release-5.6.1#f…>`__
- 2019-03-05:
`5.6.0 <https://pypi.org/project/psutil/5.6.0/#files>`__ -
`what's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst#560>`__ -
- `diff <https://github.com/giampaolo/psutil/compare/release-5.5.1...release-5.6.0#f…>`
+ `diff <https://github.com/giampaolo/psutil/compare/release-5.5.1...release-5.6.0#f…>`__
- 2019-02-15:
`5.5.1 <https://pypi.org/project/psutil/5.5.1/#files>`__ -
`what's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst#551>`__ -
- `diff <https://github.com/giampaolo/psutil/compare/release-5.5.0...release-5.5.1#f…>`
+ `diff <https://github.com/giampaolo/psutil/compare/release-5.5.0...release-5.5.1#f…>`__
- 2019-01-23:
`5.5.0 <https://pypi.org/project/psutil/5.5.0/#files>`__ -
`what's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst#550>`__ -
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/__init__.py new/psutil-5.6.1/psutil/__init__.py
--- old/psutil-5.6.0/psutil/__init__.py 2019-03-03 22:33:10.000000000 +0100
+++ new/psutil-5.6.1/psutil/__init__.py 2019-03-11 15:26:28.000000000 +0100
@@ -217,7 +217,7 @@
__all__.extend(_psplatform.__extra__all__)
__author__ = "Giampaolo Rodola'"
-__version__ = "5.6.0"
+__version__ = "5.6.1"
version_info = tuple([int(num) for num in __version__.split('.')])
_timer = getattr(time, 'monotonic', time.time)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/_psaix.py new/psutil-5.6.1/psutil/_psaix.py
--- old/psutil-5.6.0/psutil/_psaix.py 2019-03-03 22:33:21.000000000 +0100
+++ new/psutil-5.6.1/psutil/_psaix.py 2019-03-05 13:34:36.000000000 +0100
@@ -39,6 +39,8 @@
HAS_THREADS = hasattr(cext, "proc_threads")
+HAS_NET_IO_COUNTERS = hasattr(cext, "net_io_counters")
+HAS_PROC_IO_COUNTERS = hasattr(cext, "proc_io_counters")
PAGE_SIZE = os.sysconf('SC_PAGE_SIZE')
AF_LINK = cext_posix.AF_LINK
@@ -211,7 +213,9 @@
net_if_addrs = cext_posix.net_if_addrs
-net_io_counters = cext.net_io_counters
+
+if HAS_NET_IO_COUNTERS:
+ net_io_counters = cext.net_io_counters
def net_connections(kind, _pid=-1):
@@ -563,14 +567,15 @@
def wait(self, timeout=None):
return _psposix.wait_pid(self.pid, timeout, self._name)
- @wrap_exceptions
- def io_counters(self):
- try:
- rc, wc, rb, wb = cext.proc_io_counters(self.pid)
- except OSError:
- # if process is terminated, proc_io_counters returns OSError
- # instead of NSP
- if not pid_exists(self.pid):
- raise NoSuchProcess(self.pid, self._name)
- raise
- return _common.pio(rc, wc, rb, wb)
+ if HAS_PROC_IO_COUNTERS:
+ @wrap_exceptions
+ def io_counters(self):
+ try:
+ rc, wc, rb, wb = cext.proc_io_counters(self.pid)
+ except OSError:
+ # if process is terminated, proc_io_counters returns OSError
+ # instead of NSP
+ if not pid_exists(self.pid):
+ raise NoSuchProcess(self.pid, self._name)
+ raise
+ return _common.pio(rc, wc, rb, wb)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/_psutil_aix.c new/psutil-5.6.1/psutil/_psutil_aix.c
--- old/psutil-5.6.0/psutil/_psutil_aix.c 2019-03-02 21:46:28.000000000 +0100
+++ new/psutil-5.6.1/psutil/_psutil_aix.c 2019-03-05 13:34:36.000000000 +0100
@@ -13,7 +13,9 @@
*
* Known limitations:
* - psutil.Process.io_counters read count is always 0
+ * - psutil.Process.io_counters may not be available on older AIX versions
* - psutil.Process.threads may not be available on older AIX versions
+ # - psutil.net_io_counters may not be available on older AIX versions
* - reading basic process info may fail or return incorrect values when
* process is starting (see IBM APAR IV58499 - fixed in newer AIX versions)
* - sockets and pipes may not be counted in num_fds (fixed in newer AIX
@@ -172,6 +174,7 @@
#ifdef CURR_VERSION_THREAD
+
/*
* Retrieves all threads used by process returning a list of tuples
* including thread id, user time and system time.
@@ -237,9 +240,12 @@
free(threadt);
return NULL;
}
+
#endif
+#ifdef CURR_VERSION_PROCESS
+
static PyObject *
psutil_proc_io_counters(PyObject *self, PyObject *args) {
long pid;
@@ -263,6 +269,8 @@
procinfo.outBytes);
}
+#endif
+
/*
* Return process user and system CPU times as a Python tuple.
@@ -469,6 +477,8 @@
}
+#if defined(CURR_VERSION_NETINTERFACE) && CURR_VERSION_NETINTERFACE >= 3
+
/*
* Return a list of tuples for network I/O statistics.
*/
@@ -538,6 +548,8 @@
return NULL;
}
+#endif
+
static PyObject*
psutil_net_if_stats(PyObject* self, PyObject* args) {
@@ -878,8 +890,10 @@
{"proc_threads", psutil_proc_threads, METH_VARARGS,
"Return process threads"},
#endif
+#ifdef CURR_VERSION_PROCESS
{"proc_io_counters", psutil_proc_io_counters, METH_VARARGS,
"Get process I/O counters."},
+#endif
{"proc_num_ctx_switches", psutil_proc_num_ctx_switches, METH_VARARGS,
"Get process I/O counters."},
@@ -898,8 +912,10 @@
"Return system virtual memory usage statistics"},
{"swap_mem", psutil_swap_mem, METH_VARARGS,
"Return stats about swap memory, in bytes"},
+#if defined(CURR_VERSION_NETINTERFACE) && CURR_VERSION_NETINTERFACE >= 3
{"net_io_counters", psutil_net_io_counters, METH_VARARGS,
"Return a Python dict of tuples for network I/O statistics."},
+#endif
{"net_connections", psutil_net_connections, METH_VARARGS,
"Return system-wide connections"},
{"net_if_stats", psutil_net_if_stats, METH_VARARGS,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/_psutil_windows.c new/psutil-5.6.1/psutil/_psutil_windows.c
--- old/psutil-5.6.0/psutil/_psutil_windows.c 2019-03-02 21:46:28.000000000 +0100
+++ new/psutil-5.6.1/psutil/_psutil_windows.c 2019-03-11 12:16:42.000000000 +0100
@@ -771,91 +771,110 @@
}
+static int
+psutil_GetProcWsetInformation(
+ DWORD pid,
+ HANDLE hProcess,
+ PMEMORY_WORKING_SET_INFORMATION *wSetInfo)
+{
+ NTSTATUS status;
+ PVOID buffer;
+ SIZE_T bufferSize;
+
+ bufferSize = 0x8000;
+ buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufferSize);
+
+ while ((status = psutil_NtQueryVirtualMemory(
+ hProcess,
+ NULL,
+ MemoryWorkingSetInformation,
+ buffer,
+ bufferSize,
+ NULL)) == STATUS_INFO_LENGTH_MISMATCH)
+ {
+ HeapFree(GetProcessHeap(), 0, buffer);
+ bufferSize *= 2;
+ psutil_debug("NtQueryVirtualMemory increase bufsize %zd", bufferSize);
+ // Fail if we're resizing the buffer to something very large.
+ if (bufferSize > 256 * 1024 * 1024) {
+ PyErr_SetString(PyExc_RuntimeError,
+ "NtQueryVirtualMemory bufsize is too large");
+ return 1;
+ }
+ buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufferSize);
+ }
-/**
+ if (!NT_SUCCESS(status)) {
+ if (status == STATUS_ACCESS_DENIED) {
+ AccessDenied("");
+ }
+ else if (psutil_pid_is_running(pid) == 0) {
+ NoSuchProcess("");
+ }
+ else {
+ PyErr_Clear();
+ psutil_debug("NtQueryVirtualMemory failed with %i", status);
+ PyErr_SetString(PyExc_RuntimeError, "NtQueryVirtualMemory failed");
+ }
+ HeapFree(GetProcessHeap(), 0, buffer);
+ return 1;
+ }
+
+ *wSetInfo = (PMEMORY_WORKING_SET_INFORMATION)buffer;
+ return 0;
+}
+
+
+/*
* Returns the USS of the process.
* Reference:
* https://dxr.mozilla.org/mozilla-central/source/xpcom/base/
* nsMemoryReporterManager.cpp
*/
static PyObject *
-psutil_proc_memory_uss(PyObject *self, PyObject *args)
-{
+psutil_proc_memory_uss(PyObject *self, PyObject *args) {
DWORD pid;
- HANDLE proc;
- PSAPI_WORKING_SET_INFORMATION tmp;
- DWORD tmp_size = sizeof(tmp);
- size_t entries;
- size_t private_pages;
- size_t i;
- DWORD info_array_size;
- // needed by QueryWorkingSet
- DWORD access = PROCESS_QUERY_INFORMATION | PROCESS_VM_READ;
- PSAPI_WORKING_SET_INFORMATION* info_array;
- PyObject* py_result = NULL;
- unsigned long long total = 0;
+ HANDLE hProcess;
+ PSUTIL_PROCESS_WS_COUNTERS wsCounters;
+ PMEMORY_WORKING_SET_INFORMATION wsInfo;
+ ULONG_PTR i;
if (! PyArg_ParseTuple(args, "l", &pid))
return NULL;
-
- proc = psutil_handle_from_pid(pid, access);
- if (proc == NULL)
+ hProcess = psutil_handle_from_pid(pid, PROCESS_QUERY_LIMITED_INFORMATION);
+ if (hProcess == NULL)
return NULL;
- // Determine how many entries we need.
- memset(&tmp, 0, tmp_size);
- if (!QueryWorkingSet(proc, &tmp, tmp_size)) {
- // NB: QueryWorkingSet is expected to fail here due to the
- // buffer being too small.
- if (tmp.NumberOfEntries == 0) {
- PyErr_SetFromWindowsErr(0);
- goto done;
- }
- }
-
- // Fudge the size in case new entries are added between calls.
- entries = tmp.NumberOfEntries * 2;
-
- if (!entries) {
- goto done;
- }
-
- info_array_size = tmp_size + \
- ((DWORD)entries * sizeof(PSAPI_WORKING_SET_BLOCK));
- info_array = (PSAPI_WORKING_SET_INFORMATION*)malloc(info_array_size);
- if (!info_array) {
- PyErr_NoMemory();
- goto done;
- }
-
- if (!QueryWorkingSet(proc, info_array, info_array_size)) {
- PyErr_SetFromWindowsErr(0);
- goto done;
+ if (psutil_GetProcWsetInformation(pid, hProcess, &wsInfo) != 0) {
+ CloseHandle(hProcess);
+ return NULL;
}
+ memset(&wsCounters, 0, sizeof(PSUTIL_PROCESS_WS_COUNTERS));
- entries = (size_t)info_array->NumberOfEntries;
- private_pages = 0;
- for (i = 0; i < entries; i++) {
- // Count shared pages that only one process is using as private.
- if (!info_array->WorkingSetInfo[i].Shared ||
- info_array->WorkingSetInfo[i].ShareCount <= 1) {
- private_pages++;
+ for (i = 0; i < wsInfo->NumberOfEntries; i++) {
+ // This is what ProcessHacker does.
+ /*
+ wsCounters.NumberOfPages++;
+ if (wsInfo->WorkingSetInfo[i].ShareCount > 1)
+ wsCounters.NumberOfSharedPages++;
+ if (wsInfo->WorkingSetInfo[i].ShareCount == 0)
+ wsCounters.NumberOfPrivatePages++;
+ if (wsInfo->WorkingSetInfo[i].Shared)
+ wsCounters.NumberOfShareablePages++;
+ */
+
+ // This is what we do: count shared pages that only one process
+ // is using as private (USS).
+ if (!wsInfo->WorkingSetInfo[i].Shared ||
+ wsInfo->WorkingSetInfo[i].ShareCount <= 1) {
+ wsCounters.NumberOfPrivatePages++;
}
}
- total = private_pages * PSUTIL_SYSTEM_INFO.dwPageSize;
- py_result = Py_BuildValue("K", total);
-
-done:
- if (proc) {
- CloseHandle(proc);
- }
-
- if (info_array) {
- free(info_array);
- }
+ HeapFree(GetProcessHeap(), 0, wsInfo);
+ CloseHandle(hProcess);
- return py_result;
+ return Py_BuildValue("I", wsCounters.NumberOfPrivatePages);
}
@@ -1565,7 +1584,8 @@
// TCP IPv6
if ((PySequence_Contains(py_af_filter, _AF_INET6) == 1) &&
- (PySequence_Contains(py_type_filter, _SOCK_STREAM) == 1))
+ (PySequence_Contains(py_type_filter, _SOCK_STREAM) == 1) &&
+ (psutil_rtlIpv6AddressToStringA != NULL))
{
table = NULL;
py_conn_tuple = NULL;
@@ -1715,7 +1735,8 @@
// UDP IPv6
if ((PySequence_Contains(py_af_filter, _AF_INET6) == 1) &&
- (PySequence_Contains(py_type_filter, _SOCK_DGRAM) == 1))
+ (PySequence_Contains(py_type_filter, _SOCK_DGRAM) == 1) &&
+ (psutil_rtlIpv6AddressToStringA != NULL))
{
table = NULL;
py_conn_tuple = NULL;
@@ -3357,6 +3378,17 @@
}
+/*
+ * System memory page size as an int.
+ */
+static PyObject *
+psutil_getpagesize(PyObject *self, PyObject *args) {
+ // XXX: we may want to use GetNativeSystemInfo to differentiate
+ // page size for WoW64 processes (but am not sure).
+ return Py_BuildValue("I", PSUTIL_SYSTEM_INFO.dwPageSize);
+}
+
+
// ------------------------ Python init ---------------------------
static PyMethodDef
@@ -3462,6 +3494,8 @@
"Return CPU frequency."},
{"sensors_battery", psutil_sensors_battery, METH_VARARGS,
"Return battery metrics usage."},
+ {"getpagesize", psutil_getpagesize, METH_VARARGS,
+ "Return system memory page size."},
// --- windows services
{"winservice_enumerate", psutil_winservice_enumerate, METH_VARARGS,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/_pswindows.py new/psutil-5.6.1/psutil/_pswindows.py
--- old/psutil-5.6.0/psutil/_pswindows.py 2019-03-03 22:32:03.000000000 +0100
+++ new/psutil-5.6.1/psutil/_pswindows.py 2019-03-11 12:16:42.000000000 +0100
@@ -36,6 +36,7 @@
from ._common import ENCODING
from ._common import ENCODING_ERRS
from ._common import isfile_strict
+from ._common import memoize
from ._common import memoize_when_activated
from ._common import parse_environ_block
from ._common import sockfam_to_enum
@@ -229,6 +230,11 @@
return s.encode(ENCODING, ENCODING_ERRS)
+@memoize
+def getpagesize():
+ return cext.getpagesize()
+
+
# =====================================================================
# --- memory
# =====================================================================
@@ -798,6 +804,7 @@
def memory_full_info(self):
basic_mem = self.memory_info()
uss = cext.proc_memory_uss(self.pid)
+ uss *= getpagesize()
return pfullmem(*basic_mem + (uss, ))
def memory_maps(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/arch/windows/global.c new/psutil-5.6.1/psutil/arch/windows/global.c
--- old/psutil-5.6.0/psutil/arch/windows/global.c 2019-03-02 21:46:28.000000000 +0100
+++ new/psutil-5.6.1/psutil/arch/windows/global.c 2019-03-11 12:16:42.000000000 +0100
@@ -95,11 +95,6 @@
if (! psutil_rtlIpv4AddressToStringA)
return 1;
- psutil_rtlIpv6AddressToStringA = psutil_GetProcAddressFromLib(
- "ntdll.dll", "RtlIpv6AddressToStringA");
- if (! psutil_rtlIpv6AddressToStringA)
- return 1;
-
// minimum requirement: Win XP SP3
psutil_GetExtendedTcpTable = psutil_GetProcAddressFromLib(
"iphlpapi.dll", "GetExtendedTcpTable");
@@ -127,9 +122,18 @@
if (! psutil_NtResumeProcess)
return 1;
+ psutil_NtQueryVirtualMemory = psutil_GetProcAddressFromLib(
+ "ntdll", "NtQueryVirtualMemory");
+ if (! psutil_NtQueryVirtualMemory)
+ return 1;
+
/*
* Optional.
*/
+ // not available on Wine
+ psutil_rtlIpv6AddressToStringA = psutil_GetProcAddressFromLib(
+ "ntdll.dll", "RtlIpv6AddressToStringA");
+
// minimum requirement: Win Vista
psutil_GetTickCount64 = psutil_GetProcAddress(
"kernel32", "GetTickCount64");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/arch/windows/global.h new/psutil-5.6.1/psutil/arch/windows/global.h
--- old/psutil-5.6.0/psutil/arch/windows/global.h 2019-03-02 21:46:28.000000000 +0100
+++ new/psutil-5.6.1/psutil/arch/windows/global.h 2019-03-11 12:16:42.000000000 +0100
@@ -68,3 +68,6 @@
_NtResumeProcess \
psutil_NtResumeProcess;
+
+_NtQueryVirtualMemory \
+ psutil_NtQueryVirtualMemory;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/arch/windows/ntextapi.h new/psutil-5.6.1/psutil/arch/windows/ntextapi.h
--- old/psutil-5.6.0/psutil/arch/windows/ntextapi.h 2019-03-02 21:46:28.000000000 +0100
+++ new/psutil-5.6.1/psutil/arch/windows/ntextapi.h 2019-03-11 12:16:42.000000000 +0100
@@ -13,6 +13,8 @@
#define STATUS_INFO_LENGTH_MISMATCH 0xc0000004
#define STATUS_BUFFER_TOO_SMALL 0xC0000023L
#define SystemExtendedHandleInformation 64
+#define MemoryWorkingSetInformation 0x1
+#define STATUS_ACCESS_DENIED ((NTSTATUS)0xC0000022L)
/*
* ================================================================
@@ -378,6 +380,30 @@
} SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX;
#endif
+typedef struct _MEMORY_WORKING_SET_BLOCK {
+ ULONG_PTR Protection : 5;
+ ULONG_PTR ShareCount : 3;
+ ULONG_PTR Shared : 1;
+ ULONG_PTR Node : 3;
+#ifdef _WIN64
+ ULONG_PTR VirtualPage : 52;
+#else
+ ULONG VirtualPage : 20;
+#endif
+} MEMORY_WORKING_SET_BLOCK, *PMEMORY_WORKING_SET_BLOCK;
+
+typedef struct _MEMORY_WORKING_SET_INFORMATION {
+ ULONG_PTR NumberOfEntries;
+ MEMORY_WORKING_SET_BLOCK WorkingSetInfo[1];
+} MEMORY_WORKING_SET_INFORMATION, *PMEMORY_WORKING_SET_INFORMATION;
+
+typedef struct _PSUTIL_PROCESS_WS_COUNTERS {
+ SIZE_T NumberOfPages;
+ SIZE_T NumberOfPrivatePages;
+ SIZE_T NumberOfSharedPages;
+ SIZE_T NumberOfShareablePages;
+} PSUTIL_PROCESS_WS_COUNTERS, *PPSUTIL_PROCESS_WS_COUNTERS;
+
/*
* ================================================================
* Type defs for modules loaded at runtime.
@@ -465,4 +491,13 @@
HANDLE hProcess
);
+typedef NTSTATUS (NTAPI *_NtQueryVirtualMemory) (
+ HANDLE ProcessHandle,
+ PVOID BaseAddress,
+ int MemoryInformationClass,
+ PVOID MemoryInformation,
+ SIZE_T MemoryInformationLength,
+ PSIZE_T ReturnLength
+);
+
#endif // __NTEXTAPI_H__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/tests/__init__.py new/psutil-5.6.1/psutil/tests/__init__.py
--- old/psutil-5.6.0/psutil/tests/__init__.py 2019-03-05 12:39:07.000000000 +0100
+++ new/psutil-5.6.1/psutil/tests/__init__.py 2019-03-06 17:47:17.000000000 +0100
@@ -160,17 +160,16 @@
# --- support
+HAS_CONNECTIONS_UNIX = POSIX and not SUNOS
HAS_CPU_AFFINITY = hasattr(psutil.Process, "cpu_affinity")
HAS_CPU_FREQ = hasattr(psutil, "cpu_freq")
-HAS_CONNECTIONS_UNIX = POSIX and not SUNOS
HAS_ENVIRON = hasattr(psutil.Process, "environ")
-HAS_PROC_IO_COUNTERS = hasattr(psutil.Process, "io_counters")
HAS_IONICE = hasattr(psutil.Process, "ionice")
-HAS_MEMORY_FULL_INFO = 'uss' in psutil.Process().memory_full_info()._fields
HAS_MEMORY_MAPS = hasattr(psutil.Process, "memory_maps")
+HAS_NET_IO_COUNTERS = hasattr(psutil, "net_io_counters")
HAS_PROC_CPU_NUM = hasattr(psutil.Process, "cpu_num")
+HAS_PROC_IO_COUNTERS = hasattr(psutil.Process, "io_counters")
HAS_RLIMIT = hasattr(psutil.Process, "rlimit")
-HAS_THREADS = hasattr(psutil.Process, "threads")
HAS_SENSORS_BATTERY = hasattr(psutil, "sensors_battery")
try:
HAS_BATTERY = HAS_SENSORS_BATTERY and bool(psutil.sensors_battery())
@@ -178,6 +177,7 @@
HAS_BATTERY = True
HAS_SENSORS_FANS = hasattr(psutil, "sensors_fans")
HAS_SENSORS_TEMPERATURES = hasattr(psutil, "sensors_temperatures")
+HAS_THREADS = hasattr(psutil.Process, "threads")
# --- misc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/tests/test_contracts.py new/psutil-5.6.1/psutil/tests/test_contracts.py
--- old/psutil-5.6.0/psutil/tests/test_contracts.py 2019-02-28 23:30:16.000000000 +0100
+++ new/psutil-5.6.1/psutil/tests/test_contracts.py 2019-03-10 03:27:52.000000000 +0100
@@ -33,6 +33,7 @@
from psutil.tests import check_connection_ntuple
from psutil.tests import get_kernel_version
from psutil.tests import HAS_CONNECTIONS_UNIX
+from psutil.tests import HAS_NET_IO_COUNTERS
from psutil.tests import HAS_RLIMIT
from psutil.tests import HAS_SENSORS_FANS
from psutil.tests import HAS_SENSORS_TEMPERATURES
@@ -251,6 +252,7 @@
for ifname, _ in psutil.net_if_stats().items():
self.assertIsInstance(ifname, str)
+ @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
def test_net_io_counters(self):
# Duplicate of test_system.py. Keep it anyway.
for ifname, _ in psutil.net_io_counters(pernic=True).items():
@@ -291,8 +293,7 @@
some sanity checks against Process API's returned values.
"""
- def test_fetch_all(self):
- valid_procs = 0
+ def get_attr_names(self):
excluded_names = set([
'send_signal', 'suspend', 'resume', 'terminate', 'kill', 'wait',
'as_dict', 'parent', 'parents', 'children', 'memory_info_ex',
@@ -307,55 +308,66 @@
if name in excluded_names:
continue
attrs.append(name)
+ return attrs
- default = object()
- failures = []
+ def iter_procs(self):
+ attrs = self.get_attr_names()
for p in psutil.process_iter():
with p.oneshot():
for name in attrs:
- ret = default
- try:
- args = ()
- kwargs = {}
- attr = getattr(p, name, None)
- if attr is not None and callable(attr):
- if name == 'rlimit':
- args = (psutil.RLIMIT_NOFILE,)
- elif name == 'memory_maps':
- kwargs = {'grouped': False}
- ret = attr(*args, **kwargs)
- else:
- ret = attr
- valid_procs += 1
- except NotImplementedError:
- msg = "%r was skipped because not implemented" % (
- self.__class__.__name__ + '.test_' + name)
- warn(msg)
- except (psutil.NoSuchProcess, psutil.AccessDenied) as err:
- self.assertEqual(err.pid, p.pid)
- if err.name:
- # make sure exception's name attr is set
- # with the actual process name
- self.assertEqual(err.name, p.name())
- assert str(err)
- assert err.msg
- except Exception:
- s = '\n' + '=' * 70 + '\n'
- s += "FAIL: test_%s (proc=%s" % (name, p)
- if ret != default:
- s += ", ret=%s)" % repr(ret)
- s += ')\n'
- s += '-' * 70
- s += "\n%s" % traceback.format_exc()
- s = "\n".join((" " * 4) + i for i in s.splitlines())
- s += '\n'
- failures.append(s)
- break
- else:
- if ret not in (0, 0.0, [], None, '', {}):
- assert ret, ret
- meth = getattr(self, name)
- meth(ret, p)
+ yield (p, name)
+
+ def call_meth(self, p, name):
+ args = ()
+ kwargs = {}
+ attr = getattr(p, name, None)
+ if attr is not None and callable(attr):
+ if name == 'rlimit':
+ args = (psutil.RLIMIT_NOFILE,)
+ elif name == 'memory_maps':
+ kwargs = {'grouped': False}
+ return attr(*args, **kwargs)
+ else:
+ return attr
+
+ def test_fetch_all(self):
+ valid_procs = 0
+ default = object()
+ failures = []
+ for p, name in self.iter_procs():
+ ret = default
+ try:
+ ret = self.call_meth(p, name)
+ except NotImplementedError:
+ msg = "%r was skipped because not implemented" % (
+ self.__class__.__name__ + '.test_' + name)
+ warn(msg)
+ except (psutil.NoSuchProcess, psutil.AccessDenied) as err:
+ self.assertEqual(err.pid, p.pid)
+ if err.name:
+ # make sure exception's name attr is set
+ # with the actual process name
+ self.assertEqual(err.name, p.name())
+ assert str(err)
+ assert err.msg
+ except Exception:
+ s = '\n' + '=' * 70 + '\n'
+ s += "FAIL: test_%s (proc=%s" % (name, p)
+ if ret != default:
+ s += ", ret=%s)" % repr(ret)
+ s += ')\n'
+ s += '-' * 70
+ s += "\n%s" % traceback.format_exc()
+ s = "\n".join((" " * 4) + i for i in s.splitlines())
+ s += '\n'
+ failures.append(s)
+ break
+ else:
+ valid_procs += 1
+ if ret not in (0, 0.0, [], None, '', {}):
+ assert ret, ret
+ meth = getattr(self, name)
+ meth(ret, p)
if failures:
self.fail(''.join(failures))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/tests/test_memory_leaks.py new/psutil-5.6.1/psutil/tests/test_memory_leaks.py
--- old/psutil-5.6.0/psutil/tests/test_memory_leaks.py 2019-02-28 23:28:50.000000000 +0100
+++ new/psutil-5.6.1/psutil/tests/test_memory_leaks.py 2019-03-06 16:59:18.000000000 +0100
@@ -38,6 +38,7 @@
from psutil.tests import HAS_ENVIRON
from psutil.tests import HAS_IONICE
from psutil.tests import HAS_MEMORY_MAPS
+from psutil.tests import HAS_NET_IO_COUNTERS
from psutil.tests import HAS_PROC_CPU_NUM
from psutil.tests import HAS_PROC_IO_COUNTERS
from psutil.tests import HAS_RLIMIT
@@ -534,6 +535,7 @@
@unittest.skipIf(TRAVIS and MACOS, "false positive on travis")
@skip_if_linux()
+ @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
def test_net_io_counters(self):
self.execute(psutil.net_io_counters, nowrap=False)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/tests/test_misc.py new/psutil-5.6.1/psutil/tests/test_misc.py
--- old/psutil-5.6.0/psutil/tests/test_misc.py 2019-02-27 16:51:13.000000000 +0100
+++ new/psutil-5.6.1/psutil/tests/test_misc.py 2019-03-06 17:49:49.000000000 +0100
@@ -42,8 +42,8 @@
from psutil.tests import get_test_subprocess
from psutil.tests import HAS_BATTERY
from psutil.tests import HAS_CONNECTIONS_UNIX
-from psutil.tests import HAS_MEMORY_FULL_INFO
from psutil.tests import HAS_MEMORY_MAPS
+from psutil.tests import HAS_NET_IO_COUNTERS
from psutil.tests import HAS_SENSORS_BATTERY
from psutil.tests import HAS_SENSORS_FANS
from psutil.tests import HAS_SENSORS_TEMPERATURES
@@ -620,10 +620,10 @@
wrap_numbers.cache_clear('disk_io')
wrap_numbers.cache_clear('?!?')
- @unittest.skipIf(
- not psutil.disk_io_counters() or not psutil.net_io_counters(),
- "no disks or NICs available")
+ @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
def test_cache_clear_public_apis(self):
+ if not psutil.disk_io_counters() or not psutil.net_io_counters():
+ return self.skipTest("no disks or NICs available")
psutil.disk_io_counters()
psutil.net_io_counters()
caches = wrap_numbers.cache_info()
@@ -735,8 +735,9 @@
def test_pmap(self):
self.assert_stdout('pmap.py', str(os.getpid()))
- @unittest.skipIf(not HAS_MEMORY_FULL_INFO, "not supported")
def test_procsmem(self):
+ if 'uss' not in psutil.Process().memory_full_info()._fields:
+ raise self.skipTest("not supported")
self.assert_stdout('procsmem.py', stderr=DEVNULL)
def test_killall(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/tests/test_posix.py new/psutil-5.6.1/psutil/tests/test_posix.py
--- old/psutil-5.6.0/psutil/tests/test_posix.py 2019-02-26 22:31:44.000000000 +0100
+++ new/psutil-5.6.1/psutil/tests/test_posix.py 2019-03-05 13:34:36.000000000 +0100
@@ -25,6 +25,7 @@
from psutil.tests import APPVEYOR
from psutil.tests import get_kernel_version
from psutil.tests import get_test_subprocess
+from psutil.tests import HAS_NET_IO_COUNTERS
from psutil.tests import mock
from psutil.tests import PYTHON_EXE
from psutil.tests import reap_children
@@ -339,6 +340,7 @@
@unittest.skipIf(SUNOS, "unreliable on SUNOS")
@unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
@unittest.skipIf(not which('ifconfig'), "no ifconfig cmd")
+ @unittest.skipIf(not HAS_NET_IO_COUNTERS, "not supported")
def test_nic_names(self):
output = sh("ifconfig -a")
for nic in psutil.net_io_counters(pernic=True).keys():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/tests/test_system.py new/psutil-5.6.1/psutil/tests/test_system.py
--- old/psutil-5.6.0/psutil/tests/test_system.py 2019-02-26 22:31:44.000000000 +0100
+++ new/psutil-5.6.1/psutil/tests/test_system.py 2019-03-05 13:34:36.000000000 +0100
@@ -38,6 +38,7 @@
from psutil.tests import get_test_subprocess
from psutil.tests import HAS_BATTERY
from psutil.tests import HAS_CPU_FREQ
+from psutil.tests import HAS_NET_IO_COUNTERS
from psutil.tests import HAS_SENSORS_BATTERY
from psutil.tests import HAS_SENSORS_FANS
from psutil.tests import HAS_SENSORS_TEMPERATURES
@@ -538,6 +539,7 @@
self.assertIn(mount, mounts)
psutil.disk_usage(mount)
+ @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
def test_net_io_counters(self):
def check_ntuple(nt):
self.assertEqual(nt[0], nt.bytes_sent)
@@ -566,6 +568,7 @@
self.assertIsInstance(key, str)
check_ntuple(ret[key])
+ @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
def test_net_io_counters_no_nics(self):
# Emulate a case where no NICs are installed, see:
# https://github.com/giampaolo/psutil/issues/1062
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil/tests/test_windows.py new/psutil-5.6.1/psutil/tests/test_windows.py
--- old/psutil-5.6.0/psutil/tests/test_windows.py 2019-03-01 14:45:37.000000000 +0100
+++ new/psutil-5.6.1/psutil/tests/test_windows.py 2019-03-10 03:41:37.000000000 +0100
@@ -332,12 +332,19 @@
p = psutil.Process(self.pid)
self.assertRaises(ValueError, p.send_signal, signal.SIGINT)
- def test_exe(self):
+ def test_exe_and_name(self):
for p in psutil.process_iter():
+ # On Windows name() is never supposed to raise AccessDenied,
+ # see https://github.com/giampaolo/psutil/issues/627
try:
- self.assertEqual(os.path.basename(p.exe()), p.name())
- except psutil.Error:
+ name = p.name()
+ except psutil.NoSuchProcess:
pass
+ else:
+ try:
+ self.assertEqual(os.path.basename(p.exe()), name)
+ except psutil.Error:
+ continue
def test_num_handles_increment(self):
p = psutil.Process(os.getpid())
@@ -385,15 +392,6 @@
if failures:
self.fail('\n' + '\n'.join(failures))
- def test_name_always_available(self):
- # On Windows name() is never supposed to raise AccessDenied,
- # see https://github.com/giampaolo/psutil/issues/627
- for p in psutil.process_iter():
- try:
- p.name()
- except psutil.NoSuchProcess:
- pass
-
@unittest.skipIf(not sys.version_info >= (2, 7),
"CTRL_* signals not supported")
def test_ctrl_signals(self):
@@ -407,16 +405,6 @@
self.assertRaises(psutil.NoSuchProcess,
p.send_signal, signal.CTRL_BREAK_EVENT)
- def test_compare_name_exe(self):
- for p in psutil.process_iter():
- try:
- a = os.path.basename(p.exe())
- b = p.name()
- except (psutil.NoSuchProcess, psutil.AccessDenied):
- pass
- else:
- self.assertEqual(a, b)
-
def test_username(self):
self.assertEqual(psutil.Process().username(),
win32api.GetUserNameEx(win32con.NameSamCompatible))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/psutil.egg-info/PKG-INFO new/psutil-5.6.1/psutil.egg-info/PKG-INFO
--- old/psutil-5.6.0/psutil.egg-info/PKG-INFO 2019-03-05 13:00:57.000000000 +0100
+++ new/psutil-5.6.1/psutil.egg-info/PKG-INFO 2019-03-11 18:24:46.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: psutil
-Version: 5.6.0
+Version: 5.6.1
Summary: Cross-platform lib for process and system monitoring in Python.
Home-page: https://github.com/giampaolo/psutil
Author: Giampaolo Rodola
@@ -73,7 +73,7 @@
- **Sun Solaris**
- **AIX**
- ...both **32-bit** and **64-bit** architectures. Supported Python versions are **2.6**, **2.7** and 3.4+**. `PyPy <http://pypy.org/>`__ is also known to work.
+ ...both **32-bit** and **64-bit** architectures. Supported Python versions are **2.6**, **2.7** and **3.4+**. `PyPy <http://pypy.org/>`__ is also known to work.
Author
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psutil-5.6.0/scripts/procsmem.py new/psutil-5.6.1/scripts/procsmem.py
--- old/psutil-5.6.0/scripts/procsmem.py 2018-12-08 12:30:24.000000000 +0100
+++ new/psutil-5.6.1/scripts/procsmem.py 2019-03-11 12:16:42.000000000 +0100
@@ -86,7 +86,7 @@
for p in procs[:86]:
line = templ % (
p.pid,
- p._info["username"][:7],
+ p._info["username"][:7] if p._info["username"] else "",
" ".join(p._info["cmdline"])[:30],
convert_bytes(p._uss),
convert_bytes(p._pss) if p._pss != "" else "",
++++++ skip-flaky-i586.patch ++++++
--- psutil-5.6.1-orig/psutil/tests/test_contracts.py 2019-03-18 09:42:48.474895363 +0700
+++ psutil-5.6.1/psutil/tests/test_contracts.py 2019-03-20 18:25:02.356923046 +0700
@@ -330,7 +330,7 @@
else:
return attr
- def test_fetch_all(self):
+ def _test_fetch_all(self):
valid_procs = 0
default = object()
failures = []
++++++ skip-test-missing-warnings.patch ++++++
diff -ru psutil-5.6.1-orig/psutil/tests/test_linux.py psutil-5.6.1/psutil/tests/test_linux.py
--- psutil-5.6.1-orig/psutil/tests/test_linux.py 2019-03-18 09:42:48.474895363 +0700
+++ psutil-5.6.1/psutil/tests/test_linux.py 2019-03-18 10:56:59.227642825 +0700
@@ -362,7 +362,7 @@
self.assertIn(
"inactive memory stats couldn't be determined", str(w.message))
- def test_avail_old_missing_fields(self):
+ def _test_avail_old_missing_fields(self):
# Remove Active(file), Inactive(file) and SReclaimable
# from /proc/meminfo and make sure the fallback is used
# (free + cached),
@@ -387,7 +387,7 @@
self.assertIn(
"inactive memory stats couldn't be determined", str(w.message))
- def test_avail_old_missing_zoneinfo(self):
+ def _test_avail_old_missing_zoneinfo(self):
# Remove /proc/zoneinfo file. Make sure fallback is used
# (free + cached).
with mock_open_content(
1
0
Hello community,
here is the log from the commit of package python-waitress for openSUSE:Factory checked in at 2019-03-29 20:36:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-waitress (Old)
and /work/SRC/openSUSE:Factory/.python-waitress.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-waitress"
Fri Mar 29 20:36:20 2019 rev:14 rq:687121 version:1.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-waitress/python-waitress.changes 2019-03-01 20:28:46.906020589 +0100
+++ /work/SRC/openSUSE:Factory/.python-waitress.new.25356/python-waitress.changes 2019-03-29 20:36:24.002573945 +0100
@@ -1,0 +2,5 @@
+Wed Mar 20 18:49:38 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Trim marketing wording and other platform mentions.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-waitress.spec ++++++
--- /var/tmp/diff_new_pack.YecLYv/_old 2019-03-29 20:36:24.798575093 +0100
+++ /var/tmp/diff_new_pack.YecLYv/_new 2019-03-29 20:36:24.798575093 +0100
@@ -48,11 +48,9 @@
%python_subpackages
%description
-Waitress is meant to be a production-quality pure-Python WSGI server with very
-acceptable performance. It has no dependencies except ones which live in the
-Python standard library. It runs on CPython on Unix and Windows under Python
-2.7+ and Python 3.4+. It is also known to run on PyPy 1.6.0+ on UNIX. It
-supports HTTP/1.0 and HTTP/1.1.
+Waitress is a pure-Python WSGI server. It has no dependencies except
+ones which live in the Python standard library. It supports HTTP/1.0
+and HTTP/1.1.
For more information, see the "docs" directory of the Waitress package or
http://docs.pylonsproject.org/projects/waitress/en/latest/ .
1
0
Hello community,
here is the log from the commit of package python-requests-unixsocket for openSUSE:Factory checked in at 2019-03-29 20:36:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-requests-unixsocket (Old)
and /work/SRC/openSUSE:Factory/.python-requests-unixsocket.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-requests-unixsocket"
Fri Mar 29 20:36:14 2019 rev:2 rq:687119 version:0.1.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-requests-unixsocket/python-requests-unixsocket.changes 2019-03-08 11:00:27.328549858 +0100
+++ /work/SRC/openSUSE:Factory/.python-requests-unixsocket.new.25356/python-requests-unixsocket.changes 2019-03-29 20:36:18.302565723 +0100
@@ -1,0 +2,5 @@
+Wed Mar 20 18:39:29 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Make the descriptions say what it is, not what the user is to do.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-requests-unixsocket.spec ++++++
--- /var/tmp/diff_new_pack.RV76IJ/_old 2019-03-29 20:36:18.902566588 +0100
+++ /var/tmp/diff_new_pack.RV76IJ/_new 2019-03-29 20:36:18.902566588 +0100
@@ -20,7 +20,7 @@
Name: python-requests-unixsocket
Version: 0.1.5
Release: 0
-Summary: Use requests to talk HTTP via a UNIX domain socket
+Summary: UNIX domain socket backend for python-requests
License: Apache-2.0
Group: Development/Languages/Python
URL: https://github.com/msabramo/requests-unixsocket
@@ -41,7 +41,8 @@
%python_subpackages
%description
-Use requests to talk HTTP via a UNIX domain socket
+With this module, python-requests is enhanced by the ability to talk
+HTTP via a UNIX domain socket.
%prep
%setup -q -n requests-unixsocket-%{version}
1
0