Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pyocr for openSUSE:Factory checked in at 2023-01-05 15:00:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyocr (Old) and /work/SRC/openSUSE:Factory/.python-pyocr.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyocr" Thu Jan 5 15:00:34 2023 rev:6 rq:1055978 version:0.8.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pyocr/python-pyocr.changes 2021-08-28 22:29:55.734026009 +0200 +++ /work/SRC/openSUSE:Factory/.python-pyocr.new.1563/python-pyocr.changes 2023-01-05 15:00:53.809034176 +0100 @@ -1,0 +2,9 @@ +Wed Jan 4 18:40:56 UTC 2023 - Dirk Müller <dmuel...@suse.com> + +- update to 0.8.3: + * Workaround https://github.com/pypa/setuptools_scm/issues/727 + * Add support for Tesseravt 5 + Linux + * Fix file descriptor leak (thanks to oda) + * Make the dependency on setuptools_scm optional + +------------------------------------------------------------------- Old: ---- python-pyocr-0.8.tar.gz New: ---- python-pyocr-0.8.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyocr.spec ++++++ --- /var/tmp/diff_new_pack.kHKaVC/_old 2023-01-05 15:00:54.405037318 +0100 +++ /var/tmp/diff_new_pack.kHKaVC/_new 2023-01-05 15:00:54.421037402 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pyocr # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,11 @@ # -%define sha f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc +%define sha 920b07154e1240efbd16e5b0bfd5fe2b57ac8334 %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pyocr -Version: 0.8 +Version: 0.8.3 Release: 0 Summary: Python wrapper for OCR engines License: GPL-3.0-or-later @@ -29,8 +29,8 @@ Source: https://gitlab.gnome.org/World/OpenPaperwork/pyocr/-/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: %{python_module Pillow} BuildRequires: %{python_module base} -BuildRequires: %{python_module setuptools_scm_git_archive} -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Pillow @@ -47,10 +47,10 @@ %setup -q -n pyocr-%{version}-%{sha} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %files %{python_files} ++++++ python-pyocr-0.8.tar.gz -> python-pyocr-0.8.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/.git_archival.txt new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/.git_archival.txt --- old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/.git_archival.txt 2021-01-01 16:59:54.000000000 +0100 +++ new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/.git_archival.txt 2022-06-26 14:18:12.000000000 +0200 @@ -1 +1 @@ -ref-names: tag: 0.8, refs/keep-around/f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc +ref-names: HEAD -> master, tag: 0.8.3, refs/keep-around/920b07154e1240efbd16e5b0bfd5fe2b57ac8334 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/.gitlab-ci.yml new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/.gitlab-ci.yml --- old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/.gitlab-ci.yml 2021-01-01 16:59:54.000000000 +0100 +++ new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/.gitlab-ci.yml 2022-06-26 14:18:12.000000000 +0200 @@ -1,4 +1,5 @@ -image: debian:stable-slim +image: debian:bullseye + .apt: &apt before_script: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/AUTHORS new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/AUTHORS --- old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/AUTHORS 2021-01-01 16:59:54.000000000 +0100 +++ new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/AUTHORS 2022-06-26 14:18:12.000000000 +0200 @@ -1,253 +1,291 @@ -$ git quick-stats detailedGitStats >| AUTHORS +$ git quick-stats -T >| AUTHORS # some authors appears many times with different names. They have been # merged together # sorted by line inserted - Contribution stats (by author): Jerome Flesch <jfle...@openpaper.work>: - insertions: 12225 (65%) - deletions: 2781 (29%) - files: 597 (66%) - commits: 2548 (69%) - lines changed: 15006 + insertions: 12901 + deletions: 2973 + files: 461 (46%) + commits: 304 + lines changed: 15874 + first commit: Mon Sep 19 20:16:37 2011 +0200 + last commit: Fri Mar 4 18:49:00 2022 +0100 Thomas Perret <thomas.per...@gresille.org>: - insertions: 4729 (25%) - deletions: 6359 (60%) - files: 142 (16%) - commits: 23 (6%) - lines changed: 11088 + insertions: 4742 (24%) + deletions: 6361 (56%) + files: 145 (14%) + commits: 24 (6%) + lines changed: 11103 (36%) first commit: Thu Nov 8 16:28:21 2018 +0100 - last commit: Thu Nov 29 11:04:42 2018 +0100 - - Benjamin Nguyen-Van-Yen <qu...@keats.dehors.org>: - insertions: 595 (3%) - deletions: 600 (6%) - files: 30 (3%) - commits: 9 (2%) - lines changed: 1195 - first commit: Tue Nov 15 23:30:49 2016 +0100 - last commit: Tue Nov 22 21:02:32 2016 +0100 - - Samuel Hoffstaetter <sam...@hoffstaetter.com>: - insertions: 310 (2%) - deletions: 119 (1%) - files: 25 (2%) - commits: 15 (3%) - lines changed: 425 + last commit: Thu Dec 6 11:31:09 2018 +0100 Elliott Sales de Andrade <quantum.anal...@gmail.com>: - insertions: 177 (1%) - deletions: 438 (4%) - files: 23 (3%) - commits: 8 (2%) - lines changed: 615 + insertions: 478 (2%) + deletions: 911 (8%) + files: 73 (7%) + commits: 23 (5%) + lines changed: 1389 (4%) first commit: Wed Aug 1 17:11:12 2018 -0400 - last commit: Thu Aug 2 00:24:16 2018 -0400 + last commit: Thu May 16 05:26:00 2019 -0400 - Marian Skrip <marian.sk...@devinsolutions.com>: - insertions: 175 (1%) - deletions: 11 (0%) - files: 6 (1%) - commits: 2 (1%) - lines changed: 186 - first commit: Wed Aug 30 14:45:38 2017 +0200 - last commit: Wed Sep 13 09:34:13 2017 +0200 + Samuel Hoffstaetter <sam...@hoffstaetter.com>: + insertions: 310 (2%) + deletions: 115 (1%) + files: 22 (2%) + commits: 15 (3%) + lines changed: 425 (1%) + first commit: Tue Jun 23 21:59:22 2009 -0400 + last commit: Wed Jun 24 19:15:50 2009 -0400 - aszlig <asz...@redmoonstudios.org>: - insertions: 101 (1%) - deletions: 46 (0%) - files: 5 (1%) - commits: 1 (0%) - lines changed: 147 - first commit: Sun Apr 9 22:24:17 2017 +0200 - last commit: Sun Apr 9 22:24:17 2017 +0200 + Benjamin Nguyen-Van-Yen <qu...@keats.dehors.org>: + insertions: 595 (3%) + deletions: 600 (5%) + files: 30 (3%) + commits: 9 (2%) + lines changed: 1195 (4%) + first commit: Tue Nov 15 23:30:49 2016 +0100 + last commit: Tue Nov 22 21:02:32 2016 +0100 Paulo Miguel Almeida <paulo.ubu...@gmail.com>: - insertions: 70 (0%) - deletions: 51 (0%) - files: 6 (1%) - commits: 6 (2%) - lines changed: 121 + insertions: 70 (0%) + deletions: 51 (0%) + files: 6 (1%) + commits: 6 (1%) + lines changed: 121 (0%) first commit: Thu May 7 15:30:51 2015 -0300 last commit: Sun May 31 16:41:57 2015 -0300 Adriano Pagano <adri...@sqooba.io>: - insertions: 62 (0%) - deletions: 21 (0%) - files: 8 (1%) - commits: 6 (2%) - lines changed: 83 + insertions: 62 (0%) + deletions: 21 (0%) + files: 8 (1%) + commits: 6 (1%) + lines changed: 83 (0%) first commit: Wed Nov 15 15:35:56 2017 +0100 last commit: Thu Nov 30 16:27:59 2017 +0100 - Gian Luca Dalla Torre <gianl...@gestionaleauto.com>: - insertions: 56 (0%) - deletions: 1 (0%) - files: 4 (0%) - commits: 1 (0%) - lines changed: 57 - first commit: Mon Aug 4 10:22:03 2014 +0200 - last commit: Mon Aug 4 10:22:03 2014 +0200 + ZoranPavlovic <zoran.pavlovic....@gmail.com>: + insertions: 23 (0%) + deletions: 32 (0%) + files: 5 (0%) + commits: 5 (1%) + lines changed: 55 (0%) + first commit: Tue Jan 2 14:14:13 2018 +0200 + last commit: Tue Jan 2 20:34:42 2018 +0200 - David Martin <david_mar...@fastmail.com>: - insertions: 42 (0%) - deletions: 25 (0%) - files: 10 (1%) - commits: 8 (2%) - lines changed: 67 - first commit: Sat May 13 20:17:38 2017 +1000 - last commit: Wed Jun 13 21:04:33 2018 +1000 + Matthias Kraus <matthiaskr...@live.de>: + insertions: 195 (1%) + deletions: 77 (1%) + files: 7 (1%) + commits: 4 (1%) + lines changed: 272 (1%) + first commit: Sat Apr 18 19:02:52 2020 +0200 + last commit: Wed Jul 29 20:05:48 2020 +0200 + + Teis <te...@users.noreply.github.com>: + insertions: 3 (0%) + deletions: 2 (0%) + files: 3 (0%) + commits: 3 (1%) + lines changed: 5 (0%) + first commit: Mon May 2 12:37:53 2016 +0200 + last commit: Mon May 2 14:48:40 2016 +0200 Chanwoong Kim <devk0...@gmail.com>: - insertions: 26 (0%) - deletions: 1 (0%) - files: 2 (0%) - commits: 2 (1%) - lines changed: 27 + insertions: 26 (0%) + deletions: 1 (0%) + files: 2 (0%) + commits: 2 (0%) + lines changed: 27 (0%) first commit: Sun Feb 14 19:32:38 2016 +0900 last commit: Sun Feb 14 20:19:56 2016 +0900 - ZoranPavlovic <zoran.pavlovic....@gmail.com>: - insertions: 23 (0%) - deletions: 32 (0%) - files: 5 (1%) - commits: 5 (1%) - lines changed: 55 - first commit: Tue Jan 2 14:14:13 2018 +0200 - last commit: Tue Jan 2 20:34:42 2018 +0200 + Marian Skrip <marian.sk...@devinsolutions.com>: + insertions: 175 (1%) + deletions: 11 (0%) + files: 6 (1%) + commits: 2 (0%) + lines changed: 186 (1%) + first commit: Wed Aug 30 14:45:38 2017 +0200 + last commit: Wed Sep 13 09:34:13 2017 +0200 + + Marián Skrip <marian.skr...@gmail.com>: + insertions: 13 (0%) + deletions: 2 (0%) + files: 2 (0%) + commits: 2 (0%) + lines changed: 15 (0%) + first commit: Tue Oct 23 16:13:49 2018 +0200 + last commit: Sat Feb 23 17:33:35 2019 +0100 + + Bernard Cafarelli <bernard.cafare...@gmail.com>: + insertions: 1 (0%) + deletions: 1 (0%) + files: 1 (0%) + commits: 1 (0%) + lines changed: 2 (0%) + first commit: Mon May 18 13:51:00 2015 +0200 + last commit: Mon May 18 13:51:00 2015 +0200 Ashish Kulkarni <ash...@advarisk.com>: - insertions: 16 (0%) - deletions: 0 (0%) - files: 2 (0%) - commits: 2 (1%) - lines changed: 16 + insertions: 16 (0%) + deletions: 0 (0%) + files: 2 (0%) + commits: 2 (0%) + lines changed: 16 (0%) first commit: Wed May 31 11:49:56 2017 +0530 last commit: Wed May 31 11:52:14 2017 +0530 Ross Vandegrift <r...@kallisti.us>: - insertions: 13 (0%) - deletions: 1 (0%) - files: 2 (0%) - commits: 2 (1%) - lines changed: 14 + insertions: 13 (0%) + deletions: 1 (0%) + files: 2 (0%) + commits: 2 (0%) + lines changed: 14 (0%) first commit: Sat Mar 22 21:56:45 2014 +0000 last commit: Sat Mar 22 21:48:16 2014 +0000 - jbochi <jbo...@gmail.com>: - insertions: 10 (0%) - deletions: 3 (0%) - files: 1 (0%) - commits: 1 (0%) - lines changed: 13 - first commit: Wed Oct 27 21:09:50 2010 -0200 - last commit: Wed Oct 27 21:09:50 2010 -0200 - - Bernhard Liebl <bernhard.li...@gmx.org>: - insertions: 9 (0%) - deletions: 21 (0%) - files: 1 (0%) - commits: 1 (0%) - lines changed: 30 - first commit: Tue Aug 23 16:47:06 2016 +0200 - last commit: Tue Aug 23 16:47:06 2016 +0200 - Fjup <kub...@seznam.cz>: - insertions: 8 (0%) - deletions: 3 (0%) - files: 2 (0%) - commits: 2 (1%) - lines changed: 11 + insertions: 8 (0%) + deletions: 3 (0%) + files: 2 (0%) + commits: 2 (0%) + lines changed: 11 (0%) first commit: Sat May 7 20:22:34 2016 +0200 last commit: Sat May 7 20:32:30 2016 +0200 - Jakub Semerák <k...@users.noreply.github.com>: - insertions: 6 (0%) - deletions: 0 (0%) - files: 1 (0%) - commits: 1 (0%) - lines changed: 6 - first commit: Mon Aug 15 09:24:01 2016 +0200 - last commit: Mon Aug 15 09:24:01 2016 +0200 - - Marián Skrip <marian.skr...@gmail.com>: - insertions: 5 (0%) - deletions: 1 (0%) - files: 1 (0%) - commits: 1 (0%) - lines changed: 6 - first commit: Tue Oct 23 16:13:49 2018 +0200 - last commit: Tue Oct 23 16:13:49 2018 +0200 + David Martin <david_mar...@fastmail.com>: + insertions: 42 (0%) + deletions: 25 (0%) + files: 10 (1%) + commits: 8 (2%) + lines changed: 67 (0%) + first commit: Sat May 13 20:17:38 2017 +1000 + last commit: Wed Jun 13 21:04:33 2018 +1000 - Teis <te...@users.noreply.github.com>: - insertions: 3 (0%) - deletions: 2 (0%) - files: 3 (0%) - commits: 3 (1%) - lines changed: 5 - first commit: Mon May 2 12:37:53 2016 +0200 - last commit: Mon May 2 14:48:40 2016 +0200 + Yorun/æ ç¶ <yor...@gmail.com>: + insertions: 1 (0%) + deletions: 1 (0%) + files: 1 (0%) + commits: 1 (0%) + lines changed: 2 (0%) + first commit: Tue Mar 10 16:53:01 2020 +0000 + last commit: Tue Mar 10 16:53:01 2020 +0000 + + oda <o...@headjapan.com>: + insertions: 19 (0%) + deletions: 14 (0%) + files: 1 (0%) + commits: 1 (0%) + lines changed: 33 (0%) + first commit: Wed Apr 13 11:36:20 2022 +0900 + last commit: Wed Apr 13 11:36:20 2022 +0900 - Pedro-Juan Ferrer <veh...@gmail.com>: - insertions: 2 (0%) - deletions: 1 (0%) - files: 1 (0%) - commits: 1 (0%) - lines changed: 3 - first commit: Wed Apr 16 15:11:26 2014 +0200 - last commit: Wed Apr 16 15:11:26 2014 +0200 + Bernhard Liebl <bernhard.li...@gmx.org>: + insertions: 9 (0%) + deletions: 21 (0%) + files: 1 (0%) + commits: 1 (0%) + lines changed: 30 (0%) + first commit: Tue Aug 23 16:47:06 2016 +0200 + last commit: Tue Aug 23 16:47:06 2016 +0200 - Bernard Cafarelli <bernard.cafare...@gmail.com>: - insertions: 1 (0%) - deletions: 1 (0%) - files: 1 (0%) - commits: 1 (0%) - lines changed: 2 - first commit: Mon May 18 13:51:00 2015 +0200 - last commit: Mon May 18 13:51:00 2015 +0200 + Gian Luca Dalla Torre <gianl...@gestionaleauto.com>: + insertions: 56 (0%) + deletions: 1 (0%) + files: 4 (0%) + commits: 1 (0%) + lines changed: 57 (0%) + first commit: Mon Aug 4 10:22:03 2014 +0200 + last commit: Mon Aug 4 10:22:03 2014 +0200 Yada <ydt.hr...@gmail.com>: - insertions: 1 (0%) - deletions: 1 (0%) - files: 1 (0%) - commits: 1 (0%) - lines changed: 2 + insertions: 1 (0%) + deletions: 1 (0%) + files: 1 (0%) + commits: 1 (0%) + lines changed: 2 (0%) first commit: Sat Mar 19 22:52:34 2016 +0900 last commit: Sat Mar 19 22:52:34 2016 +0900 Daniel Quinn <c...@danielquinn.org>: - insertions: 1 (0%) - deletions: 1 (0%) - files: 1 (0%) - commits: 1 (0%) - lines changed: 2 + insertions: 1 (0%) + deletions: 1 (0%) + files: 1 (0%) + commits: 1 (0%) + lines changed: 2 (0%) first commit: Sat Apr 28 12:17:29 2018 +0100 last commit: Sat Apr 28 12:17:29 2018 +0100 + Pedro-Juan Ferrer <veh...@gmail.com>: + insertions: 2 (0%) + deletions: 1 (0%) + files: 1 (0%) + commits: 1 (0%) + lines changed: 3 (0%) + first commit: Wed Apr 16 15:11:26 2014 +0200 + last commit: Wed Apr 16 15:11:26 2014 +0200 + + Jakub Semerák <k...@users.noreply.github.com>: + insertions: 6 (0%) + deletions: 0 (0%) + files: 1 (0%) + commits: 1 (0%) + lines changed: 6 (0%) + first commit: Mon Aug 15 09:24:01 2016 +0200 + last commit: Mon Aug 15 09:24:01 2016 +0200 + tom <t...@zeitgold.com>: - insertions: 1 (0%) - deletions: 1 (0%) - files: 1 (0%) - commits: 1 (0%) - lines changed: 2 + insertions: 1 (0%) + deletions: 1 (0%) + files: 1 (0%) + commits: 1 (0%) + lines changed: 2 (0%) first commit: Tue Sep 6 17:51:27 2016 +0200 last commit: Tue Sep 6 17:51:27 2016 +0200 Jon Debonis <j...@trov.com>: - insertions: 1 (0%) - deletions: 0 (0%) - files: 1 (0%) - commits: 1 (0%) - lines changed: 1 + insertions: 1 (0%) + deletions: 0 (0%) + files: 1 (0%) + commits: 1 (0%) + lines changed: 1 (0%) first commit: Thu Sep 25 15:34:21 2014 -0700 last commit: Thu Sep 25 15:34:21 2014 -0700 - total: - insertions: 18843 (100%) - deletions: 10636 (100%) - files: 904 (100%) - commits: 374 (100%) + aszlig <asz...@redmoonstudios.org>: + insertions: 101 (1%) + deletions: 46 (0%) + files: 5 (0%) + commits: 1 (0%) + lines changed: 147 (0%) + first commit: Sun Apr 9 22:24:17 2017 +0200 + last commit: Sun Apr 9 22:24:17 2017 +0200 + + Ramon Navarro Bosch <ra...@flaps.io>: + insertions: 1 (0%) + deletions: 0 (0%) + files: 1 (0%) + commits: 1 (0%) + lines changed: 1 (0%) + first commit: Mon Jun 14 09:18:56 2021 +0000 + last commit: Mon Jun 14 09:18:56 2021 +0000 + jbochi <jbo...@gmail.com>: + insertions: 10 (0%) + deletions: 3 (0%) + files: 1 (0%) + commits: 1 (0%) + lines changed: 13 (0%) + first commit: Wed Oct 27 21:09:50 2010 -0200 + last commit: Wed Oct 27 21:09:50 2010 -0200 + + total: + insertions: 19882 (100%) + deletions: 11277 (100%) + files: 1006 (100%) + commits: 433 (100%) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/ChangeLog new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/ChangeLog --- old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/ChangeLog 2021-01-01 16:59:54.000000000 +0100 +++ new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/ChangeLog 2022-06-26 14:18:12.000000000 +0200 @@ -1,3 +1,13 @@ +26/06/2022 - 0.8.3: +- Workaround https://github.com/pypa/setuptools_scm/issues/727 + +04/15/2022 - 0.8.2: +- Add support for Tesseravt 5 + Linux +- Fix file descriptor leak (thanks to oda) + +05/12/2021 - 0.8.1: +- Make the dependency on setuptools_scm optional + 01/01/2020 - 0.8.0: - Replaced libtesseract.image_to_pdf() by an object-oriented API that allows creating PDF with more than 1 page (thanks to Matthias Kraus). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/setup.py new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/setup.py --- old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/setup.py 2021-01-01 16:59:54.000000000 +0100 +++ new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/setup.py 2022-06-26 14:18:12.000000000 +0200 @@ -20,13 +20,13 @@ sys.exit(error) -if os.name == 'nt': +if os.name == 'nt' or not bool(int(os.getenv("ENABLE_SETUPTOOLS_SCM", 1))): + # 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', + ['git', 'describe', '--always'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) version = version.stdout.decode("utf-8").strip() @@ -43,7 +43,7 @@ break else: setup_deps = [ - 'setuptools_scm', + 'setuptools_scm<7', 'setuptools_scm_git_archive', ] scm_version = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/src/pyocr/__init__.py new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/src/pyocr/__init__.py --- old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/src/pyocr/__init__.py 2021-01-01 16:59:54.000000000 +0100 +++ new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/src/pyocr/__init__.py 2022-06-26 14:18:12.000000000 +0200 @@ -13,7 +13,11 @@ """) -from .pyocr import * # noqa +from .pyocr import ( + get_available_tools, + TOOLS, + VERSION +) from .error import PyocrException __all__ = [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/src/pyocr/libtesseract/tesseract_raw.py new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/src/pyocr/libtesseract/tesseract_raw.py --- old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/src/pyocr/libtesseract/tesseract_raw.py 2021-01-01 16:59:54.000000000 +0100 +++ new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/src/pyocr/libtesseract/tesseract_raw.py 2022-06-26 14:18:12.000000000 +0200 @@ -48,8 +48,11 @@ ] else: libnames += [ + "libtesseract.so.5", "libtesseract.so.4", "libtesseract.so.3", + "libtesseract.5.dylib", + "libtesseract.4.dylib", ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/src/pyocr/tesseract.py new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/src/pyocr/tesseract.py --- old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/src/pyocr/tesseract.py 2021-01-01 16:59:54.000000000 +0100 +++ new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/src/pyocr/tesseract.py 2022-06-26 14:18:12.000000000 +0200 @@ -211,9 +211,10 @@ cwd=tmpdir, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - proc.stdin.close() - original_output = proc.stdout.read() - proc.wait() + with proc: + proc.stdin.close() + original_output = proc.stdout.read() + proc.wait() original_output = original_output.decode("utf-8") original_output = original_output.strip() @@ -300,8 +301,10 @@ # asap or Tesseract will remain stuck when trying to write again on stderr. # In the end, we just have to make sure that proc.stderr.read() is called # before proc.wait() - errors = proc.stdout.read() - return (proc.wait(), errors) + with proc: + errors = proc.stdout.read() + ret = proc.wait() + return (ret, errors) def cleanup(filename): @@ -408,10 +411,11 @@ creationflags=g_creation_flags, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - langs = proc.stdout.read().decode('utf-8').splitlines(False) - ret = proc.wait() - if ret != 0: - raise TesseractError(ret, "unable to get languages") + with proc: + langs = proc.stdout.read().decode('utf-8').splitlines(False) + ret = proc.wait() + if ret != 0: + raise TesseractError(ret, "unable to get languages") return [lang for lang in langs if lang and lang[-1] != ':'] @@ -440,11 +444,12 @@ startupinfo=g_subprocess_startup_info, creationflags=g_creation_flags, stdout=subprocess.PIPE) - ver_string = proc.stdout.read() - ver_string = ver_string.decode('utf-8') - ret = proc.wait() - if ret not in (0, 1): - raise TesseractError(ret, ver_string) + with proc: + ver_string = proc.stdout.read() + ver_string = ver_string.decode('utf-8') + ret = proc.wait() + if ret not in (0, 1): + raise TesseractError(ret, ver_string) try: ver_string = ver_string.split(" ")[1] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/tests/tests_builder.py new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/tests/tests_builder.py --- old/pyocr-0.8-f9f93bbd83ab5814b1c56c3ffe41addc9ec622dc/tests/tests_builder.py 2021-01-01 16:59:54.000000000 +0100 +++ new/pyocr-0.8.3-920b07154e1240efbd16e5b0bfd5fe2b57ac8334/tests/tests_builder.py 2022-06-26 14:18:12.000000000 +0200 @@ -243,7 +243,7 @@ def test_write_file(self): output_fh = StringIO() lines = [] - for l in range(4): + for l in range(4): # noqa: E741 boxes = [] for b in range(4): word = "word" + str(4*l+b) @@ -287,7 +287,7 @@ def test_get_output(self): lines = [] - for l in range(4): + for l in range(4): # noqa: E741 boxes = [] for b in range(4): word = "word" + str(4*l+b)
