Hello community, here is the log from the commit of package python-pyocr for openSUSE:Factory checked in at 2019-09-11 10:36:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyocr (Old) and /work/SRC/openSUSE:Factory/.python-pyocr.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyocr" Wed Sep 11 10:36:40 2019 rev:4 rq:729839 version:0.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pyocr/python-pyocr.changes 2019-05-17 23:43:48.181891730 +0200 +++ /work/SRC/openSUSE:Factory/.python-pyocr.new.7948/python-pyocr.changes 2019-09-11 10:36:43.503273026 +0200 @@ -1,0 +2,6 @@ +Tue Sep 10 11:51:28 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Update to 0.7.2: + * minor bugfixes + +------------------------------------------------------------------- Old: ---- python-pyocr-0.7.tar.gz New: ---- python-pyocr-0.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyocr.spec ++++++ --- /var/tmp/diff_new_pack.hYbZhV/_old 2019-09-11 10:36:45.019272586 +0200 +++ /var/tmp/diff_new_pack.hYbZhV/_new 2019-09-11 10:36:45.055272575 +0200 @@ -16,16 +16,16 @@ # -%define sha 0ffeca803fca7c812560a6c0e34342e4833f1ab0 +%define sha f4b068cdf359186bfbed36959c53e9e52e2eda84 %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pyocr -Version: 0.7 +Version: 0.7.2 Release: 0 Summary: Python wrapper for OCR engines License: GPL-3.0-or-later Group: Development/Languages/Python -Url: https://gitlab.gnome.org/World/OpenPaperwork/pyocr +URL: https://gitlab.gnome.org/World/OpenPaperwork/pyocr Source: https://gitlab.gnome.org/World/OpenPaperwork/pyocr/-/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: %{python_module Pillow} BuildRequires: %{python_module base} @@ -54,7 +54,8 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %files %{python_files} -%doc AUTHORS COPYING ChangeLog README.md +%license COPYING +%doc AUTHORS ChangeLog README.md %{python_sitelib}/* %changelog ++++++ python-pyocr-0.7.tar.gz -> python-pyocr-0.7.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/.git_archival.txt new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/.git_archival.txt --- old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/.git_archival.txt 2019-05-12 00:45:15.000000000 +0200 +++ new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/.git_archival.txt 2019-06-22 20:10:54.000000000 +0200 @@ -1 +1 @@ -ref-names: HEAD -> master, tag: 0.7, refs/keep-around/0ffeca803fca7c812560a6c0e34342e4833f1ab0 +ref-names: tag: 0.7.2, refs/keep-around/f4b068cdf359186bfbed36959c53e9e52e2eda84 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/ChangeLog new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/ChangeLog --- old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/ChangeLog 2019-05-12 00:45:15.000000000 +0200 +++ new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/ChangeLog 2019-06-22 20:10:54.000000000 +0200 @@ -1,3 +1,11 @@ +22/06/2019 - 0.7.2: +- Fix setup.py on Windows + +22/06/2019 - 0.7.1: +- tesseract.can_detect_orientation(): only returns True if 'osd' date files are + installed +- setup.py: Fix installation in MSYS2 + 12/05/2019 - 0.7: - Drop support for Python <= 2.7 - Fix: Make sure the builder objects can be used to parse box files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/setup.py new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/setup.py --- old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/setup.py 2019-05-12 00:45:15.000000000 +0200 +++ new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/setup.py 2019-06-22 20:10:54.000000000 +0200 @@ -21,9 +21,9 @@ if os.name == 'nt': - # setuptools_scm doesn't work in MSYS2 setup_deps = [] scm_version = {} + # setuptools_scm doesn't work in MSYS2 if not os.path.exists('src/pyocr/_version.py'): version = subprocess.run( 'git describe --always', @@ -36,8 +36,11 @@ fd.write("version = '{}'\n".format(version)) else: with open("src/pyocr/_version.py", "r") as fd: - version = fd.read().strip() - version = version.split(" ")[2][1:-1] + for line in fd.readlines(): + if line[0] != '#' and line.strip() != '': + version = line.strip() + version = version.split(" ")[2][1:-1] + break else: setup_deps = [ 'setuptools_scm', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/src/pyocr/libtesseract/__init__.py new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/src/pyocr/libtesseract/__init__.py --- old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/src/pyocr/libtesseract/__init__.py 2019-05-12 00:45:15.000000000 +0200 +++ new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/src/pyocr/libtesseract/__init__.py 2019-06-22 20:10:54.000000000 +0200 @@ -37,7 +37,8 @@ def can_detect_orientation(): - return True + langs = get_available_languages() + return 'osd' in langs def detect_orientation(image, lang=None): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/src/pyocr/tesseract.py new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/src/pyocr/tesseract.py --- old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/src/pyocr/tesseract.py 2019-05-12 00:45:15.000000000 +0200 +++ new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/src/pyocr/tesseract.py 2019-06-22 20:10:54.000000000 +0200 @@ -152,10 +152,11 @@ def can_detect_orientation(): version = get_version() + langs = get_available_languages() return ( version[0] > 3 or (version[0] == 3 and version[1] >= 3) - ) + ) and 'osd' in langs def psm_parameter(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/tests/tests_libtesseract.py new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/tests/tests_libtesseract.py --- old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/tests/tests_libtesseract.py 2019-05-12 00:45:15.000000000 +0200 +++ new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/tests/tests_libtesseract.py 2019-06-22 20:10:54.000000000 +0200 @@ -41,8 +41,12 @@ self.assertFalse(libtesseract.is_available()) libtess.TessVersion.assert_called_once_with() - def test_can_detect_orientation(self): + @patch("pyocr.libtesseract.get_available_languages") + def test_can_detect_orientation(self, get_available_languages): + get_available_languages.return_value = ['eng', 'fra', 'jpn', 'osd'] self.assertTrue(libtesseract.can_detect_orientation()) + get_available_languages.return_value = ['eng', 'fra', 'jpn'] + self.assertFalse(libtesseract.can_detect_orientation()) @patch("pyocr.libtesseract.tesseract_raw.g_libtesseract") def test_version(self, libtess): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/tests/tests_tesseract.py new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/tests/tests_tesseract.py --- old/pyocr-0.7-0ffeca803fca7c812560a6c0e34342e4833f1ab0/tests/tests_tesseract.py 2019-05-12 00:45:15.000000000 +0200 +++ new/pyocr-0.7.2-f4b068cdf359186bfbed36959c53e9e52e2eda84/tests/tests_tesseract.py 2019-06-22 20:10:54.000000000 +0200 @@ -176,18 +176,33 @@ stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) + @patch("pyocr.tesseract.get_available_languages") @patch("pyocr.tesseract.get_version") - def test_can_detect_orientation_tesseract4(self, get_version): + def test_can_detect_orientation_tesseract4(self, get_version, + get_available_languages): get_version.return_value = (4, 0, 0) + + get_available_languages.return_value = ['eng', 'fra', 'jpn', 'osd'] self.assertTrue(tesseract.can_detect_orientation()) + get_available_languages.return_value = ['eng', 'fra', 'jpn'] + self.assertFalse(tesseract.can_detect_orientation()) + + @patch("pyocr.tesseract.get_available_languages") @patch("pyocr.tesseract.get_version") - def test_can_detect_orientation_tesseract3(self, get_version): + def test_can_detect_orientation_tesseract3( + self, get_version, get_available_languages + ): + get_available_languages.return_value = ['eng', 'fra', 'jpn', 'osd'] get_version.return_value = (3, 3, 0) self.assertTrue(tesseract.can_detect_orientation()) + @patch("pyocr.tesseract.get_available_languages") @patch("pyocr.tesseract.get_version") - def test_cannot_detect_orientation_tesseract3(self, get_version): + def test_cannot_detect_orientation_tesseract3( + self, get_version, get_available_languages + ): + get_available_languages.return_value = ['eng', 'fra', 'jpn', 'osd'] get_version.return_value = (3, 2, 1) self.assertFalse(tesseract.can_detect_orientation())
