Hello community,
here is the log from the commit of package python-watermark for
openSUSE:Factory checked in at 2019-11-29 15:55:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-watermark (Old)
and /work/SRC/openSUSE:Factory/.python-watermark.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-watermark"
Fri Nov 29 15:55:59 2019 rev:3 rq:747885 version:2.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-watermark/python-watermark.changes
2019-08-13 13:21:23.469416383 +0200
+++
/work/SRC/openSUSE:Factory/.python-watermark.new.26869/python-watermark.changes
2019-11-29 15:56:01.285002512 +0100
@@ -1,0 +2,7 @@
+Tue Nov 12 16:56:39 UTC 2019 - Todd R <[email protected]>
+
+- Update to 2.0.1
+ * Now uses pkg_resources as the default method for getting version numbers.
+ * Fixes a whitespace bug when printing the timezone.
+
+-------------------------------------------------------------------
Old:
----
watermark-1.8.2.tar.gz
New:
----
watermark-2.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-watermark.spec ++++++
--- /var/tmp/diff_new_pack.A907U9/_old 2019-11-29 15:56:01.929002142 +0100
+++ /var/tmp/diff_new_pack.A907U9/_new 2019-11-29 15:56:01.933002140 +0100
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-watermark
-Version: 1.8.2
+Version: 2.0.1
Release: 0
Summary: IPython magic function to psystem information
License: BSD-3-Clause
++++++ watermark-1.8.2.tar.gz -> watermark-2.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/watermark-1.8.2/PKG-INFO new/watermark-2.0.1/PKG-INFO
--- old/watermark-1.8.2/PKG-INFO 2019-07-28 22:47:30.000000000 +0200
+++ new/watermark-2.0.1/PKG-INFO 2019-10-05 01:12:40.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: watermark
-Version: 1.8.2
+Version: 2.0.1
Summary: IPython magic function to print date/time stamps andvarious system
information.
Home-page: https://github.com/rasbt/watermark
Author: Sebastian Raschka
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/watermark-1.8.2/README.md
new/watermark-2.0.1/README.md
--- old/watermark-1.8.2/README.md 2019-07-28 22:47:03.000000000 +0200
+++ new/watermark-2.0.1/README.md 2019-10-05 01:12:31.000000000 +0200
@@ -112,6 +112,15 @@
[[top](#sections)]
+#### v. 2.0.1 (October 04, 2019)
+
+- Fix `'sklearn'` vs. `'scikit-learn'` import compatibility.
+
+#### v. 2.0.0 (October 04, 2019)
+
+- Now uses `pkg_resources` as the default method for getting version numbers.
+- Fixes a whitespace bug when printing the timezone.
+
#### v. 1.8.2 (July 28, 2019)
- When no Python library was imported and the `--iversion` is used, print an
empty string instead of raising an error.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/watermark-1.8.2/watermark/__init__.py
new/watermark-2.0.1/watermark/__init__.py
--- old/watermark-1.8.2/watermark/__init__.py 2019-07-28 22:47:03.000000000
+0200
+++ new/watermark-2.0.1/watermark/__init__.py 2019-10-05 01:12:31.000000000
+0200
@@ -9,7 +9,7 @@
import sys
-__version__ = '1.8.2'
+__version__ = '2.0.1'
if sys.version_info >= (3, 0):
from watermark.watermark import *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/watermark-1.8.2/watermark/watermark.py
new/watermark-2.0.1/watermark/watermark.py
--- old/watermark-1.8.2/watermark/watermark.py 2019-07-28 22:47:03.000000000
+0200
+++ new/watermark-2.0.1/watermark/watermark.py 2019-10-05 01:12:31.000000000
+0200
@@ -14,8 +14,9 @@
import datetime
from socket import gethostname
from multiprocessing import cpu_count
-import warnings
import types
+import pkg_resources
+from pkg_resources import DistributionNotFound
import IPython
from IPython.core.magic import Magics
@@ -111,7 +112,7 @@
if args.time:
self.out += '%s ' % strftime('%H:%M:%S')
if args.timezone:
- self.out += strftime('%Z')
+ self.out += '%s ' % strftime('%Z')
if args.iso8601:
self.out += iso_dt
if args.python:
@@ -147,27 +148,24 @@
for p in packages:
if p == 'scikit-learn':
p = 'sklearn'
- warnings.simplefilter('always', DeprecationWarning)
- warnings.warn("Importing scikit-learn as `scikit-learn` has"
- " been depracated and will not be supported"
- " anymore in v1.7.0. Please use the package"
- " name `sklearn` instead.",
- DeprecationWarning)
try:
imported = __import__(p)
except ImportError:
ver = 'not installed'
else:
try:
- ver = imported.__version__
- except AttributeError:
+ ver = pkg_resources.get_distribution(p).version
+ except DistributionNotFound:
try:
- ver = imported.version
+ ver = imported.__version__
except AttributeError:
try:
- ver = imported.version_info
+ ver = imported.version
except AttributeError:
- ver = 'unknown'
+ try:
+ ver = imported.version_info
+ except AttributeError:
+ ver = 'unknown'
self.out += '\n%s %s' % (p, ver)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/watermark-1.8.2/watermark.egg-info/PKG-INFO
new/watermark-2.0.1/watermark.egg-info/PKG-INFO
--- old/watermark-1.8.2/watermark.egg-info/PKG-INFO 2019-07-28
22:47:30.000000000 +0200
+++ new/watermark-2.0.1/watermark.egg-info/PKG-INFO 2019-10-05
01:12:40.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: watermark
-Version: 1.8.2
+Version: 2.0.1
Summary: IPython magic function to print date/time stamps andvarious system
information.
Home-page: https://github.com/rasbt/watermark
Author: Sebastian Raschka
