From e57700d1905a533e87afc6f730e6df493fe825b3 Mon Sep 17 00:00:00 2001 From: jxy_git Date: Wed, 16 Nov 2022 17:20:48 +0800 Subject: [PATCH] update version to 1.6 --- 0001-fixup-moving-average-window.patch | 51 +++++-------- progress-1.5.tar.gz | Bin 5842 -> 0 bytes progress-1.6.tar.gz | Bin 0 -> 7842 bytes python-progress.spec | 96 +++++++++++++++---------- 4 files changed, 76 insertions(+), 71 deletions(-) delete mode 100644 progress-1.5.tar.gz create mode 100644 progress-1.6.tar.gz diff --git a/0001-fixup-moving-average-window.patch b/0001-fixup-moving-average-window.patch index 94635b0..94c87a1 100644 --- a/0001-fixup-moving-average-window.patch +++ b/0001-fixup-moving-average-window.patch @@ -1,34 +1,12 @@ -From: Pavel Raiskup -Subject: [PATCH] Fix fast upload avg calculation +From 8be91cee2d25e26ee1ab92a9bbab6fd9fda49104 Mon Sep 17 00:00:00 2001 +From: jxy_git +Date: Thu, 17 Nov 2022 11:26:05 +0800 +Subject: [PATCH] fixup moving average window - -Upstream verigak/progress is broken for very fast uploads; e.g. -with 'copr build' command, the next() call is called so often that -the avg() calculation probably suffers from some small -floating-point numbers problems: - - With 15MB/s => next() called for each 8096B => ~2000 calls/s - -Since the upstream default window size is only of size 10 items -(by default), it calculates the average speed only for the last -~0.005s. We could enlarge the size of window (sma_window param), -but the algorithm is so naive that it would decrease the -performance. - -This has been discussed very extensively with upstream (PR 24 and -friends) but I neither was not able to explain the problem, nor I -was able to convince upstream to accept my patches. - -This downstream patch - while it keeps the backward API -compatibility - changes the algorithm so the average speed is -calculation is fast enough, and much more stable (by default it -calculates speed for window of 2 seconds). - -We also don't seem to have the monotonic() mess, since we don't seem -to suffer from the same issues. - -Fork with this patch backported is maintained in -https://github.com/python-progress/python-progress +--- + MANIFEST.in | 1 - + progress/__init__.py | 78 +++++++++++++++++++++++++++++--------------- + 2 files changed, 52 insertions(+), 27 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index ef7c4cb..0c73842 100644 @@ -38,7 +16,7 @@ index ef7c4cb..0c73842 100644 include README.rst LICENSE -include test_*.py diff --git a/progress/__init__.py b/progress/__init__.py -index e434c25..1cbdce6 100644 +index b434b30..71b2039 100644 --- a/progress/__init__.py +++ b/progress/__init__.py @@ -18,10 +18,7 @@ from collections import deque @@ -52,7 +30,7 @@ index e434c25..1cbdce6 100644 +from time import time - __version__ = '1.5' + __version__ = '1.6' @@ -30,19 +27,55 @@ HIDE_CURSOR = '\x1b[?25l' SHOW_CURSOR = '\x1b[?25h' @@ -115,7 +93,7 @@ index e434c25..1cbdce6 100644 for key, val in kwargs.items(): setattr(self, key, val) -@@ -62,23 +95,19 @@ class Infinite(object): +@@ -67,23 +100,19 @@ class Infinite(object): @property def elapsed(self): @@ -147,8 +125,8 @@ index e434c25..1cbdce6 100644 def update(self): pass -@@ -112,10 +141,7 @@ class Infinite(object): - return self.file.isatty() if self.check_tty else True +@@ -116,10 +145,7 @@ class Infinite(object): + raise AttributeError(msg) def next(self, n=1): - now = monotonic() @@ -159,3 +137,6 @@ index e434c25..1cbdce6 100644 self.index = self.index + n self.update() +-- +2.37.1 + diff --git a/progress-1.5.tar.gz b/progress-1.5.tar.gz deleted file mode 100644 index 77f5fa8c62f862d9ed0bc8fe7a06e9ec70e66109..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5842 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�Jn4fm)`yQ1nU_$%vW*Fp z^ANdZjoTu(?<1kK3#J7!H1tM_|39p?TyW>0+Ld@f43%r$A50xX#IpvL$@9YEZHGxs3+sVBBD>H{4P(vtvuWaF3|$q2yICs z+(|A>!G|ME_nPuG8f&@&{r4kG?wX15 zd;ck_kC`Gx6=1o;FNKffCUU-Z0ZHy!_1JA<60+os`9)crzl*Yj%FI^^l0&~`V3(_` z3ZqK)_y+jwtfFyD=3tb`76KqvvIe~!3w7%?qHVR`I=yBb}t7X+(q9Pe&S@G zT)^%;VH?Yp2k%`E*Sl|`7cg-cCSF&=PiF{hV{Lg2atf@<`QK)t^6Jr*3Ir9E%NYsbU;$D`(92k(*(o8zrL~MW>s4quqDMcI8u<-!?2T z|KrQjBq+)_+8WJzZ9Amh9_Pg_wJM(6^xc^+a{3J6mY*q3>0!fs%Pz zP0U-3SRH~jR#{AM)#i`BIJdq0?e%W|ZI2E!>1SIfMVw?qrDsEWc3i7k^#{v&lGR<>FEVFPklE|ToH?E>vnNK z7$I9j_*tUZx&&hzf0N~cCGEel)^!#j?!P2p&Kv(WGFhD9=wlg8UrXg^vO-(tylHhQ z7chv-n8dNXDQXe6p;zLJXTfsyte5$n){z3`YD%)1*Ti+`#Mh}@kngDX(!F|sXB6La d;N&~NfxQmr{=e_3(DR)lSgd^xZU_$Ue*r?DZVvze literal 0 HcmV?d00001 diff --git a/python-progress.spec b/python-progress.spec index fe82a5a..de2652b 100644 --- a/python-progress.spec +++ b/python-progress.spec @@ -1,53 +1,77 @@ -# Created by pyp2rpm-0.5.2 -%global pypi_name progress - -Name: python-%{pypi_name} -Version: 1.5 -Release: 1 -Summary: Easy to use progress bars - -License: ISC -URL: http://github.com/verigak/progress/ -Source0: %pypi_source -BuildArch: noarch - -BuildRequires: python3-devel -BuildRequires: python3-setuptools - -Patch1: 0001-fixup-moving-average-window.patch +%global _empty_manifest_terminate_build 0 +Name: python-progress +Version: 1.6 +Release: 1 +Summary: Easy to use progress bars +License: ISC +URL: http://github.com/verigak/progress/ +Source0: https://files.pythonhosted.org/packages/2a/68/d8412d1e0d70edf9791cbac5426dc859f4649afc22f2abbeb0d947cf70fd/progress-1.6.tar.gz +Patch0: 0001-fixup-moving-average-window.patch +BuildArch: noarch + + +%description +Collection of easy to use progress bars and spinners. -%global _description\ -Collection of easy to use progress bars and spinners.\ +%package -n python3-progress +Summary: Easy to use progress bars +Provides: python-progress = %{version}-%{release} +BuildRequires: python3-devel +BuildRequires: python3-setuptools -%description %_description +%description -n python3-progress +Collection of easy to use progress bars and spinners. -%package -n python3-%{pypi_name} -Summary: Easy to use progress bars +%package help +Summary: Development documents and examples for progress +Provides: python3-progress-doc -%description -n python3-%{pypi_name} +%description help Collection of easy to use progress bars and spinners. - %prep -%autosetup -p1 -n %{pypi_name}-%{version} - -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info - +%autosetup -p1 -n progress-%{version} %build %py3_build - %install %py3_install - -%files -n python3-%{pypi_name} -%doc README.rst LICENSE -%{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info - +install -d -m755 %{buildroot}/%{_pkgdocdir} +if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi +if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi +if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi +if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi +pushd %{buildroot} +if [ -d usr/lib ]; then + find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/lib64 ]; then + find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/bin ]; then + find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/sbin ]; then + find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst +fi +touch doclist.lst +if [ -d usr/share/man ]; then + find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst +fi +popd +mv %{buildroot}/filelist.lst . +mv %{buildroot}/doclist.lst . + +%files -n python3-progress -f filelist.lst +%dir %{python3_sitelib}/* + +%files help -f doclist.lst +%{_docdir}/* %changelog +* Wed Nov 16 2022 jiangxinyu - 1.6-1 +- Update package to version 1.6 + * Fri Jun 25 2021 liufeng - 1.5-1 - Initial package. -- Gitee