Merging upstream version 4.67.1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
d263a6dc68
commit
65fb7ebd07
4 changed files with 10 additions and 17 deletions
|
@ -37,7 +37,7 @@ repos:
|
||||||
- numpy
|
- numpy
|
||||||
- pandas
|
- pandas
|
||||||
- pytest-timeout
|
- pytest-timeout
|
||||||
- pytest-asyncio>0.21
|
- pytest-asyncio>=0.24
|
||||||
- repo: https://github.com/PyCQA/flake8
|
- repo: https://github.com/PyCQA/flake8
|
||||||
rev: 7.1.1
|
rev: 7.1.1
|
||||||
hooks:
|
hooks:
|
||||||
|
|
|
@ -20,8 +20,7 @@ dependencies:
|
||||||
- pytest
|
- pytest
|
||||||
- pytest-cov
|
- pytest-cov
|
||||||
- pytest-timeout
|
- pytest-timeout
|
||||||
- pytest-asyncio
|
- pytest-asyncio>=0.24
|
||||||
- nbval
|
|
||||||
- coverage
|
- coverage
|
||||||
# extras
|
# extras
|
||||||
- dask # dask
|
- dask # dask
|
||||||
|
@ -35,12 +34,13 @@ dependencies:
|
||||||
- rich # rich
|
- rich # rich
|
||||||
- argopt # `cd wiki && pymake`
|
- argopt # `cd wiki && pymake`
|
||||||
- twine # `pymake check pypi`
|
- twine # `pymake check pypi`
|
||||||
- build # `python -m build`
|
- python-build # `python -m build`
|
||||||
# `cd docs && pymake`
|
# `cd docs && pymake`
|
||||||
- mkdocs-material
|
- mkdocs-material
|
||||||
- pygments
|
- pygments
|
||||||
- pymdown-extensions
|
- pymdown-extensions
|
||||||
- pip:
|
- pip:
|
||||||
|
- git+https://github.com/casperdcl/nbval.git@master#egg=nbval # tests (native)
|
||||||
- py-make >=0.1.0 # `make/pymake`
|
- py-make >=0.1.0 # `make/pymake`
|
||||||
- mkdocs-minify-plugin # `cd docs && pymake`
|
- mkdocs-minify-plugin # `cd docs && pymake`
|
||||||
- git+https://github.com/tqdm/jsmin@fix-pip#egg=jsmin # `cd docs && pymake`
|
- git+https://github.com/tqdm/jsmin@fix-pip#egg=jsmin # `cd docs && pymake`
|
||||||
|
|
|
@ -84,7 +84,7 @@ classifiers = [
|
||||||
dependencies = ['colorama; platform_system == "Windows"']
|
dependencies = ['colorama; platform_system == "Windows"']
|
||||||
|
|
||||||
[project.optional-dependencies]
|
[project.optional-dependencies]
|
||||||
dev = ["pytest>=6", "pytest-cov", "pytest-timeout", "pytest-xdist"]
|
dev = ["pytest>=6", "pytest-cov", "pytest-timeout", "pytest-asyncio>=0.24", "nbval"]
|
||||||
discord = ["requests"]
|
discord = ["requests"]
|
||||||
slack = ["slack-sdk"]
|
slack = ["slack-sdk"]
|
||||||
telegram = ["requests"]
|
telegram = ["requests"]
|
||||||
|
|
17
tqdm/gui.py
17
tqdm/gui.py
|
@ -122,6 +122,7 @@ class tqdm_gui(std_tqdm): # pragma: no cover
|
||||||
ax = self.ax
|
ax = self.ax
|
||||||
line1 = self.line1
|
line1 = self.line1
|
||||||
line2 = self.line2
|
line2 = self.line2
|
||||||
|
hspan = getattr(self, 'hspan', None)
|
||||||
# instantaneous rate
|
# instantaneous rate
|
||||||
y = delta_it / delta_t
|
y = delta_it / delta_t
|
||||||
# overall rate
|
# overall rate
|
||||||
|
@ -148,18 +149,10 @@ class tqdm_gui(std_tqdm): # pragma: no cover
|
||||||
if total:
|
if total:
|
||||||
line1.set_data(xdata, ydata)
|
line1.set_data(xdata, ydata)
|
||||||
line2.set_data(xdata, zdata)
|
line2.set_data(xdata, zdata)
|
||||||
try:
|
if hspan:
|
||||||
poly_lims = self.hspan.get_xy()
|
hspan.set_xy((0, ymin))
|
||||||
except AttributeError:
|
hspan.set_height(ymax - ymin)
|
||||||
self.hspan = self.plt.axhspan(0, 0.001, xmin=0, xmax=0, color='g')
|
hspan.set_width(n / total)
|
||||||
poly_lims = self.hspan.get_xy()
|
|
||||||
poly_lims[0, 1] = ymin
|
|
||||||
poly_lims[1, 1] = ymax
|
|
||||||
poly_lims[2] = [n / total, ymax]
|
|
||||||
poly_lims[3] = [poly_lims[2, 0], ymin]
|
|
||||||
if len(poly_lims) > 4:
|
|
||||||
poly_lims[4, 1] = ymin
|
|
||||||
self.hspan.set_xy(poly_lims)
|
|
||||||
else:
|
else:
|
||||||
t_ago = [cur_t - i for i in xdata]
|
t_ago = [cur_t - i for i in xdata]
|
||||||
line1.set_data(t_ago, ydata)
|
line1.set_data(t_ago, ydata)
|
||||||
|
|
Loading…
Add table
Reference in a new issue