Hello community, here is the log from the commit of package urlwatch for openSUSE:Factory checked in at 2018-05-22 17:02:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/urlwatch (Old) and /work/SRC/openSUSE:Factory/.urlwatch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "urlwatch" Tue May 22 17:02:18 2018 rev:10 rq:611193 version:2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/urlwatch/urlwatch.changes 2018-05-18 14:28:32.252973402 +0200 +++ /work/SRC/openSUSE:Factory/.urlwatch.new/urlwatch.changes 2018-05-22 17:02:34.102901647 +0200 @@ -1,0 +2,8 @@ +Tue May 22 09:10:01 UTC 2018 - [email protected] + +- Update to 2.11: + * Retry: Make sure "tries" is initialized to zero on load + * html2text: Make sure the bs4 method strips HTML tags (by Louis Sautier) +- Marked COPYING file as %license + +------------------------------------------------------------------- Old: ---- urlwatch-2.10.tar.gz New: ---- urlwatch-2.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ urlwatch.spec ++++++ --- /var/tmp/diff_new_pack.zaEqaW/_old 2018-05-22 17:02:36.622809940 +0200 +++ /var/tmp/diff_new_pack.zaEqaW/_new 2018-05-22 17:02:36.622809940 +0200 @@ -17,7 +17,7 @@ Name: urlwatch -Version: 2.10 +Version: 2.11 Release: 0 Summary: A tool for monitoring webpages for updates License: BSD-3-Clause @@ -65,7 +65,8 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README.md +%doc ChangeLog README.md +%license COPYING* %{_bindir}/%{name} %{_mandir}/man1/%{name}.1%{ext_man} %{python3_sitelib}/%{name} ++++++ urlwatch-2.10.tar.gz -> urlwatch-2.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlwatch-2.10/ChangeLog new/urlwatch-2.11/ChangeLog --- old/urlwatch-2.10/ChangeLog 2018-05-17 23:05:34.000000000 +0200 +++ new/urlwatch-2.11/ChangeLog 2018-05-19 18:42:00.000000000 +0200 @@ -233,3 +233,7 @@ * Retry: Add support for optional retry count in job list (by cmichi, fixes #235) * HTTP: Add support for specifying optional headers (by Tero Mononen) * ChangeLog: Add versions to recent ChangeLog entries (Fixes #235) + +2018-05-19 Thomas Perl <[email protected]> [2.11] + * Retry: Make sure "tries" is initialized to zero on load (Fixes #241) + * html2text: Make sure the bs4 method strips HTML tags (by Louis Sautier) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlwatch-2.10/lib/urlwatch/__init__.py new/urlwatch-2.11/lib/urlwatch/__init__.py --- old/urlwatch-2.10/lib/urlwatch/__init__.py 2018-05-17 23:05:34.000000000 +0200 +++ new/urlwatch-2.11/lib/urlwatch/__init__.py 2018-05-19 18:42:00.000000000 +0200 @@ -12,5 +12,5 @@ __author__ = 'Thomas Perl <[email protected]>' __license__ = 'BSD' __url__ = 'https://thp.io/2008/urlwatch/' -__version__ = '2.10' +__version__ = '2.11' __user_agent__ = '%s/%s (+https://thp.io/2008/urlwatch/info.html)' % (pkgname, __version__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlwatch-2.10/lib/urlwatch/handler.py new/urlwatch-2.11/lib/urlwatch/handler.py --- old/urlwatch-2.10/lib/urlwatch/handler.py 2018-05-17 23:05:34.000000000 +0200 +++ new/urlwatch-2.11/lib/urlwatch/handler.py 2018-05-19 18:42:00.000000000 +0200 @@ -54,6 +54,8 @@ def load(self): self.old_data, self.timestamp, self.tries = self.cache_storage.load(self.job, self.job.get_guid()) + if self.tries is None: + self.tries = 0 def save(self): self.cache_storage.save(self.job, self.job.get_guid(), self.new_data, time.time(), self.tries) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlwatch-2.10/lib/urlwatch/html2txt.py new/urlwatch-2.11/lib/urlwatch/html2txt.py --- old/urlwatch-2.10/lib/urlwatch/html2txt.py 2018-05-17 23:05:34.000000000 +0200 +++ new/urlwatch-2.11/lib/urlwatch/html2txt.py 2018-05-19 18:42:00.000000000 +0200 @@ -74,7 +74,7 @@ from bs4 import BeautifulSoup parser = options.pop('parser', 'html.parser') soup = BeautifulSoup(data, parser) - d = soup.prettify() + d = soup.get_text(strip=True) return d if method == 'lynx': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlwatch-2.10/setup.py new/urlwatch-2.11/setup.py --- old/urlwatch-2.10/setup.py 2018-05-17 23:05:34.000000000 +0200 +++ new/urlwatch-2.11/setup.py 2018-05-19 18:42:00.000000000 +0200 @@ -12,7 +12,6 @@ m['name'] = 'urlwatch' m['author'], m['author_email'] = re.match(r'(.*) <(.*)>', m['author']).groups() m['description'], m['long_description'] = docs[0].strip().split('\n\n', 1) -m['download_url'] = '{url}urlwatch-{version}.tar.gz'.format(**m) m['install_requires'] = ['minidb', 'PyYAML', 'requests', 'keyring', 'pycodestyle', 'appdirs'] m['scripts'] = ['urlwatch'] m['package_dir'] = {'': 'lib'}
